Skip to content

Commit

Permalink
Merge pull request #29 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 28, 2023
2 parents cfd1f71 + 5a19f55 commit 90ca477
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ jobs:

- uses: docker/build-push-action@v4
with:
tags: ghcr.io/shopware/docker-base:8.3.0RC5-arm64
tags: ghcr.io/shopware/docker-base:8.3.0-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.0RC5-amd64
tags: ghcr.io/shopware/docker-base:8.3.0-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 @@ -308,19 +308,19 @@ jobs:

- 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
- 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.0RC5 --amend ghcr.io/shopware/docker-base:8.3.0RC5-amd64 --amend ghcr.io/shopware/docker-base:8.3.0RC5-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 push ghcr.io/shopware/docker-base:8.3

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

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

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

- 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.0RC5 shopware/docker-base:8.3.0RC5
- run: ./regctl-linux-amd64 image copy ghcr.io/shopware/docker-base:8.3.0 shopware/docker-base:8.3.0

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.0RC5-fpm-alpine@sha256:0fd27d03937fceed301c946f4d08b5c0946e67069b9c2053d3d221b49e84960a
FROM docker.io/library/php:8.3.0-fpm-alpine@sha256:45c40409414f82018c3da93657c5e5f45fdf677ca72aa8d8a460c20fba9f8230

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

Expand Down

0 comments on commit 90ca477

Please sign in to comment.