diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2023-03-07 08:47:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-07 08:47:55 -0500 |
| commit | 1afd93cb6466b9dc9fdc0a1cd491ce8c14347899 (patch) | |
| tree | fe98261b6f290a6144c9f28970b5711ca3cd93ec /packaging | |
| parent | 1af0c0f144816f43d6f22b23da8d80be5e0f1f1c (diff) | |
Fix intermittent permissions issues in some Docker builds. (#14629)
* Fix intermittent permissions issues in some Docker builds.
* Fix issue with PPC64le builds.
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/docker/Dockerfile | 4 | ||||
| -rwxr-xr-x | packaging/docker/run.sh | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index 54387d67c4..fcd9432b52 100644 --- a/packaging/docker/Dockerfile +++ b/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 ##################################################################### diff --git a/packaging/docker/run.sh b/packaging/docker/run.sh index 9c2fcba664..ed77c394a7 100755 --- a/packaging/docker/run.sh +++ b/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) |