diff --git a/Dockerfile b/Dockerfile index 94441b57e..52ac1f5fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,9 +18,7 @@ VOLUME /app/var/ # persistent / runtime deps # hadolint ignore=DL3008 RUN apt-get update && apt-get install -y --no-install-recommends \ - acl \ file \ - gettext \ git \ && rm -rf /var/lib/apt/lists/* diff --git a/docs/alpine.md b/docs/alpine.md index 012f577be..4fb98c555 100644 --- a/docs/alpine.md +++ b/docs/alpine.md @@ -14,16 +14,12 @@ To switch to Alpine-based images, apply the following changes to the `Dockerfile -# hadolint ignore=DL3008 -RUN apt-get update && apt-get install -y --no-install-recommends \ -- acl \ - file \ -- gettext \ - git \ - && rm -rf /var/lib/apt/lists/* +# hadolint ignore=DL3018 +RUN apk add --no-cache \ -+ acl \ + file \ -+ gettext \ + git \ + ; ``` diff --git a/frankenphp/docker-entrypoint.sh b/frankenphp/docker-entrypoint.sh index 82cb1ff58..2054854ca 100755 --- a/frankenphp/docker-entrypoint.sh +++ b/frankenphp/docker-entrypoint.sh @@ -57,9 +57,6 @@ if [ "$1" = 'frankenphp' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/console' ]; then fi fi - setfacl -R -m u:www-data:rwX -m u:"$(whoami)":rwX var - setfacl -dR -m u:www-data:rwX -m u:"$(whoami)":rwX var - echo 'PHP app ready!' fi