Dockerfile.armhf merge changes from Dockerfile

This commit is contained in:
David Personette 2017-11-30 10:24:25 -05:00
parent 6532fb1072
commit 877eb6c480

View File

@ -3,45 +3,50 @@ MAINTAINER David Personette <dperson@gmail.com>
# Install samba # Install samba
RUN ["cross-build-start"] RUN ["cross-build-start"]
RUN apk --no-cache add bash samba shadow && \ RUN apk --no-cache --no-progress upgrade && \
apk --no-cache --no-progress add bash samba shadow && \
adduser -D -G users -H -g 'Samba User' -h /tmp smbuser && \ adduser -D -G users -H -g 'Samba User' -h /tmp smbuser && \
sed -i 's|^\( log file = \).*|\1/dev/stdout|' /etc/samba/smb.conf && \ file="/etc/samba/smb.conf" && \
sed -i 's|^\( load printers = \).*|\1no|' /etc/samba/smb.conf && \ sed -i 's|^;* *\(log file = \).*| \1/dev/stdout|' $file && \
sed -i 's|^\( printcap name = \).*|\1/dev/null|' /etc/samba/smb.conf && \ sed -i 's|^;* *\(load printers = \).*| \1no|' $file && \
sed -i 's|^;*\( printing = \).*|\1bsd|' /etc/samba/smb.conf && \ sed -i 's|^;* *\(printcap name = \).*| \1/dev/null|' $file && \
sed -i 's|^\( unix password sync = \).*|\1no|' /etc/samba/smb.conf && \ sed -i 's|^;* *\(printing = \).*| \1bsd|' $file && \
sed -i '/Share Definitions/,$d' /etc/samba/smb.conf && \ sed -i 's|^;* *\(unix password sync = \).*| \1no|' $file && \
echo ' pam password change = yes' >>/etc/samba/smb.conf && \ sed -i 's|^;* *\(preserve case = \).*| \1yes|' $file && \
echo ' map to guest = bad user' >>/etc/samba/smb.conf && \ sed -i 's|^;* *\(short preserve case = \).*| \1yes|' $file && \
echo ' usershare allow guests = yes' >>/etc/samba/smb.conf && \ sed -i 's|^;* *\(default case = \).*| \1lower|' $file && \
echo ' create mask = 0664' >>/etc/samba/smb.conf && \ sed -i '/Share Definitions/,$d' $file && \
echo ' force create mode = 0664' >>/etc/samba/smb.conf && \ echo ' pam password change = yes' >>$file && \
echo ' directory mask = 0775' >>/etc/samba/smb.conf && \ echo ' map to guest = bad user' >>$file && \
echo ' force directory mode = 0775' >>/etc/samba/smb.conf && \ echo ' usershare allow guests = yes' >>$file && \
echo ' force user = smbuser' >>/etc/samba/smb.conf && \ echo ' create mask = 0664' >>$file && \
echo ' force group = users' >>/etc/samba/smb.conf && \ echo ' force create mode = 0664' >>$file && \
echo ' follow symlinks = yes' >>/etc/samba/smb.conf && \ echo ' directory mask = 0775' >>$file && \
echo ' load printers = no' >>/etc/samba/smb.conf && \ echo ' force directory mode = 0775' >>$file && \
echo ' printing = bsd' >>/etc/samba/smb.conf && \ echo ' force user = smbuser' >>$file && \
echo ' printcap name = /dev/null' >>/etc/samba/smb.conf && \ echo ' force group = users' >>$file && \
echo ' disable spoolss = yes' >>/etc/samba/smb.conf && \ echo ' follow symlinks = yes' >>$file && \
echo ' socket options = TCP_NODELAY' >>/etc/samba/smb.conf && \ echo ' load printers = no' >>$file && \
echo ' strict locking = no' >>/etc/samba/smb.conf && \ echo ' printing = bsd' >>$file && \
echo ' vfs objects = recycle' >>/etc/samba/smb.conf && \ echo ' printcap name = /dev/null' >>$file && \
echo ' recycle:keeptree = yes' >>/etc/samba/smb.conf && \ echo ' disable spoolss = yes' >>$file && \
echo ' recycle:versions = yes' >>/etc/samba/smb.conf && \ echo ' socket options = TCP_NODELAY' >>$file && \
echo ' min protocol = SMB2' >>/etc/samba/smb.conf && \ echo ' strict locking = no' >>$file && \
echo '' >>/etc/samba/smb.conf && \ echo ' vfs objects = recycle' >>$file && \
echo ' recycle:keeptree = yes' >>$file && \
echo ' recycle:versions = yes' >>$file && \
echo ' min protocol = SMB2' >>$file && \
echo '' >>$file && \
rm -rf /tmp/* rm -rf /tmp/*
RUN ["cross-build-end"] RUN ["cross-build-end"]
COPY samba.sh /usr/bin/ COPY samba.sh /usr/bin/
EXPOSE 137/udp 138/udp 139 445
HEALTHCHECK --interval=60s --timeout=15s \ HEALTHCHECK --interval=60s --timeout=15s \
CMD smbclient -L '\\localhost\' -U 'guest%' -m SMB3 CMD smbclient -L '\\localhost\' -U 'guest%' -m SMB3
EXPOSE 137/udp 138/udp 139 445
VOLUME ["/etc/samba"] VOLUME ["/etc/samba"]
ENTRYPOINT ["samba.sh"] ENTRYPOINT ["samba.sh"]