Skip to content

Commit

Permalink
Merge pull request #112 from shyim/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 Aug 23, 2023
2 parents 80d153d + 9b5c788 commit 0597db9
Show file tree
Hide file tree
Showing 9 changed files with 123 additions and 127 deletions.
106 changes: 53 additions & 53 deletions .github/workflows/shopware.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,54 @@ on:
- ".github/workflows/shopware.yml"
- "version.txt"
jobs:
shopware-v6_5_4_1-8_1:
name: v6.5.4.1 with PHP 8.1
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3

- name: Login into Docker Hub Registery
run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "shyim" --password-stdin

- name: Login into Github Docker Registery
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin

- name: Set up QEMU
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2

- name: Build PHP Web
run: docker buildx build -f ./shopware/8.1/6.5.4.1/Dockerfile --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:latest --tag shyim/shopware:latest --tag ghcr.io/shyim/shopware:latest-php8.1 --tag shyim/shopware:latest-php8.1 --tag ghcr.io/shyim/shopware:latest-php8.1.22 --tag shyim/shopware:latest-php8.1.22 --tag ghcr.io/shyim/shopware:6.5 --tag shyim/shopware:6.5 --tag ghcr.io/shyim/shopware:6.5-php8.1 --tag shyim/shopware:6.5-php8.1 --tag ghcr.io/shyim/shopware:6.5-php8.1.22 --tag shyim/shopware:6.5-php8.1.22 --tag ghcr.io/shyim/shopware:6.5.4 --tag shyim/shopware:6.5.4 --tag ghcr.io/shyim/shopware:6.5.4-php8.1 --tag shyim/shopware:6.5.4-php8.1 --tag ghcr.io/shyim/shopware:6.5.4-php8.1.22 --tag shyim/shopware:6.5.4-php8.1.22 --tag ghcr.io/shyim/shopware:6.5.4.1 --tag shyim/shopware:6.5.4.1 --tag ghcr.io/shyim/shopware:6.5.4.1-php8.1 --tag shyim/shopware:6.5.4.1-php8.1 --tag ghcr.io/shyim/shopware:6.5.4.1-php8.1.22 --tag shyim/shopware:6.5.4.1-php8.1.22 --push .

- name: Build PHP CLI
run: docker buildx build -f ./shopware/8.1/6.5.4.1/Dockerfile.cli --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:cli-latest --tag shyim/shopware:cli-latest --tag ghcr.io/shyim/shopware:cli-latest-php8.1 --tag shyim/shopware:cli-latest-php8.1 --tag ghcr.io/shyim/shopware:cli-latest-php8.1.22 --tag shyim/shopware:cli-latest-php8.1.22 --tag ghcr.io/shyim/shopware:cli-6.5 --tag shyim/shopware:cli-6.5 --tag ghcr.io/shyim/shopware:cli-6.5-php8.1 --tag shyim/shopware:cli-6.5-php8.1 --tag ghcr.io/shyim/shopware:cli-6.5-php8.1.22 --tag shyim/shopware:cli-6.5-php8.1.22 --tag ghcr.io/shyim/shopware:cli-6.5.4 --tag shyim/shopware:cli-6.5.4 --tag ghcr.io/shyim/shopware:cli-6.5.4-php8.1 --tag shyim/shopware:cli-6.5.4-php8.1 --tag ghcr.io/shyim/shopware:cli-6.5.4-php8.1.22 --tag shyim/shopware:cli-6.5.4-php8.1.22 --tag ghcr.io/shyim/shopware:cli-6.5.4.1 --tag shyim/shopware:cli-6.5.4.1 --tag ghcr.io/shyim/shopware:cli-6.5.4.1-php8.1 --tag shyim/shopware:cli-6.5.4.1-php8.1 --tag ghcr.io/shyim/shopware:cli-6.5.4.1-php8.1.22 --tag shyim/shopware:cli-6.5.4.1-php8.1.22 --push .
shopware-v6_5_4_1-8_2:
name: v6.5.4.1 with PHP 8.2
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3

- name: Login into Docker Hub Registery
run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "shyim" --password-stdin

- name: Login into Github Docker Registery
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin

- name: Set up QEMU
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2

