Merge pull request #128 from shyim/create-pull-request/patch

Changes by create-pull-request action
shyim · Dec 1, 2023 · 0e3e9f9 · 0e3e9f9
2 parents 8b54ac6 + 397a2b0
commit 0e3e9f9
Show file tree

Hide file tree

Showing 9 changed files with 123 additions and 127 deletions.
diff --git a/.github/workflows/shopware.yml b/.github/workflows/shopware.yml
@@ -8,6 +8,54 @@ on:
       - ".github/workflows/shopware.yml"
       - "version.txt"
 jobs:
+  shopware-v6_5_7_3-8_1:
+    name: v6.5.7.3 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.7.3/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.26 --tag shyim/shopware:latest-php8.1.26 --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.26 --tag shyim/shopware:6.5-php8.1.26 --tag ghcr.io/shyim/shopware:6.5.7 --tag shyim/shopware:6.5.7 --tag ghcr.io/shyim/shopware:6.5.7-php8.1 --tag shyim/shopware:6.5.7-php8.1 --tag ghcr.io/shyim/shopware:6.5.7-php8.1.26 --tag shyim/shopware:6.5.7-php8.1.26 --tag ghcr.io/shyim/shopware:6.5.7.3 --tag shyim/shopware:6.5.7.3 --tag ghcr.io/shyim/shopware:6.5.7.3-php8.1 --tag shyim/shopware:6.5.7.3-php8.1 --tag ghcr.io/shyim/shopware:6.5.7.3-php8.1.26 --tag shyim/shopware:6.5.7.3-php8.1.26  --push .
+
+      - name: Build PHP CLI
+        run: docker buildx build -f ./shopware/8.1/6.5.7.3/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.26 --tag shyim/shopware:cli-latest-php8.1.26 --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.26 --tag shyim/shopware:cli-6.5-php8.1.26 --tag ghcr.io/shyim/shopware:cli-6.5.7 --tag shyim/shopware:cli-6.5.7 --tag ghcr.io/shyim/shopware:cli-6.5.7-php8.1 --tag shyim/shopware:cli-6.5.7-php8.1 --tag ghcr.io/shyim/shopware:cli-6.5.7-php8.1.26 --tag shyim/shopware:cli-6.5.7-php8.1.26 --tag ghcr.io/shyim/shopware:cli-6.5.7.3 --tag shyim/shopware:cli-6.5.7.3 --tag ghcr.io/shyim/shopware:cli-6.5.7.3-php8.1 --tag shyim/shopware:cli-6.5.7.3-php8.1 --tag ghcr.io/shyim/shopware:cli-6.5.7.3-php8.1.26 --tag shyim/shopware:cli-6.5.7.3-php8.1.26  --push .
+  shopware-v6_5_7_3-8_2:
+    name: v6.5.7.3 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.7.3/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.13 --tag shyim/shopware:latest-php8.2.13 --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.13 --tag shyim/shopware:6.5-php8.2.13 --tag ghcr.io/shyim/shopware:6.5.7-php8.2 --tag shyim/shopware:6.5.7-php8.2 --tag ghcr.io/shyim/shopware:6.5.7-php8.2.13 --tag shyim/shopware:6.5.7-php8.2.13 --tag ghcr.io/shyim/shopware:6.5.7.3-php8.2 --tag shyim/shopware:6.5.7.3-php8.2 --tag ghcr.io/shyim/shopware:6.5.7.3-php8.2.13 --tag shyim/shopware:6.5.7.3-php8.2.13  --push .
+
+      - name: Build PHP CLI
+        run: docker buildx build -f ./shopware/8.2/6.5.7.3/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.13 --tag shyim/shopware:cli-latest-php8.2.13 --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.13 --tag shyim/shopware:cli-6.5-php8.2.13 --tag ghcr.io/shyim/shopware:cli-6.5.7-php8.2 --tag shyim/shopware:cli-6.5.7-php8.2 --tag ghcr.io/shyim/shopware:cli-6.5.7-php8.2.13 --tag shyim/shopware:cli-6.5.7-php8.2.13 --tag ghcr.io/shyim/shopware:cli-6.5.7.3-php8.2 --tag shyim/shopware:cli-6.5.7.3-php8.2 --tag ghcr.io/shyim/shopware:cli-6.5.7.3-php8.2.13 --tag shyim/shopware:cli-6.5.7.3-php8.2.13  --push .
   shopware-v6_5_7_2-8_1:
     name: v6.5.7.2 with PHP 8.1
     runs-on: ubuntu-20.04
