docker: Remove dependence on bash in entry script

Netatalk · Feb 10, 2025 · 056d29a · 056d29a
1 parent de63cec
commit 056d29a
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 135 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,6 @@
 ARG RUN_DEPS="\
     acl \
     avahi \
-    bash \
     cups \
     db \
     dbus \

diff --git a/Dockerfile.testsuite b/Dockerfile.testsuite
@@ -1,7 +1,6 @@
 ARG RUN_DEPS="\
     acl \
     avahi \
-    bash \
     cups \
     db \
     dbus \

diff --git a/contrib/shell_utils/docker-entrypoint.sh b/contrib/shell_utils/docker-entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Entry point script for netatalk docker container.
 # Copyright (C) 2023  Eric Harmon
@@ -18,216 +18,166 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-set -eo pipefail
+set -e
 
 echo "*** Setting up users and groups"
 
-if [ -z "${AFP_USER}" ]; then
+if [ -z "$AFP_USER" ]; then
     echo "ERROR: AFP_USER needs to be set to use this Docker container."
     exit 1
 fi
-if [ -z "${AFP_PASS}" ]; then
+if [ -z "$AFP_PASS" ]; then
     echo "ERROR: AFP_PASS needs to be set to use this Docker container."
     exit 1
 fi
-if [ -z "${AFP_GROUP}" ]; then
+if [ -z "$AFP_GROUP" ]; then
     echo "ERROR: AFP_GROUP needs to be set to use this Docker container."
     exit 1
 fi
 
-if [ ! -z "${AFP_UID}" ]; then
-    uidcmd="-u ${AFP_UID}"
+uidcmd=""
+gidcmd=""
+if [ -n "$AFP_UID" ]; then
+    uidcmd="-u $AFP_UID"
 fi
-if [ ! -z "${AFP_GID}" ]; then
-    gidcmd="-g ${AFP_GID}"
+if [ -n "$AFP_GID" ]; then
+    gidcmd="-g $AFP_GID"
 fi
 
-adduser ${uidcmd} --no-create-home --disabled-password "${AFP_USER}" || true 2> /dev/null
-addgroup ${gidcmd} ${AFP_GROUP} || true 2> /dev/null
-addgroup ${AFP_USER} ${AFP_GROUP}
+adduser $uidcmd --no-create-home --disabled-password "$AFP_USER" 2>/dev/null || true
+addgroup $gidcmd "$AFP_GROUP" 2>/dev/null || true
+addgroup "$AFP_USER" "$AFP_GROUP"
 
-echo "${AFP_USER}:${AFP_PASS}" | chpasswd
+echo "$AFP_USER:$AFP_PASS" | chpasswd
 
 # Creating credentials for the RandNum UAM
-set +e
 if [ -f "/usr/local/etc/netatalk/afppasswd" ]; then
-	rm -f /usr/local/etc/netatalk/afppasswd
+    rm -f /usr/local/etc/netatalk/afppasswd
 fi
 afppasswd -c
-afppasswd -a -f -w "${AFP_PASS}" "${AFP_USER}"
-if [ $? -ne 0 ]; then
+if ! afppasswd -a -f -w "$AFP_PASS" "$AFP_USER"; then
     echo "NOTE: Use a password of 8 chars or less to authenticate with Mac OS 8 or earlier clients"
 fi
-set -e
-
-# Crude way to create a second AFP user
-if [ ! -z "${AFP_USER2}" ]; then
-    adduser --no-create-home --disabled-password "${AFP_USER2}" || true 2> /dev/null
-    addgroup ${AFP_USER2} ${AFP_GROUP}
 