- name: Build PHP Web
run: docker buildx build -f ./shopware/8.2/6.5.4.1/Dockerfile --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:latest-php8.2 --tag shyim/shopware:latest-php8.2 --tag ghcr.io/shyim/shopware:latest-php8.2.9 --tag shyim/shopware:latest-php8.2.9 --tag ghcr.io/shyim/shopware:6.5-php8.2 --tag shyim/shopware:6.5-php8.2 --tag ghcr.io/shyim/shopware:6.5-php8.2.9 --tag shyim/shopware:6.5-php8.2.9 --tag ghcr.io/shyim/shopware:6.5.4-php8.2 --tag shyim/shopware:6.5.4-php8.2 --tag ghcr.io/shyim/shopware:6.5.4-php8.2.9 --tag shyim/shopware:6.5.4-php8.2.9 --tag ghcr.io/shyim/shopware:6.5.4.1-php8.2 --tag shyim/shopware:6.5.4.1-php8.2 --tag ghcr.io/shyim/shopware:6.5.4.1-php8.2.9 --tag shyim/shopware:6.5.4.1-php8.2.9 --push .

- name: Build PHP CLI
run: docker buildx build -f ./shopware/8.2/6.5.4.1/Dockerfile.cli --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:cli-latest-php8.2 --tag shyim/shopware:cli-latest-php8.2 --tag ghcr.io/shyim/shopware:cli-latest-php8.2.9 --tag shyim/shopware:cli-latest-php8.2.9 --tag ghcr.io/shyim/shopware:cli-6.5-php8.2 --tag shyim/shopware:cli-6.5-php8.2 --tag ghcr.io/shyim/shopware:cli-6.5-php8.2.9 --tag shyim/shopware:cli-6.5-php8.2.9 --tag ghcr.io/shyim/shopware:cli-6.5.4-php8.2 --tag shyim/shopware:cli-6.5.4-php8.2 --tag ghcr.io/shyim/shopware:cli-6.5.4-php8.2.9 --tag shyim/shopware:cli-6.5.4-php8.2.9 --tag ghcr.io/shyim/shopware:cli-6.5.4.1-php8.2 --tag shyim/shopware:cli-6.5.4.1-php8.2 --tag ghcr.io/shyim/shopware:cli-6.5.4.1-php8.2.9 --tag shyim/shopware:cli-6.5.4.1-php8.2.9 --push .
shopware-v6_5_4_0-8_1:
name: v6.5.4.0 with PHP 8.1
runs-on: ubuntu-20.04
Expand All @@ -28,10 +76,10 @@ jobs:
uses: docker/setup-buildx-action@v2

- name: Build PHP Web
run: docker buildx build -f ./shopware/8.1/6.5.4.0/Dockerfile --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:latest --tag shyim/shopware:latest --tag ghcr.io/shyim/shopware:latest-php8.1 --tag shyim/shopware:latest-php8.1 --tag ghcr.io/shyim/shopware:latest-php8.1.22 --tag shyim/shopware:latest-php8.1.22 --tag ghcr.io/shyim/shopware:6.5 --tag shyim/shopware:6.5 --tag ghcr.io/shyim/shopware:6.5-php8.1 --tag shyim/shopware:6.5-php8.1 --tag ghcr.io/shyim/shopware:6.5-php8.1.22 --tag shyim/shopware:6.5-php8.1.22 --tag ghcr.io/shyim/shopware:6.5.4 --tag shyim/shopware:6.5.4 --tag ghcr.io/shyim/shopware:6.5.4-php8.1 --tag shyim/shopware:6.5.4-php8.1 --tag ghcr.io/shyim/shopware:6.5.4-php8.1.22 --tag shyim/shopware:6.5.4-php8.1.22 --tag ghcr.io/shyim/shopware:6.5.4.0 --tag shyim/shopware:6.5.4.0 --tag ghcr.io/shyim/shopware:6.5.4.0-php8.1 --tag shyim/shopware:6.5.4.0-php8.1 --tag ghcr.io/shyim/shopware:6.5.4.0-php8.1.22 --tag shyim/shopware:6.5.4.0-php8.1.22 --push .
run: docker buildx build -f ./shopware/8.1/6.5.4.0/Dockerfile --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:6.5.4.0 --tag shyim/shopware:6.5.4.0 --tag ghcr.io/shyim/shopware:6.5.4.0-php8.1 --tag shyim/shopware:6.5.4.0-php8.1 --tag ghcr.io/shyim/shopware:6.5.4.0-php8.1.22 --tag shyim/shopware:6.5.4.0-php8.1.22 --push .

