Skip to content

Commit

Permalink
Merge pull request #27 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 Nov 16, 2023
2 parents 28d1662 + a15a619 commit e8c16e2
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 @@ -92,7 +92,7 @@ jobs:

- uses: docker/build-push-action@v4
with:
tags: ghcr.io/shopware/docker-base:8.1.24-arm64
tags: ghcr.io/shopware/docker-base:8.1.25-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.24-amd64
tags: ghcr.io/shopware/docker-base:8.1.25-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.11-arm64
tags: ghcr.io/shopware/docker-base:8.2.12-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.11-amd64
tags: ghcr.io/shopware/docker-base:8.2.12-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.24-amd64 --amend ghcr.io/shopware/docker-base:8.1.24-arm64
- 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.24 --amend ghcr.io/shopware/docker-base:8.1.24-amd64 --amend ghcr.io/shopware/docker-base:8.1.24-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 push ghcr.io/shopware/docker-base:8.1

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

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

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

- 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.24 shopware/docker-base:8.1.24
- run: ./regctl-linux-amd64 image copy ghcr.io/shopware/docker-base:8.1.25 shopware/docker-base:8.1.25

- run: docker manifest create ghcr.io/shopware/docker-base:8.2 --amend ghcr.io/shopware/docker-base:8.2.11-amd64 --amend ghcr.io/shopware/docker-base:8.2.11-arm64
- 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.11 --amend ghcr.io/shopware/docker-base:8.2.11-amd64 --amend ghcr.io/shopware/docker-base:8.2.11-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 push ghcr.io/shopware/docker-base:8.2

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

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

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

- 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.11 shopware/docker-base:8.2.11
- run: ./regctl-linux-amd64 image copy ghcr.io/shopware/docker-base:8.2.12 shopware/docker-base:8.2.12

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

Expand Down
2 changes: 1 addition & 1 deletion 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.24-fpm-alpine@sha256:b65899ce19ab2b00b5ab22e2a806f121df51e36c8ae406f093ea61960aac2a12
FROM docker.io/library/php:8.1.25-fpm-alpine@sha256:de0006508154945664607803a2345bd8bb33fa94575e0970fe7c524c7464c247

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.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.11-fpm-alpine@sha256:28224c0a2deb2f3aca96ea748cb5b9ad549e1758274c36389bbfa45d3433cdcf
FROM docker.io/library/php:8.2.12-fpm-alpine@sha256:9a1f2a7dba5605e05926ad8d3e837609c17acc7210f9a495a753ebc01bd8fa66

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

Expand Down

0 comments on commit e8c16e2

Please sign in to comment.