@@ -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.7.2/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.26 --tag shyim/shopware:latest-php8.1.26 --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.26 --tag shyim/shopware:6.5-php8.1.26 --tag ghcr.io/shyim/shopware:6.5.7 --tag shyim/shopware:6.5.7 --tag ghcr.io/shyim/shopware:6.5.7-php8.1 --tag shyim/shopware:6.5.7-php8.1 --tag ghcr.io/shyim/shopware:6.5.7-php8.1.26 --tag shyim/shopware:6.5.7-php8.1.26 --tag ghcr.io/shyim/shopware:6.5.7.2 --tag shyim/shopware:6.5.7.2 --tag ghcr.io/shyim/shopware:6.5.7.2-php8.1 --tag shyim/shopware:6.5.7.2-php8.1 --tag ghcr.io/shyim/shopware:6.5.7.2-php8.1.26 --tag shyim/shopware:6.5.7.2-php8.1.26  --push .
+        run: docker buildx build -f ./shopware/8.1/6.5.7.2/Dockerfile --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:6.5.7.2 --tag shyim/shopware:6.5.7.2 --tag ghcr.io/shyim/shopware:6.5.7.2-php8.1 --tag shyim/shopware:6.5.7.2-php8.1 --tag ghcr.io/shyim/shopware:6.5.7.2-php8.1.26 --tag shyim/shopware:6.5.7.2-php8.1.26  --push .
 
       - name: Build PHP CLI
-        run: docker buildx build -f ./shopware/8.1/6.5.7.2/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.26 --tag shyim/shopware:cli-latest-php8.1.26 --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.26 --tag shyim/shopware:cli-6.5-php8.1.26 --tag ghcr.io/shyim/shopware:cli-6.5.7 --tag shyim/shopware:cli-6.5.7 --tag ghcr.io/shyim/shopware:cli-6.5.7-php8.1 --tag shyim/shopware:cli-6.5.7-php8.1 --tag ghcr.io/shyim/shopware:cli-6.5.7-php8.1.26 --tag shyim/shopware:cli-6.5.7-php8.1.26 --tag ghcr.io/shyim/shopware:cli-6.5.7.2 --tag shyim/shopware:cli-6.5.7.2 --tag ghcr.io/shyim/shopware:cli-6.5.7.2-php8.1 --tag shyim/shopware:cli-6.5.7.2-php8.1 --tag ghcr.io/shyim/shopware:cli-6.5.7.2-php8.1.26 --tag shyim/shopware:cli-6.5.7.2-php8.1.26  --push .
+        run: docker buildx build -f ./shopware/8.1/6.5.7.2/Dockerfile.cli --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:cli-6.5.7.2 --tag shyim/shopware:cli-6.5.7.2 --tag ghcr.io/shyim/shopware:cli-6.5.7.2-php8.1 --tag shyim/shopware:cli-6.5.7.2-php8.1 --tag ghcr.io/shyim/shopware:cli-6.5.7.2-php8.1.26 --tag shyim/shopware:cli-6.5.7.2-php8.1.26  --push .
   shopware-v6_5_7_2-8_2:
     name: v6.5.7.2 with PHP 8.2
     runs-on: ubuntu-20.04
