From 07c1ba0dcabfa5d48f156854398bb470a1dbe36a Mon Sep 17 00:00:00 2001 From: shopwareBot Date: Sat, 9 Dec 2023 10:58:29 +0000 Subject: [PATCH] New docker updates --- .github/workflows/build.yml | 28 ++++++++++++++-------------- 8.0/Dockerfile | 2 +- 8.1/Dockerfile | 4 ++-- 8.2/Dockerfile | 4 ++-- 8.3/Dockerfile | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0fecab2..e86bfb1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/8.0/Dockerfile b/8.0/Dockerfile index a960c60..fe80327 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -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 \ diff --git a/8.1/Dockerfile b/8.1/Dockerfile index ccc662b..61d05df 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -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/ @@ -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 \ diff --git a/8.2/Dockerfile b/8.2/Dockerfile index a7aeca2..c3598fc 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -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/ @@ -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 \ diff --git a/8.3/Dockerfile b/8.3/Dockerfile index adde3e9..f4bf684 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -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 \