Skip to content

Commit

Permalink
Merge pull request #35 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
shopwareBot authored Dec 9, 2023
2 parents 0e1c9b1 + 07c1ba0 commit e34c1f3
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 20 deletions.
28 changes: 14 additions & 14 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:

- uses: docker/build-push-action@v4
with:
tags: ghcr.io/shopware/docker-base:8.1.25-arm64
tags: ghcr.io/shopware/docker-base:8.1.26-arm64
context: "8.1"
cache-from: type=registry,ref=ghcr.io/shopware/docker-cache:8.1-arm64
cache-to: type=registry,ref=ghcr.io/shopware/docker-cache:8.1-arm64,mode=max
Expand All @@ -117,7 +117,7 @@ jobs:

- uses: docker/build-push-action@v4
with:
tags: ghcr.io/shopware/docker-base:8.1.25-amd64
tags: ghcr.io/shopware/docker-base:8.1.26-amd64
context: "8.1"
cache-from: type=registry,ref=ghcr.io/shopware/docker-cache:8.1-amd64
cache-to: type=registry,ref=ghcr.io/shopware/docker-cache:8.1-amd64,mode=max
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:

- uses: docker/build-push-action@v4
with:
tags: ghcr.io/shopware/docker-base:8.2.12-arm64
tags: ghcr.io/shopware/docker-base:8.2.13-arm64
context: "8.2"
cache-from: type=registry,ref=ghcr.io/shopware/docker-cache:8.2-arm64
cache-to: type=registry,ref=ghcr.io/shopware/docker-cache:8.2-arm64,mode=max
Expand All @@ -170,7 +170,7 @@ jobs:

- uses: docker/build-push-action@v4
with:
tags: ghcr.io/shopware/docker-base:8.2.12-amd64
tags: ghcr.io/shopware/docker-base:8.2.13-amd64
context: "8.2"
cache-from: type=registry,ref=ghcr.io/shopware/docker-cache:8.2-amd64
cache-to: type=registry,ref=ghcr.io/shopware/docker-cache:8.2-amd64,mode=max
Expand Down Expand Up @@ -276,37 +276,37 @@ jobs:

- run: ./regctl-linux-amd64 image copy ghcr.io/shopware/docker-base:8.0.28 shopware/docker-base:8.0.28

- run: docker manifest create ghcr.io/shopware/docker-base:8.1 --amend ghcr.io/shopware/docker-base:8.1.25-amd64 --amend ghcr.io/shopware/docker-base:8.1.25-arm64
- run: docker manifest create ghcr.io/shopware/docker-base:8.1 --amend ghcr.io/shopware/docker-base:8.1.26-amd64 --amend ghcr.io/shopware/docker-base:8.1.26-arm64

- run: docker manifest create ghcr.io/shopware/docker-base:8.1.25 --amend ghcr.io/shopware/docker-base:8.1.25-amd64 --amend ghcr.io/shopware/docker-base:8.1.25-arm64
- run: docker manifest create ghcr.io/shopware/docker-base:8.1.26 --amend ghcr.io/shopware/docker-base:8.1.26-amd64 --amend ghcr.io/shopware/docker-base:8.1.26-arm64

- run: docker manifest push ghcr.io/shopware/docker-base:8.1

- run: docker manifest push ghcr.io/shopware/docker-base:8.1.25
- run: docker manifest push ghcr.io/shopware/docker-base:8.1.26

- run: cosign sign --yes ghcr.io/shopware/docker-base:8.1

- run: cosign sign --yes ghcr.io/shopware/docker-base:8.1.25
- run: cosign sign --yes ghcr.io/shopware/docker-base:8.1.26

- run: ./regctl-linux-amd64 image copy ghcr.io/shopware/docker-base:8.1 shopware/docker-base:8.1

- run: ./regctl-linux-amd64 image copy ghcr.io/shopware/docker-base:8.1.25 shopware/docker-base:8.1.25
- run: ./regctl-linux-amd64 image copy ghcr.io/shopware/docker-base:8.1.26 shopware/docker-base:8.1.26

