Skip to content

Commit

Permalink
Merge pull request #13 from FriendsOfShopware/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 Sep 30, 2023
2 parents 12133f2 + ee46410 commit 4dcdb39
Show file tree
Hide file tree
Showing 3 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@sha256:2fc9ea4c1925da2c2ee94fcd4e81a396deabc27f8c6c1d04cb60d7e4139e74a2 --link /usr/local/bin/supervisord /usr/bin/supervisord
COPY --from=docker.io/library/caddy:latest@sha256:d562fe2c43d80690d7311781945a4e581f518061443e25fbeced20eff729520c --link /usr/bin/caddy /usr/bin/caddy
COPY --from=docker.io/library/caddy:latest@sha256:df239ca80315c8271f9e87a981fb47124831f8b5a7c85970249d2dfd712479a3 --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.1/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.1.23-fpm-alpine@sha256:6f2996310701224eb03d157f5ee2ae6942020e28347465162b9f5702e40ee6bb
FROM docker.io/library/php:8.1.23-fpm-alpine@sha256:82b4692f29cfcde41b7c03dddfc908af1fe08b2ede6edf5160f90f3d032ac85d

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@sha256:2fc9ea4c1925da2c2ee94fcd4e81a396deabc27f8c6c1d04cb60d7e4139e74a2 --link /usr/local/bin/supervisord /usr/bin/supervisord
COPY --from=docker.io/library/caddy:latest@sha256:d562fe2c43d80690d7311781945a4e581f518061443e25fbeced20eff729520c --link /usr/bin/caddy /usr/bin/caddy
COPY --from=docker.io/library/caddy:latest@sha256:df239ca80315c8271f9e87a981fb47124831f8b5a7c85970249d2dfd712479a3 --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.2/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.2.10-fpm-alpine@sha256:e1c1abdceab987fc369dc0ba929b15aad0f438879e9133e08fdc67f1971c01e2
FROM docker.io/library/php:8.2.10-fpm-alpine@sha256:4dfcb10fced59075c1fc9e7bb2f0e425f975314f3bb40cff9f3560ceb5ca9040

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@sha256:2fc9ea4c1925da2c2ee94fcd4e81a396deabc27f8c6c1d04cb60d7e4139e74a2 --link /usr/local/bin/supervisord /usr/bin/supervisord
COPY --from=docker.io/library/caddy:latest@sha256:d562fe2c43d80690d7311781945a4e581f518061443e25fbeced20eff729520c --link /usr/bin/caddy /usr/bin/caddy
COPY --from=docker.io/library/caddy:latest@sha256:df239ca80315c8271f9e87a981fb47124831f8b5a7c85970249d2dfd712479a3 --link /usr/bin/caddy /usr/bin/caddy

ENV APP_ENV=prod \
APP_URL_CHECK_DISABLED=1 \
Expand Down

0 comments on commit 4dcdb39

Please sign in to comment.