-    echo "${AFP_USER2}:${AFP_PASS2}" | chpasswd
-
-    # Creating credentials for the RandNum UAM
-    set +e
-    afppasswd -a -f -w "${AFP_PASS2}" "${AFP_USER2}"
-    if [ $? -ne 0 ]; then
+# Optional second user
+if [ -n "$AFP_USER2" ]; then
+    adduser --no-create-home --disabled-password "$AFP_USER2" 2>/dev/null || true
+    addgroup "$AFP_USER2" "$AFP_GROUP"
+    echo "$AFP_USER2:$AFP_PASS2" | chpasswd
+    if ! afppasswd -a -f -w "$AFP_PASS2" "$AFP_USER2"; then
         echo "NOTE: Use a password of 8 chars or less to authenticate with Mac OS 8 or earlier clients"
     fi
-    set -e
 fi
 
 echo "*** Configuring shared volume"
-
-if [ ! -d /mnt/afpshare ]; then
-  mkdir /mnt/afpshare
-  echo "Warning: the file sharing volume will be lost when the container is stopped."
-  echo "Use a Docker volume to retain your data between runs."
-fi
-
-if [ ! -d /mnt/afpbackup ]; then
-  mkdir /mnt/afpbackup
-  echo "Warning: the Time Machine volume will be lost when the container is stopped."
-  echo "Use a Docker volume to retain your data between runs."
-fi
+[ -d /mnt/afpshare ] || mkdir /mnt/afpshare
+[ -d /mnt/afpbackup ] || mkdir /mnt/afpbackup
 
 echo "*** Fixing permissions"
-
-# Workarounds for afpd being weird about the permissions of the shared volume root
-chmod 2775 /mnt/afpshare
-chmod 2775 /mnt/afpbackup
-
-if [ ! -z "${AFP_UID}" ] && [ ! -z "${AFP_GID}" ]; then
-    chown "${AFP_UID}:${AFP_GID}" /mnt/afpshare /mnt/afpbackup
+chmod 2775 /mnt/afpshare /mnt/afpbackup
+if [ -n "$AFP_UID" ] && [ -n "$AFP_GID" ]; then
+    chown "$AFP_UID:$AFP_GID" /mnt/afpshare /mnt/afpbackup
 else
-    chown "${AFP_USER}:${AFP_GROUP}" /mnt/afpshare /mnt/afpbackup
+    chown "$AFP_USER:$AFP_GROUP" /mnt/afpshare /mnt/afpbackup
 fi
 
 echo "*** Removing residual lock files"
+mkdir -p /run/lock
+rm -f /run/lock/netatalk /run/lock/atalkd /run/lock/papd
 
-# Workaround for Alpine Docker image bug
-# https://github.com/Netatalk/netatalk/issues/1843
-if [ ! -d "/run/lock" ]; then
-    mkdir /run/lock
-fi
-
-if [ -f "/run/lock/netatalk" ]; then
-    rm -f /run/lock/netatalk
-fi
-
-if [ -f "/run/lock/atalkd" ]; then
-    rm -f /run/lock/atalkd
-fi
-
-if [ -f "/run/lock/papd" ]; then
-    rm -f /run/lock/papd
-fi
-
+echo "*** Configuring Netatalk"
 UAMS="uams_dhx.so uams_dhx2.so uams_randnum.so"
 
-if [ ! -z "${INSECURE_AUTH}" ]; then
-    UAMS+=" uams_clrtxt.so uams_guest.so"
-fi
-
-if [ ! -z "${DISABLE_TIMEMACHINE}" ]; then
-    TIMEMACHINE="no"
-else
-    TIMEMACHINE="yes"
-fi
-
-if [ -z "${SERVER_NAME}" ]; then
-    ATALK_NAME=$(hostname|cut -d. -f1)
-else
-    ATALK_NAME=${SERVER_NAME}
-fi
+[ -n "$VERBOSE" ] && TEST_FLAGS=-v
+[ -n "$INSECURE_AUTH" ] && UAMS="$UAMS uams_clrtxt.so uams_guest.so"
+[ -n "$DISABLE_TIMEMACHINE" ] && TIMEMACHINE="no" || TIMEMACHINE="yes"
+ATALK_NAME="${SERVER_NAME:-$(hostname | cut -d. -f1)}"
 
