Skip to content

Commit

Permalink
Merge pull request #38 from shopware/create-pull-request/patch
Browse files Browse the repository at this point in the history
Changes by create-pull-request action
  • Loading branch information
shyim authored Dec 14, 2023
2 parents dab9482 + 505f687 commit b7ced85
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion 8.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN apk add --no-cache icu-data-full curl jq && \
rm -f /usr/local/etc/php-fpm.d/www.conf.default

COPY --from=ghcr.io/shyim/supervisord:latest --link /usr/local/bin/supervisord /usr/bin/supervisord
COPY --from=docker.io/library/caddy:latest@sha256:e523a9bc9e19fb96a082b4d83ebae2ce6267f56f2b7b4ac462135ebc51f68e58 --link /usr/bin/caddy /usr/bin/caddy
COPY --from=docker.io/library/caddy:latest@sha256:2f148ddb6662b4245ef4ced637e928eaf67a8a1941572d69627652253e779366 --link /usr/bin/caddy /usr/bin/caddy

ENV APP_ENV=prod \
APP_URL_CHECK_DISABLED=1 \
Expand Down
2 changes: 1 addition & 1 deletion 8.1/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN apk add --no-cache icu-data-full curl jq && \
rm -f /usr/local/etc/php-fpm.d/www.conf.default

COPY --from=ghcr.io/shyim/supervisord:latest --link /usr/local/bin/supervisord /usr/bin/supervisord
COPY --from=docker.io/library/caddy:latest@sha256:e523a9bc9e19fb96a082b4d83ebae2ce6267f56f2b7b4ac462135ebc51f68e58 --link /usr/bin/caddy /usr/bin/caddy
COPY --from=docker.io/library/caddy:latest@sha256:2f148ddb6662b4245ef4ced637e928eaf67a8a1941572d69627652253e779366 --link /usr/bin/caddy /usr/bin/caddy

ENV APP_ENV=prod \
APP_URL_CHECK_DISABLED=1 \
Expand Down
2 changes: 1 addition & 1 deletion 8.2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN apk add --no-cache icu-data-full curl jq && \
rm -f /usr/local/etc/php-fpm.d/www.conf.default

COPY --from=ghcr.io/shyim/supervisord:latest --link /usr/local/bin/supervisord /usr/bin/supervisord
COPY --from=docker.io/library/caddy:latest@sha256:e523a9bc9e19fb96a082b4d83ebae2ce6267f56f2b7b4ac462135ebc51f68e58 --link /usr/bin/caddy /usr/bin/caddy
COPY --from=docker.io/library/caddy:latest@sha256:2f148ddb6662b4245ef4ced637e928eaf67a8a1941572d69627652253e779366 --link /usr/bin/caddy /usr/bin/caddy

ENV APP_ENV=prod \
APP_URL_CHECK_DISABLED=1 \
Expand Down
4 changes: 2 additions & 2 deletions 8.3/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#syntax=docker/dockerfile:1.4

FROM docker.io/library/php:8.3.0-fpm-alpine@sha256:5988e51f5003fe465510d29575aaa567215b54721e1f417bbd532090a4df0406
FROM docker.io/library/php:8.3.0-fpm-alpine@sha256:db3111594618c4f96b5f1696b325ea82a72f462827a64ceb44a52b291b67f67c

ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/

Expand All @@ -15,7 +15,7 @@ RUN apk add --no-cache icu-data-full curl jq && \
rm -f /usr/local/etc/php-fpm.d/www.conf.default

COPY --from=ghcr.io/shyim/supervisord:latest --link /usr/local/bin/supervisord /usr/bin/supervisord
COPY --from=docker.io/library/caddy:latest@sha256:e523a9bc9e19fb96a082b4d83ebae2ce6267f56f2b7b4ac462135ebc51f68e58 --link /usr/bin/caddy /usr/bin/caddy
COPY --from=docker.io/library/caddy:latest@sha256:2f148ddb6662b4245ef4ced637e928eaf67a8a1941572d69627652253e779366 --link /usr/bin/caddy /usr/bin/caddy

ENV APP_ENV=prod \
APP_URL_CHECK_DISABLED=1 \
Expand Down

0 comments on commit b7ced85

Please sign in to comment.