- name: Build PHP CLI
run: docker buildx build -f ./shopware/8.1/6.5.4.0/Dockerfile.cli --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:cli-latest --tag shyim/shopware:cli-latest --tag ghcr.io/shyim/shopware:cli-latest-php8.1 --tag shyim/shopware:cli-latest-php8.1 --tag ghcr.io/shyim/shopware:cli-latest-php8.1.22 --tag shyim/shopware:cli-latest-php8.1.22 --tag ghcr.io/shyim/shopware:cli-6.5 --tag shyim/shopware:cli-6.5 --tag ghcr.io/shyim/shopware:cli-6.5-php8.1 --tag shyim/shopware:cli-6.5-php8.1 --tag ghcr.io/shyim/shopware:cli-6.5-php8.1.22 --tag shyim/shopware:cli-6.5-php8.1.22 --tag ghcr.io/shyim/shopware:cli-6.5.4 --tag shyim/shopware:cli-6.5.4 --tag ghcr.io/shyim/shopware:cli-6.5.4-php8.1 --tag shyim/shopware:cli-6.5.4-php8.1 --tag ghcr.io/shyim/shopware:cli-6.5.4-php8.1.22 --tag shyim/shopware:cli-6.5.4-php8.1.22 --tag ghcr.io/shyim/shopware:cli-6.5.4.0 --tag shyim/shopware:cli-6.5.4.0 --tag ghcr.io/shyim/shopware:cli-6.5.4.0-php8.1 --tag shyim/shopware:cli-6.5.4.0-php8.1 --tag ghcr.io/shyim/shopware:cli-6.5.4.0-php8.1.22 --tag shyim/shopware:cli-6.5.4.0-php8.1.22 --push .
run: docker buildx build -f ./shopware/8.1/6.5.4.0/Dockerfile.cli --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:cli-6.5.4.0 --tag shyim/shopware:cli-6.5.4.0 --tag ghcr.io/shyim/shopware:cli-6.5.4.0-php8.1 --tag shyim/shopware:cli-6.5.4.0-php8.1 --tag ghcr.io/shyim/shopware:cli-6.5.4.0-php8.1.22 --tag shyim/shopware:cli-6.5.4.0-php8.1.22 --push .
shopware-v6_5_4_0-8_2:
name: v6.5.4.0 with PHP 8.2
runs-on: ubuntu-20.04
Expand All @@ -52,10 +100,10 @@ jobs:
uses: docker/setup-buildx-action@v2

- name: Build PHP Web
run: docker buildx build -f ./shopware/8.2/6.5.4.0/Dockerfile --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:latest-php8.2 --tag shyim/shopware:latest-php8.2 --tag ghcr.io/shyim/shopware:latest-php8.2.9 --tag shyim/shopware:latest-php8.2.9 --tag ghcr.io/shyim/shopware:6.5-php8.2 --tag shyim/shopware:6.5-php8.2 --tag ghcr.io/shyim/shopware:6.5-php8.2.9 --tag shyim/shopware:6.5-php8.2.9 --tag ghcr.io/shyim/shopware:6.5.4-php8.2 --tag shyim/shopware:6.5.4-php8.2 --tag ghcr.io/shyim/shopware:6.5.4-php8.2.9 --tag shyim/shopware:6.5.4-php8.2.9 --tag ghcr.io/shyim/shopware:6.5.4.0-php8.2 --tag shyim/shopware:6.5.4.0-php8.2 --tag ghcr.io/shyim/shopware:6.5.4.0-php8.2.9 --tag shyim/shopware:6.5.4.0-php8.2.9 --push .
run: docker buildx build -f ./shopware/8.2/6.5.4.0/Dockerfile --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:6.5.4.0-php8.2 --tag shyim/shopware:6.5.4.0-php8.2 --tag ghcr.io/shyim/shopware:6.5.4.0-php8.2.9 --tag shyim/shopware:6.5.4.0-php8.2.9 --push .