-if [ ! -z "${AFP_READONLY}" ]; then
+if [ -n "$AFP_READONLY" ]; then
     AFP_RWRO="rolist"
 else
     AFP_RWRO="rwlist"
 fi
 
-if [ ! -z "${VERBOSE}" ]; then
-    TEST_FLAGS=-v
-fi
-
-if [ -z "${MANUAL_CONFIG}" ]; then
-    echo "*** Configuring Netatalk"
+if [ -z "$MANUAL_CONFIG" ]; then
     cat <<EOF > /usr/local/etc/afp.conf
 [Global]
 appletalk = yes
 log file = /var/log/afpd.log
 log level = default:${AFP_LOGLEVEL:-info}
 spotlight = yes
-uam list = ${UAMS}
+uam list = $UAMS
 zeroconf name = ${SERVER_NAME:-Netatalk File Server}
 [${SHARE_NAME:-File Sharing}]
 appledouble = ea
 path = /mnt/afpshare
-valid users = ${AFP_USER} ${AFP_USER2}
-${AFP_RWRO} = ${AFP_USER} ${AFP_USER2}
+valid users = $AFP_USER $AFP_USER2
+$AFP_RWRO = $AFP_USER $AFP_USER2
 [${SHARE2_NAME:-Time Machine}]
 appledouble = ea
 path = /mnt/afpbackup
-time machine = ${TIMEMACHINE}
-valid users = ${AFP_USER} ${AFP_USER2}
-${AFP_RWRO} = ${AFP_USER} ${AFP_USER2}
+time machine = $TIMEMACHINE
+valid users = $AFP_USER $AFP_USER2
+$AFP_RWRO = $AFP_USER $AFP_USER2
 EOF
 fi
 
-if [ -z "${ATALKD_INTERFACE}" ]; then
-	echo "WARNING The AppleTalk services will NOT be started. The requirements are:"
-	echo "- The host OS has an AppleTalk networking stack, e.g. Linux or NetBSD."
-	echo "- The Docker container uses the \`host' network driver with the \`NET_ADMIN' capability."
-	echo "- The \`ATALKD_INTERFACE' environment variable is set to a valid host network interface."
-else
+# Configuring AppleTalk if enabled
+if [ -n "$ATALKD_INTERFACE" ]; then
     echo "*** Configuring AppleTalk"
-    echo "${ATALKD_INTERFACE} ${ATALKD_OPTIONS}" > /usr/local/etc/atalkd.conf
+    echo "$ATALKD_INTERFACE $ATALKD_OPTIONS" > /usr/local/etc/atalkd.conf
     echo "cupsautoadd:op=root:" > /usr/local/etc/papd.conf
-
-	echo "*** Starting AppleTalk services (this will take a minute)"
- 	cupsd
-	atalkd
-	nbprgstr -p 4 "${ATALK_NAME}:Workstation"
-	nbprgstr -p 4 "${ATALK_NAME}:netatalk"
-	papd
-	timelord -l
-	a2boot
+    echo "*** Starting AppleTalk services"
+    cupsd
+    atalkd
+    nbprgstr -p 4 "$ATALK_NAME:Workstation"
+    nbprgstr -p 4 "$ATALK_NAME:netatalk"
+    papd
+    timelord -l
+    a2boot
+else
+    echo "Set the \`ATALKD_INTERFACE' environment variable to start AppleTalk services."
 fi
 
 echo "*** Starting AFP server"
-
 if [ -z "$TESTSUITE" ]; then
     if [ -z "$AFP_DRYRUN" ]; then
-        # Prevent afpd from forking with '-d' parameter, to maintain container lifecycle
         netatalk -d
     else
         netatalk -V
     fi
 else
-    if [ "$TESTSUITE" == "spectest" ]; then
-        cat <<EXT > /usr/local/etc/extmap.conf
+    if [ "$TESTSUITE" = "spectest" ]; then
+    cat <<EXT > /usr/local/etc/extmap.conf
 .         "????"  "????"      Unix Binary                    Unix                      application/octet-stream
 .doc      "WDBN"  "MSWD"      Word Document                  Microsoft Word            application/msword
 .pdf      "PDF "  "CARO"      Portable Document Format       Acrobat Reader            application/pdf
 EXT
     fi
     netatalk
     sleep 2
