update curl and apk-tools to address security issues

build/Dockerfile

@@ -25,6 +25,7 @@ RUN addgroup --gid ${GID} www-docker \
 RUN apk --update --no-cache add \
     libcap \
     openssl \
+    && apk --update --no-cache upgrade \
     && setcap 'cap_net_bind_service=+ep' /usr/sbin/nginx \
     && cd /usr/share/nginx \
     && rm -rf html/* \

helpers/update.sh

@@ -25,6 +25,15 @@ okNotify() {
     printf "%s[OK]%s\n" "$ok" "$norm"
 }
 
+makeDirectory() {
+    if ! [ -d "./$1" ]; then
+        if ! mkdir "./$1" >/dev/null 2>&1; then
+            errMsgString="Unable to make '$1' directory."
+            errMsg "$errMsgString" 40
+        fi
+    fi
+}
+
 scriptHelp() {
     textNewline
     textBlock "Update ${containerName} container and helper script files"
@@ -196,15 +205,17 @@ if [ "$doScriptUpdate" -eq 1 ]; then
                 printf "\n%s*** This script has been updated. Please re-run it to load the updated version of this file. ***%s\n\n" "$warn" "$norm"
                 # overwrite this script with updated script
                 mv -f ./update.sh.tmp "$localScriptName"
+                chmod +x "$localScriptName"
+                exit 0
             fi
         fi
     fi
 
     ## update files
-    # ensure directories exist
-    if ! mkdir config sites snippets >/dev/null 2>&1; then
-        errMsg "Unable to make directories in which to place updated files." 40
-    fi
+    makeDirectory "config"
+    makeDirectory "sites"
+    makeDirectory "snippets"
+
     while IFS='  ' read -r field1 field2; do
         if [ "$field2" = "update.sh" ]; then continue; fi
         printf "\nChecking '%s' for updates... " "$field2"
@@ -243,6 +254,10 @@ if [ "$doScriptUpdate" -eq 1 ]; then
                     updateSuccess=$((updateSuccess + 1))
                     # overwrite old version of file
                     mv -f "$updateFilename.tmp" "$updateFilename"
+                    if [ "${updateFilename##*.}" = "sh" ]; then
+                        # shell file --> make it executable
+                        chmod +x "$updateFilename"
+                    fi
                 fi
             fi
         else