- name: Build PHP CLI
run: docker buildx build -f ./shopware/8.2/6.5.4.0/Dockerfile.cli --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:cli-latest-php8.2 --tag shyim/shopware:cli-latest-php8.2 --tag ghcr.io/shyim/shopware:cli-latest-php8.2.9 --tag shyim/shopware:cli-latest-php8.2.9 --tag ghcr.io/shyim/shopware:cli-6.5-php8.2 --tag shyim/shopware:cli-6.5-php8.2 --tag ghcr.io/shyim/shopware:cli-6.5-php8.2.9 --tag shyim/shopware:cli-6.5-php8.2.9 --tag ghcr.io/shyim/shopware:cli-6.5.4-php8.2 --tag shyim/shopware:cli-6.5.4-php8.2 --tag ghcr.io/shyim/shopware:cli-6.5.4-php8.2.9 --tag shyim/shopware:cli-6.5.4-php8.2.9 --tag ghcr.io/shyim/shopware:cli-6.5.4.0-php8.2 --tag shyim/shopware:cli-6.5.4.0-php8.2 --tag ghcr.io/shyim/shopware:cli-6.5.4.0-php8.2.9 --tag shyim/shopware:cli-6.5.4.0-php8.2.9 --push .
run: docker buildx build -f ./shopware/8.2/6.5.4.0/Dockerfile.cli --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:cli-6.5.4.0-php8.2 --tag shyim/shopware:cli-6.5.4.0-php8.2 --tag ghcr.io/shyim/shopware:cli-6.5.4.0-php8.2.9 --tag shyim/shopware:cli-6.5.4.0-php8.2.9 --push .
shopware-v6_5_3_3-8_1:
name: v6.5.3.3 with PHP 8.1
runs-on: ubuntu-20.04
Expand Down Expand Up @@ -1351,52 +1399,4 @@ jobs:
run: docker buildx build -f ./shopware/8.1/6.4.14.0/Dockerfile --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:6.4.14-php8.1 --tag shyim/shopware:6.4.14-php8.1 --tag ghcr.io/shyim/shopware:6.4.14-php8.1.22 --tag shyim/shopware:6.4.14-php8.1.22 --tag ghcr.io/shyim/shopware:6.4.14.0-php8.1 --tag shyim/shopware:6.4.14.0-php8.1 --tag ghcr.io/shyim/shopware:6.4.14.0-php8.1.22 --tag shyim/shopware:6.4.14.0-php8.1.22 --push .

- name: Build PHP CLI
run: docker buildx build -f ./shopware/8.1/6.4.14.0/Dockerfile.cli --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:cli-6.4.14-php8.1 --tag shyim/shopware:cli-6.4.14-php8.1 --tag ghcr.io/shyim/shopware:cli-6.4.14-php8.1.22 --tag shyim/shopware:cli-6.4.14-php8.1.22 --tag ghcr.io/shyim/shopware:cli-6.4.14.0-php8.1 --tag shyim/shopware:cli-6.4.14.0-php8.1 --tag ghcr.io/shyim/shopware:cli-6.4.14.0-php8.1.22 --tag shyim/shopware:cli-6.4.14.0-php8.1.22 --push .
shopware-v6_4_13_0-8_0:
name: v6.4.13.0 with PHP 8.0
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3

- name: Login into Docker Hub Registery
run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "shyim" --password-stdin

- name: Login into Github Docker Registery
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin

- name: Set up QEMU
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2

- name: Build PHP Web
run: docker buildx build -f ./shopware/8.0/6.4.13.0/Dockerfile --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:6.4.13 --tag shyim/shopware:6.4.13 --tag ghcr.io/shyim/shopware:6.4.13-php8.0 --tag shyim/shopware:6.4.13-php8.0 --tag ghcr.io/shyim/shopware:6.4.13-php8.0.30 --tag shyim/shopware:6.4.13-php8.0.30 --tag ghcr.io/shyim/shopware:6.4.13.0 --tag shyim/shopware:6.4.13.0 --tag ghcr.io/shyim/shopware:6.4.13.0-php8.0 --tag shyim/shopware:6.4.13.0-php8.0 --tag ghcr.io/shyim/shopware:6.4.13.0-php8.0.30 --tag shyim/shopware:6.4.13.0-php8.0.30 --push .

