Browse Source

Fix intermittent permissions issues in some Docker builds. (#14629)

* Fix intermittent permissions issues in some Docker builds.

* Fix issue with PPC64le builds.
Austin S. Hemmelgarn 2 years ago
parent
commit
1afd93cb64
2 changed files with 5 additions and 1 deletions
  1. 3 1
      packaging/docker/Dockerfile
  2. 2 0
      packaging/docker/run.sh

+ 3 - 1
packaging/docker/Dockerfile

@@ -51,7 +51,9 @@ RUN mkdir -p /app/usr/sbin/ \
     mv /usr/sbin/netdatacli    /app/usr/sbin/ && \
     mv packaging/docker/run.sh        /app/usr/sbin/ && \
     mv packaging/docker/health.sh     /app/usr/sbin/ && \
-    cp -rp /deps/* /app/usr/local/ && \
+    mkdir -p /deps/etc && \
+    cp -rp /deps/etc /app/usr/local/etc && \
+    chmod -R o+rX /app && \
     chmod +x /app/usr/sbin/run.sh
 
 #####################################################################

+ 2 - 0
packaging/docker/run.sh

@@ -21,6 +21,8 @@ if [ ! "${DISABLE_TELEMETRY:-0}" -eq 0 ] ||
   touch /etc/netdata/.opt-out-from-anonymous-statistics
 fi
 
+chmod o+rX / # Needed to fix permissions issues in some cases.
+
 BALENA_PGID=$(stat -c %g /var/run/balena.sock 2>/dev/null || true)
 DOCKER_PGID=$(stat -c %g /var/run/docker.sock 2>/dev/null || true)