Fix entrypoint issues. Clean up Dockerfile build-deps.

goofball222 · Jun 22, 2021 · 61ac0ad · 61ac0ad
1 parent fb9d6cb
commit 61ac0ad
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 280 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 * **2021-06-21**
     * Switch to GitHub actions for builds
+    * Fix issue with logging time
+    * Stop checking for su-exec, fixes issue with Ubuntu Docker host, possibly others.
+    * Remove unneeded packages from build-deps
 ---
 * **2021-04-19**
     * Bump version to v2.2.6

diff --git a/experimental/Dockerfile b/experimental/Dockerfile
diff --git a/experimental/Makefile b/experimental/Makefile
diff --git a/experimental/VERSION b/experimental/VERSION
diff --git a/experimental/hooks/build b/experimental/hooks/build
diff --git a/experimental/root/usr/local/bin/docker-entrypoint.sh b/experimental/root/usr/local/bin/docker-entrypoint.sh
diff --git a/experimental/root/usr/local/bin/entrypoint-functions.sh b/experimental/root/usr/local/bin/entrypoint-functions.sh
diff --git a/stable/Dockerfile b/stable/Dockerfile
@@ -32,7 +32,7 @@ RUN \
     && addgroup -g $PGID doh \
     && adduser -D -G doh -u $PUID doh \
     && apk add -q --no-cache --virtual .build-deps \
-       gcc git go make musl-dev \
+       git go make \
     && apk add -q --no-cache \
         bash ca-certificates shadow su-exec tzdata \
     && bash -c 'mkdir -p {conf,data,src}' \

diff --git a/stable/root/usr/local/bin/docker-entrypoint.sh b/stable/root/usr/local/bin/docker-entrypoint.sh
@@ -3,8 +3,8 @@
 # Init script for DNS over HTTPS proxy Docker container
 # License: Apache-2.0
 # Github: https://github.com/goofball222/dns-over-https.git
-SCRIPT_VERSION="1.0.0"
-# Last updated date: 2018-11-12
+SCRIPT_VERSION="1.2.0"
+# Last updated date: 2021-06-21
 
 set -Eeuo pipefail
 
@@ -54,15 +54,11 @@ if [ "$(id -u)" = '0' ]; then
     if [[ "${@}" =~ 'doh-' ]]; then
         f_confchk
         f_giduid
-        if [ -x "/sbin/su-exec" ]; then
-            f_log "INFO - Use su-exec to drop privileges and start process as GID=${PGID}, UID=${PUID}"
-            f_log "EXEC - su-exec doh:doh ${@} -conf ${CONFFILE}"
-            exec su-exec doh:doh ${@} -conf ${CONFFILE} &
-            f_idle_handler
-        else
-            f_log "ERROR - su-exec NOT FOUND. Run state is invalid. Exiting."
-            exit 1;
-        fi
+
+        f_log "INFO - Use su-exec to drop privileges and start process as GID=${PGID}, UID=${PUID}"
+        f_log "EXEC - su-exec doh:doh ${@} -conf ${CONFFILE}"
+        exec su-exec doh:doh ${@} -conf ${CONFFILE} &
+        f_idle_handler
     else
         f_log "EXEC - ${@} as UID 0 (root)"
         exec "${@}"

diff --git a/stable/root/usr/local/bin/entrypoint-functions.sh b/stable/root/usr/local/bin/entrypoint-functions.sh
@@ -3,8 +3,8 @@
 # entrypoint-functions.sh script for UniFi Docker container
 # License: Apache-2.0
 # Github: https://github.com/goofball222/dns-over-https
-ENTRYPOINT_FUNCTIONS_VERSION="1.0.0"
-# Last updated date: 2018-11-12
+ENTRYPOINT_FUNCTIONS_VERSION="1.1.0"
+# Last updated date: 2021-06-21
 
 f_confchk() {
     cp ${DATADIR}/doh-client.conf.default ${CONFDIR}/doh-client.conf.default
@@ -41,6 +41,5 @@ f_giduid() {
 }
 
 f_log() {
-    echo "$(date +"[%Y-%m-%d %T,%3N]") <docker-entrypoint> $*"
+    echo "$(date -u +%FT$(nmeter -d0 '%3t' | head -n1)) <docker-entrypoint> $*"
 }
-