- name: Build PHP CLI
run: docker buildx build -f ./shopware/8.0/6.4.13.0/Dockerfile.cli --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:cli-6.4.13 --tag shyim/shopware:cli-6.4.13 --tag ghcr.io/shyim/shopware:cli-6.4.13-php8.0 --tag shyim/shopware:cli-6.4.13-php8.0 --tag ghcr.io/shyim/shopware:cli-6.4.13-php8.0.30 --tag shyim/shopware:cli-6.4.13-php8.0.30 --tag ghcr.io/shyim/shopware:cli-6.4.13.0 --tag shyim/shopware:cli-6.4.13.0 --tag ghcr.io/shyim/shopware:cli-6.4.13.0-php8.0 --tag shyim/shopware:cli-6.4.13.0-php8.0 --tag ghcr.io/shyim/shopware:cli-6.4.13.0-php8.0.30 --tag shyim/shopware:cli-6.4.13.0-php8.0.30 --push .
shopware-v6_4_13_0-8_1:
name: v6.4.13.0 with PHP 8.1
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3

- name: Login into Docker Hub Registery
run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "shyim" --password-stdin

- name: Login into Github Docker Registery
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin

- name: Set up QEMU
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2

- name: Build PHP Web
run: docker buildx build -f ./shopware/8.1/6.4.13.0/Dockerfile --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:6.4.13-php8.1 --tag shyim/shopware:6.4.13-php8.1 --tag ghcr.io/shyim/shopware:6.4.13-php8.1.22 --tag shyim/shopware:6.4.13-php8.1.22 --tag ghcr.io/shyim/shopware:6.4.13.0-php8.1 --tag shyim/shopware:6.4.13.0-php8.1 --tag ghcr.io/shyim/shopware:6.4.13.0-php8.1.22 --tag shyim/shopware:6.4.13.0-php8.1.22 --push .

- name: Build PHP CLI
run: docker buildx build -f ./shopware/8.1/6.4.13.0/Dockerfile.cli --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:cli-6.4.13-php8.1 --tag shyim/shopware:cli-6.4.13-php8.1 --tag ghcr.io/shyim/shopware:cli-6.4.13-php8.1.22 --tag shyim/shopware:cli-6.4.13-php8.1.22 --tag ghcr.io/shyim/shopware:cli-6.4.13.0-php8.1 --tag shyim/shopware:cli-6.4.13.0-php8.1 --tag ghcr.io/shyim/shopware:cli-6.4.13.0-php8.1.22 --tag shyim/shopware:cli-6.4.13.0-php8.1.22 --push .
run: docker buildx build -f ./shopware/8.1/6.4.14.0/Dockerfile.cli --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:cli-6.4.14-php8.1 --tag shyim/shopware:cli-6.4.14-php8.1 --tag ghcr.io/shyim/shopware:cli-6.4.14-php8.1.22 --tag shyim/shopware:cli-6.4.14-php8.1.22 --tag ghcr.io/shyim/shopware:cli-6.4.14.0-php8.1 --tag shyim/shopware:cli-6.4.14.0-php8.1 --tag ghcr.io/shyim/shopware:cli-6.4.14.0-php8.1.22 --tag shyim/shopware:cli-6.4.14.0-php8.1.22 --push .
17 changes: 0 additions & 17 deletions shopware/8.0/6.4.13.0/Dockerfile

This file was deleted.

20 changes: 0 additions & 20 deletions shopware/8.0/6.4.13.0/Dockerfile.cli

This file was deleted.

17 changes: 0 additions & 17 deletions shopware/8.1/6.4.13.0/Dockerfile

This file was deleted.

20 changes: 0 additions & 20 deletions shopware/8.1/6.4.13.0/Dockerfile.cli

This file was deleted.

16 changes: 16 additions & 0 deletions shopware/8.1/6.5.4.1/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
FROM ghcr.io/friendsofshopware/shopware-cli as project-creator

WORKDIR /
RUN shopware-cli project create shop 6.5.4.1

FROM ghcr.io/shyim/shopware-nginx:8.1.22

COPY --from=composer/composer:2-bin /composer /usr/local/bin/composer

COPY --from=project-creator /shop /var/www/html

RUN mkdir /state && \
echo "6.5.4.1" > /shopware_version && \
chown -R www-data:www-data /var/www

VOLUME /state /var/www/html/custom/plugins /var/www/html/files /var/www/html/var/log /var/www/html/public/theme /var/www/html/public/media /var/www/html/public/bundles /var/www/html/public/sitemap /var/www/html/public/thumbnail /var/www/html/config/jwt
Loading

0 comments on commit 0597db9

Please sign in to comment.