- run: docker manifest create ghcr.io/shopware/docker-base:8.2 --amend ghcr.io/shopware/docker-base:8.2.12-amd64 --amend ghcr.io/shopware/docker-base:8.2.12-arm64
- run: docker manifest create ghcr.io/shopware/docker-base:8.2 --amend ghcr.io/shopware/docker-base:8.2.13-amd64 --amend ghcr.io/shopware/docker-base:8.2.13-arm64

- run: docker manifest create ghcr.io/shopware/docker-base:8.2.12 --amend ghcr.io/shopware/docker-base:8.2.12-amd64 --amend ghcr.io/shopware/docker-base:8.2.12-arm64
- run: docker manifest create ghcr.io/shopware/docker-base:8.2.13 --amend ghcr.io/shopware/docker-base:8.2.13-amd64 --amend ghcr.io/shopware/docker-base:8.2.13-arm64

- run: docker manifest push ghcr.io/shopware/docker-base:8.2

- run: docker manifest push ghcr.io/shopware/docker-base:8.2.12
- run: docker manifest push ghcr.io/shopware/docker-base:8.2.13

- run: cosign sign --yes ghcr.io/shopware/docker-base:8.2

- run: cosign sign --yes ghcr.io/shopware/docker-base:8.2.12
- run: cosign sign --yes ghcr.io/shopware/docker-base:8.2.13

- run: ./regctl-linux-amd64 image copy ghcr.io/shopware/docker-base:8.2 shopware/docker-base:8.2

- run: ./regctl-linux-amd64 image copy ghcr.io/shopware/docker-base:8.2.12 shopware/docker-base:8.2.12
- run: ./regctl-linux-amd64 image copy ghcr.io/shopware/docker-base:8.2.13 shopware/docker-base:8.2.13

- run: docker manifest create ghcr.io/shopware/docker-base:8.3 --amend ghcr.io/shopware/docker-base:8.3.0-amd64 --amend ghcr.io/shopware/docker-base:8.3.0-arm64

Expand Down
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:9eb928f0a3142d0a38e6d457f7696c08c13e070d49d6499cc5b0afe644ecb281 --link /usr/bin/caddy /usr/bin/caddy
COPY --from=docker.io/library/caddy:latest@sha256:e523a9bc9e19fb96a082b4d83ebae2ce6267f56f2b7b4ac462135ebc51f68e58 --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.25-fpm-alpine@sha256:de0006508154945664607803a2345bd8bb33fa94575e0970fe7c524c7464c247
FROM docker.io/library/php:8.1.26-fpm-alpine@sha256:6c32f85ffab63a5308d4237078ef6a903b8161c3456332d6e2e5b2ee658dfb9e

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:9eb928f0a3142d0a38e6d457f7696c08c13e070d49d6499cc5b0afe644ecb281 --link /usr/bin/caddy /usr/bin/caddy
COPY --from=docker.io/library/caddy:latest@sha256:e523a9bc9e19fb96a082b4d83ebae2ce6267f56f2b7b4ac462135ebc51f68e58 --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.12-fpm-alpine@sha256:9a1f2a7dba5605e05926ad8d3e837609c17acc7210f9a495a753ebc01bd8fa66
FROM docker.io/library/php:8.2.13-fpm-alpine@sha256:0eeb1e24231711e5e0b9a6e746cfd7fdc0a39682404cfccbebf8ff846f819bad

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:9eb928f0a3142d0a38e6d457f7696c08c13e070d49d6499cc5b0afe644ecb281 --link /usr/bin/caddy /usr/bin/caddy
COPY --from=docker.io/library/caddy:latest@sha256:e523a9bc9e19fb96a082b4d83ebae2ce6267f56f2b7b4ac462135ebc51f68e58 --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.3/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:9eb928f0a3142d0a38e6d457f7696c08c13e070d49d6499cc5b0afe644ecb281 --link /usr/bin/caddy /usr/bin/caddy
COPY --from=docker.io/library/caddy:latest@sha256:e523a9bc9e19fb96a082b4d83ebae2ce6267f56f2b7b4ac462135ebc51f68e58 --link /usr/bin/caddy /usr/bin/caddy

ENV APP_ENV=prod \
APP_URL_CHECK_DISABLED=1 \
Expand Down

0 comments on commit e34c1f3

Please sign in to comment.