-    if [ "$TESTSUITE" == "spectest" ]; then
-        afp_spectest "${TEST_FLAGS}" -"${AFP_VERSION}" -h 127.0.0.1 -p 548 -u "${AFP_USER}" -d "${AFP_USER2}" -w "${AFP_PASS}" -s "${SHARE_NAME}" -S "${SHARE2_NAME}" -c /mnt/afpshare
-    elif [ "$TESTSUITE" == "readonly" ]; then
-        echo "testfile uno" > /mnt/afpshare/first.txt
-        echo "testfile dos" > /mnt/afpshare/second.txt
-        mkdir /mnt/afpshare/third
-        afp_spectest "${TEST_FLAGS}" -"${AFP_VERSION}" -f Readonly_test -h 127.0.0.1 -p 548 -u "${AFP_USER}" -w "${AFP_PASS}" -s "${SHARE_NAME}"
-    elif [ "$TESTSUITE" == "login" ]; then
-        afp_logintest "${TEST_FLAGS}" -"${AFP_VERSION}" -h 127.0.0.1 -p 548 -u "${AFP_USER}" -w "${AFP_PASS}"
-    elif [ "$TESTSUITE" == "lan" ]; then
-        afp_lantest "${TEST_FLAGS}" -"${AFP_VERSION}" -h 127.0.0.1 -p 548 -u "${AFP_USER}" -w "${AFP_PASS}" -s "${SHARE_NAME}"
-    elif [ "$TESTSUITE" == "speed" ]; then
-        afp_speedtest "${TEST_FLAGS}" -"${AFP_VERSION}" -h 127.0.0.1 -p 548 -u "${AFP_USER}" -w "${AFP_PASS}" -s "${SHARE_NAME}"
-    else
-        echo "Unknown testsuite: ${TESTSUITE}"
-        exit 1
-    fi
+    case "$TESTSUITE" in
+        spectest)
+            afp_spectest "$TEST_FLAGS" -"$AFP_VERSION" -h 127.0.0.1 -p 548 -u "$AFP_USER" -d "$AFP_USER2" -w "$AFP_PASS" -s "$SHARE_NAME" -S "$SHARE2_NAME" -c /mnt/afpshare
+            ;;
+        readonly)
+            echo "testfile uno" > /mnt/afpshare/first.txt
+            echo "testfile dos" > /mnt/afpshare/second.txt
+            mkdir /mnt/afpshare/third
+            afp_spectest "$TEST_FLAGS" -"$AFP_VERSION" -h 127.0.0.1 -p 548 -u "$AFP_USER" -w "$AFP_PASS" -s "$SHARE_NAME"
+            ;;
+        login)
+            afp_logintest "$TEST_FLAGS" -"$AFP_VERSION" -h 127.0.0.1 -p 548 -u "$AFP_USER" -w "$AFP_PASS"
+            ;;
+        lan)
+            afp_lantest "$TEST_FLAGS" -"$AFP_VERSION" -h 127.0.0.1 -p 548 -u "$AFP_USER" -w "$AFP_PASS" -s "$SHARE_NAME"
+            ;;
+        speed)
+            afp_speedtest "$TEST_FLAGS" -"$AFP_VERSION" -h 127.0.0.1 -p 548 -u "$AFP_USER" -w "$AFP_PASS" -s "$SHARE_NAME"
+            ;;
+        *)
+            echo "Unknown testsuite: $TESTSUITE"
+            exit 1
+            ;;
+    esac
 fi
-Original file line number
+Diff line change
@@ -1,7 +1,6 @@
     ARG RUN_DEPS="\
         acl \
         avahi \
-        bash \
         cups \
         db \
         dbus \
@@ Expand Down @@