@@ -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.7.2/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.13 --tag shyim/shopware:latest-php8.2.13 --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.13 --tag shyim/shopware:6.5-php8.2.13 --tag ghcr.io/shyim/shopware:6.5.7-php8.2 --tag shyim/shopware:6.5.7-php8.2 --tag ghcr.io/shyim/shopware:6.5.7-php8.2.13 --tag shyim/shopware:6.5.7-php8.2.13 --tag ghcr.io/shyim/shopware:6.5.7.2-php8.2 --tag shyim/shopware:6.5.7.2-php8.2 --tag ghcr.io/shyim/shopware:6.5.7.2-php8.2.13 --tag shyim/shopware:6.5.7.2-php8.2.13  --push .
+        run: docker buildx build -f ./shopware/8.2/6.5.7.2/Dockerfile --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:6.5.7.2-php8.2 --tag shyim/shopware:6.5.7.2-php8.2 --tag ghcr.io/shyim/shopware:6.5.7.2-php8.2.13 --tag shyim/shopware:6.5.7.2-php8.2.13  --push .
 
       - name: Build PHP CLI
-        run: docker buildx build -f ./shopware/8.2/6.5.7.2/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.13 --tag shyim/shopware:cli-latest-php8.2.13 --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.13 --tag shyim/shopware:cli-6.5-php8.2.13 --tag ghcr.io/shyim/shopware:cli-6.5.7-php8.2 --tag shyim/shopware:cli-6.5.7-php8.2 --tag ghcr.io/shyim/shopware:cli-6.5.7-php8.2.13 --tag shyim/shopware:cli-6.5.7-php8.2.13 --tag ghcr.io/shyim/shopware:cli-6.5.7.2-php8.2 --tag shyim/shopware:cli-6.5.7.2-php8.2 --tag ghcr.io/shyim/shopware:cli-6.5.7.2-php8.2.13 --tag shyim/shopware:cli-6.5.7.2-php8.2.13  --push .
+        run: docker buildx build -f ./shopware/8.2/6.5.7.2/Dockerfile.cli --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:cli-6.5.7.2-php8.2 --tag shyim/shopware:cli-6.5.7.2-php8.2 --tag ghcr.io/shyim/shopware:cli-6.5.7.2-php8.2.13 --tag shyim/shopware:cli-6.5.7.2-php8.2.13  --push .
   shopware-v6_5_7_1-8_1:
     name: v6.5.7.1 with PHP 8.1
     runs-on: ubuntu-20.04
@@ -1351,52 +1399,4 @@ jobs:
         run: docker buildx build -f ./shopware/8.2/6.4.18.0/Dockerfile --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:6.4.18.0-php8.2 --tag shyim/shopware:6.4.18.0-php8.2 --tag ghcr.io/shyim/shopware:6.4.18.0-php8.2.13 --tag shyim/shopware:6.4.18.0-php8.2.13  --push .
 
       - name: Build PHP CLI
