Merge pull request #734 from Paraphraser/20231009-mosquitto-dockerfil…

…e-master 2023-10-09 Mosquitto Dockerfile - master branch - PR 1 of 2
SensorsIot · Oct 11, 2023 · 2cc7488 · 2cc7488
2 parents e820f56 + f49818b
commit 2cc7488
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/.templates/mosquitto/Dockerfile b/.templates/mosquitto/Dockerfile
@@ -45,9 +45,4 @@ VOLUME ["/mosquitto/config", "/mosquitto/pwfile"]
 LABEL com.github.SensorsIot.IOTstack.Dockerfile.build-args="${MOSQUITTO_BASE}"
 LABEL com.github.SensorsIot.IOTstack.Dockerfile.based-on="https://github.com/eclipse/mosquitto"
 
-# don't need these variables in the running container
-ENV MOSQUITTO_BASE=
-ENV HEALTHCHECK_SCRIPT=
-ENV IOTSTACK_ENTRY_POINT=
-
 # EOF
diff --git a/.templates/mosquitto/docker-entrypoint.sh b/.templates/mosquitto/docker-entrypoint.sh
@@ -15,7 +15,6 @@ if [ "$user" = '0' -a -d "/mosquitto" ]; then
    chown -Rc mosquitto:mosquitto /mosquitto
 
    # specific requirements for the password file
-   chown -c root:root "$PWFILE"
    chmod -c 600 "$PWFILE"
 
    echo "[IOTstack] end self-repair"