Skip to content

Commit

Permalink
Merge pull request #42 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 Jan 6, 2024
2 parents 58ee177 + 7a9f337 commit eef6829
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
28 changes: 14 additions & 14 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ jobs:

- uses: docker/build-push-action@v4
with:
tags: ghcr.io/shopware/docker-base:8.2.13-arm64
tags: ghcr.io/shopware/docker-base:8.2.14-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.13-amd64
tags: ghcr.io/shopware/docker-base:8.2.14-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 @@ -198,7 +198,7 @@ jobs:

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

- uses: docker/build-push-action@v4
with:
tags: ghcr.io/shopware/docker-base:8.3.0-amd64
tags: ghcr.io/shopware/docker-base:8.3.1-amd64
context: "8.3"
cache-from: type=registry,ref=ghcr.io/shopware/docker-cache:8.3-amd64
cache-to: type=registry,ref=ghcr.io/shopware/docker-cache:8.3-amd64,mode=max
Expand Down Expand Up @@ -292,35 +292,35 @@ jobs:

- 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.13-amd64 --amend ghcr.io/shopware/docker-base:8.2.13-arm64
- run: docker manifest create ghcr.io/shopware/docker-base:8.2 --amend ghcr.io/shopware/docker-base:8.2.14-amd64 --amend ghcr.io/shopware/docker-base:8.2.14-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 create ghcr.io/shopware/docker-base:8.2.14 --amend ghcr.io/shopware/docker-base:8.2.14-amd64 --amend ghcr.io/shopware/docker-base:8.2.14-arm64

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

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

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

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

- 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.13 shopware/docker-base:8.2.13
- run: ./regctl-linux-amd64 image copy ghcr.io/shopware/docker-base:8.2.14 shopware/docker-base:8.2.14

- 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
- run: docker manifest create ghcr.io/shopware/docker-base:8.3 --amend ghcr.io/shopware/docker-base:8.3.1-amd64 --amend ghcr.io/shopware/docker-base:8.3.1-arm64

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

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

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

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

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

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

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

2 changes: 1 addition & 1 deletion 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.13-fpm-alpine@sha256:6f9c039355ed804eea25a47c93cd958a1a8422692a8d9b3caee1a16e5f9562b0
FROM docker.io/library/php:8.2.14-fpm-alpine@sha256:27d888ffb761d4ceb967067bb23859347a0b644e1bad589c73a2a8a5b184a73d

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

Expand Down
2 changes: 1 addition & 1 deletion 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:1ddc15c27a04d02521a9ec6137211bad3d7380286136b79c7a25f59f61a774a7
FROM docker.io/library/php:8.3.1-fpm-alpine@sha256:3b8c170dfa6e6c06a074656837af4ca9b5e8dc748f5ced0785a46f018f2b1dc8

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

Expand Down

0 comments on commit eef6829

Please sign in to comment.