-        run: docker buildx build -f ./shopware/8.2/6.4.18.0/Dockerfile.cli --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:cli-6.4.18.0-php8.2 --tag shyim/shopware:cli-6.4.18.0-php8.2 --tag ghcr.io/shyim/shopware:cli-6.4.18.0-php8.2.13 --tag shyim/shopware:cli-6.4.18.0-php8.2.13  --push .
-  shopware-v6_4_17_2-8_0:
-    name: v6.4.17.2 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.17.2/Dockerfile --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:6.4.17 --tag shyim/shopware:6.4.17 --tag ghcr.io/shyim/shopware:6.4.17-php8.0 --tag shyim/shopware:6.4.17-php8.0 --tag ghcr.io/shyim/shopware:6.4.17-php8.0.30 --tag shyim/shopware:6.4.17-php8.0.30 --tag ghcr.io/shyim/shopware:6.4.17.2 --tag shyim/shopware:6.4.17.2 --tag ghcr.io/shyim/shopware:6.4.17.2-php8.0 --tag shyim/shopware:6.4.17.2-php8.0 --tag ghcr.io/shyim/shopware:6.4.17.2-php8.0.30 --tag shyim/shopware:6.4.17.2-php8.0.30  --push .
-
-      - name: Build PHP CLI
-        run: docker buildx build -f ./shopware/8.0/6.4.17.2/Dockerfile.cli --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:cli-6.4.17 --tag shyim/shopware:cli-6.4.17 --tag ghcr.io/shyim/shopware:cli-6.4.17-php8.0 --tag shyim/shopware:cli-6.4.17-php8.0 --tag ghcr.io/shyim/shopware:cli-6.4.17-php8.0.30 --tag shyim/shopware:cli-6.4.17-php8.0.30 --tag ghcr.io/shyim/shopware:cli-6.4.17.2 --tag shyim/shopware:cli-6.4.17.2 --tag ghcr.io/shyim/shopware:cli-6.4.17.2-php8.0 --tag shyim/shopware:cli-6.4.17.2-php8.0 --tag ghcr.io/shyim/shopware:cli-6.4.17.2-php8.0.30 --tag shyim/shopware:cli-6.4.17.2-php8.0.30  --push .
-  shopware-v6_4_17_2-8_1:
-    name: v6.4.17.2 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.17.2/Dockerfile --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:6.4.17-php8.1 --tag shyim/shopware:6.4.17-php8.1 --tag ghcr.io/shyim/shopware:6.4.17-php8.1.26 --tag shyim/shopware:6.4.17-php8.1.26 --tag ghcr.io/shyim/shopware:6.4.17.2-php8.1 --tag shyim/shopware:6.4.17.2-php8.1 --tag ghcr.io/shyim/shopware:6.4.17.2-php8.1.26 --tag shyim/shopware:6.4.17.2-php8.1.26  --push .
-
-      - name: Build PHP CLI
-        run: docker buildx build -f ./shopware/8.1/6.4.17.2/Dockerfile.cli --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:cli-6.4.17-php8.1 --tag shyim/shopware:cli-6.4.17-php8.1 --tag ghcr.io/shyim/shopware:cli-6.4.17-php8.1.26 --tag shyim/shopware:cli-6.4.17-php8.1.26 --tag ghcr.io/shyim/shopware:cli-6.4.17.2-php8.1 --tag shyim/shopware:cli-6.4.17.2-php8.1 --tag ghcr.io/shyim/shopware:cli-6.4.17.2-php8.1.26 --tag shyim/shopware:cli-6.4.17.2-php8.1.26  --push .
+        run: docker buildx build -f ./shopware/8.2/6.4.18.0/Dockerfile.cli --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:cli-6.4.18.0-php8.2 --tag shyim/shopware:cli-6.4.18.0-php8.2 --tag ghcr.io/shyim/shopware:cli-6.4.18.0-php8.2.13 --tag shyim/shopware:cli-6.4.18.0-php8.2.13  --push .
diff --git a/shopware/8.0/6.4.17.2/Dockerfile b/shopware/8.0/6.4.17.2/Dockerfile
diff --git a/shopware/8.0/6.4.17.2/Dockerfile.cli b/shopware/8.0/6.4.17.2/Dockerfile.cli
diff --git a/shopware/8.1/6.4.17.2/Dockerfile b/shopware/8.1/6.4.17.2/Dockerfile
diff --git a/shopware/8.1/6.4.17.2/Dockerfile.cli b/shopware/8.1/6.4.17.2/Dockerfile.cli
diff --git a/shopware/8.1/6.5.7.3/Dockerfile b/shopware/8.1/6.5.7.3/Dockerfile
@@ -0,0 +1,16 @@
+FROM ghcr.io/friendsofshopware/shopware-cli as project-creator
+
+WORKDIR /
+RUN shopware-cli project create shop 6.5.7.3
+
+FROM ghcr.io/shyim/shopware-nginx:8.1.26
+
+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.7.3" > /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