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

Changes by create-pull-request action
shyim · Jun 11, 2024 · ff35bbb · ff35bbb
2 parents 1f8161b + 2e2cddd
commit ff35bbb
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 61 deletions.
diff --git a/.github/workflows/shopware.yml b/.github/workflows/shopware.yml
@@ -440,6 +440,54 @@ jobs:
 
       - name: Build PHP CLI
         run: docker buildx build -f ./shopware/8.2/6.6.0.0/Dockerfile.cli --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:cli-6.6.0.0-php8.2 --tag shyim/shopware:cli-6.6.0.0-php8.2 --tag ghcr.io/shyim/shopware:cli-6.6.0.0-php8.2.20 --tag shyim/shopware:cli-6.6.0.0-php8.2.20  --push .
+  shopware-v6_5_8_11-8_1:
+    name: v6.5.8.11 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.8.11/Dockerfile --platform linux/amd64,linux/arm64 --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.29 --tag shyim/shopware:6.5-php8.1.29 --tag ghcr.io/shyim/shopware:6.5.8 --tag shyim/shopware:6.5.8 --tag ghcr.io/shyim/shopware:6.5.8-php8.1 --tag shyim/shopware:6.5.8-php8.1 --tag ghcr.io/shyim/shopware:6.5.8-php8.1.29 --tag shyim/shopware:6.5.8-php8.1.29 --tag ghcr.io/shyim/shopware:6.5.8.11 --tag shyim/shopware:6.5.8.11 --tag ghcr.io/shyim/shopware:6.5.8.11-php8.1 --tag shyim/shopware:6.5.8.11-php8.1 --tag ghcr.io/shyim/shopware:6.5.8.11-php8.1.29 --tag shyim/shopware:6.5.8.11-php8.1.29  --push .
+
+      - name: Build PHP CLI
+        run: docker buildx build -f ./shopware/8.1/6.5.8.11/Dockerfile.cli --platform linux/amd64,linux/arm64 --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.29 --tag shyim/shopware:cli-6.5-php8.1.29 --tag ghcr.io/shyim/shopware:cli-6.5.8 --tag shyim/shopware:cli-6.5.8 --tag ghcr.io/shyim/shopware:cli-6.5.8-php8.1 --tag shyim/shopware:cli-6.5.8-php8.1 --tag ghcr.io/shyim/shopware:cli-6.5.8-php8.1.29 --tag shyim/shopware:cli-6.5.8-php8.1.29 --tag ghcr.io/shyim/shopware:cli-6.5.8.11 --tag shyim/shopware:cli-6.5.8.11 --tag ghcr.io/shyim/shopware:cli-6.5.8.11-php8.1 --tag shyim/shopware:cli-6.5.8.11-php8.1 --tag ghcr.io/shyim/shopware:cli-6.5.8.11-php8.1.29 --tag shyim/shopware:cli-6.5.8.11-php8.1.29  --push .
+  shopware-v6_5_8_11-8_2:
+    name: v6.5.8.11 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.8.11/Dockerfile --platform linux/amd64,linux/arm64 --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.20 --tag shyim/shopware:6.5-php8.2.20 --tag ghcr.io/shyim/shopware:6.5.8-php8.2 --tag shyim/shopware:6.5.8-php8.2 --tag ghcr.io/shyim/shopware:6.5.8-php8.2.20 --tag shyim/shopware:6.5.8-php8.2.20 --tag ghcr.io/shyim/shopware:6.5.8.11-php8.2 --tag shyim/shopware:6.5.8.11-php8.2 --tag ghcr.io/shyim/shopware:6.5.8.11-php8.2.20 --tag shyim/shopware:6.5.8.11-php8.2.20  --push .
+
+      - name: Build PHP CLI
+        run: docker buildx build -f ./shopware/8.2/6.5.8.11/Dockerfile.cli --platform linux/amd64,linux/arm64 --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.20 --tag shyim/shopware:cli-6.5-php8.2.20 --tag ghcr.io/shyim/shopware:cli-6.5.8-php8.2 --tag shyim/shopware:cli-6.5.8-php8.2 --tag ghcr.io/shyim/shopware:cli-6.5.8-php8.2.20 --tag shyim/shopware:cli-6.5.8-php8.2.20 --tag ghcr.io/shyim/shopware:cli-6.5.8.11-php8.2 --tag shyim/shopware:cli-6.5.8.11-php8.2 --tag ghcr.io/shyim/shopware:cli-6.5.8.11-php8.2.20 --tag shyim/shopware:cli-6.5.8.11-php8.2.20  --push .
   shopware-v6_5_8_10-8_1:
     name: v6.5.8.10 with PHP 8.1
     runs-on: ubuntu-20.04
@@ -460,10 +508,10 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: Build PHP Web
-        run: docker buildx build -f ./shopware/8.1/6.5.8.10/Dockerfile --platform linux/amd64,linux/arm64 --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.29 --tag shyim/shopware:6.5-php8.1.29 --tag ghcr.io/shyim/shopware:6.5.8 --tag shyim/shopware:6.5.8 --tag ghcr.io/shyim/shopware:6.5.8-php8.1 --tag shyim/shopware:6.5.8-php8.1 --tag ghcr.io/shyim/shopware:6.5.8-php8.1.29 --tag shyim/shopware:6.5.8-php8.1.29 --tag ghcr.io/shyim/shopware:6.5.8.10 --tag shyim/shopware:6.5.8.10 --tag ghcr.io/shyim/shopware:6.5.8.10-php8.1 --tag shyim/shopware:6.5.8.10-php8.1 --tag ghcr.io/shyim/shopware:6.5.8.10-php8.1.29 --tag shyim/shopware:6.5.8.10-php8.1.29  --push .
+        run: docker buildx build -f ./shopware/8.1/6.5.8.10/Dockerfile --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:6.5.8.10 --tag shyim/shopware:6.5.8.10 --tag ghcr.io/shyim/shopware:6.5.8.10-php8.1 --tag shyim/shopware:6.5.8.10-php8.1 --tag ghcr.io/shyim/shopware:6.5.8.10-php8.1.29 --tag shyim/shopware:6.5.8.10-php8.1.29  --push .
 
       - name: Build PHP CLI
-        run: docker buildx build -f ./shopware/8.1/6.5.8.10/Dockerfile.cli --platform linux/amd64,linux/arm64 --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.29 --tag shyim/shopware:cli-6.5-php8.1.29 --tag ghcr.io/shyim/shopware:cli-6.5.8 --tag shyim/shopware:cli-6.5.8 --tag ghcr.io/shyim/shopware:cli-6.5.8-php8.1 --tag shyim/shopware:cli-6.5.8-php8.1 --tag ghcr.io/shyim/shopware:cli-6.5.8-php8.1.29 --tag shyim/shopware:cli-6.5.8-php8.1.29 --tag ghcr.io/shyim/shopware:cli-6.5.8.10 --tag shyim/shopware:cli-6.5.8.10 --tag ghcr.io/shyim/shopware:cli-6.5.8.10-php8.1 --tag shyim/shopware:cli-6.5.8.10-php8.1 --tag ghcr.io/shyim/shopware:cli-6.5.8.10-php8.1.29 --tag shyim/shopware:cli-6.5.8.10-php8.1.29  --push .
+        run: docker buildx build -f ./shopware/8.1/6.5.8.10/Dockerfile.cli --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:cli-6.5.8.10 --tag shyim/shopware:cli-6.5.8.10 --tag ghcr.io/shyim/shopware:cli-6.5.8.10-php8.1 --tag shyim/shopware:cli-6.5.8.10-php8.1 --tag ghcr.io/shyim/shopware:cli-6.5.8.10-php8.1.29 --tag shyim/shopware:cli-6.5.8.10-php8.1.29  --push .
   shopware-v6_5_8_10-8_2:
     name: v6.5.8.10 with PHP 8.2
     runs-on: ubuntu-20.04
@@ -484,10 +532,10 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: Build PHP Web
-        run: docker buildx build -f ./shopware/8.2/6.5.8.10/Dockerfile --platform linux/amd64,linux/arm64 --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.20 --tag shyim/shopware:6.5-php8.2.20 --tag ghcr.io/shyim/shopware:6.5.8-php8.2 --tag shyim/shopware:6.5.8-php8.2 --tag ghcr.io/shyim/shopware:6.5.8-php8.2.20 --tag shyim/shopware:6.5.8-php8.2.20 --tag ghcr.io/shyim/shopware:6.5.8.10-php8.2 --tag shyim/shopware:6.5.8.10-php8.2 --tag ghcr.io/shyim/shopware:6.5.8.10-php8.2.20 --tag shyim/shopware:6.5.8.10-php8.2.20  --push .
+        run: docker buildx build -f ./shopware/8.2/6.5.8.10/Dockerfile --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:6.5.8.10-php8.2 --tag shyim/shopware:6.5.8.10-php8.2 --tag ghcr.io/shyim/shopware:6.5.8.10-php8.2.20 --tag shyim/shopware:6.5.8.10-php8.2.20  --push .
 
       - name: Build PHP CLI
-        run: docker buildx build -f ./shopware/8.2/6.5.8.10/Dockerfile.cli --platform linux/amd64,linux/arm64 --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.20 --tag shyim/shopware:cli-6.5-php8.2.20 --tag ghcr.io/shyim/shopware:cli-6.5.8-php8.2 --tag shyim/shopware:cli-6.5.8-php8.2 --tag ghcr.io/shyim/shopware:cli-6.5.8-php8.2.20 --tag shyim/shopware:cli-6.5.8-php8.2.20 --tag ghcr.io/shyim/shopware:cli-6.5.8.10-php8.2 --tag shyim/shopware:cli-6.5.8.10-php8.2 --tag ghcr.io/shyim/shopware:cli-6.5.8.10-php8.2.20 --tag shyim/shopware:cli-6.5.8.10-php8.2.20  --push .
+        run: docker buildx build -f ./shopware/8.2/6.5.8.10/Dockerfile.cli --platform linux/amd64,linux/arm64 --tag ghcr.io/shyim/shopware:cli-6.5.8.10-php8.2 --tag shyim/shopware:cli-6.5.8.10-php8.2 --tag ghcr.io/shyim/shopware:cli-6.5.8.10-php8.2.20 --tag shyim/shopware:cli-6.5.8.10-php8.2.20  --push .
   shopware-v6_5_8_9-8_1:
     name: v6.5.8.9 with PHP 8.1
     runs-on: ubuntu-20.04
@@ -1063,52 +1111,4 @@ jobs:
         run: docker buildx build -f ./shopware/8.2/6.5.7.3/Dockerfile --platform linux/amd64,linux/arm64 --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.20 --tag shyim/shopware:6.5.7.3-php8.2.20  --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-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.20 --tag shyim/shopware:cli-6.5.7.3-php8.2.20  --push .
-  shopware-v6_5_7_2-8_1:
-    name: v6.5.7.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.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.29 --tag shyim/shopware:6.5.7.2-php8.1.29  --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-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.29 --tag shyim/shopware:cli-6.5.7.2-php8.1.29  --push .
-  shopware-v6_5_7_2-8_2:
-    name: v6.5.7.2 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.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.20 --tag shyim/shopware:6.5.7.2-php8.2.20  --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-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.20 --tag shyim/shopware:cli-6.5.7.2-php8.2.20  --push .
+        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-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.20 --tag shyim/shopware:cli-6.5.7.3-php8.2.20  --push .
diff --git a/shopware/8.1/6.5.7.2/Dockerfile → shopware/8.1/6.5.8.11/Dockerfile b/shopware/8.1/6.5.7.2/Dockerfile → shopware/8.1/6.5.8.11/Dockerfile
@@ -1,7 +1,7 @@
 FROM ghcr.io/friendsofshopware/shopware-cli as project-creator
 
 WORKDIR /
-RUN shopware-cli project create shop 6.5.7.2
+RUN shopware-cli project create shop 6.5.8.11
 
 FROM ghcr.io/shyim/shopware-nginx:8.1.29
 
@@ -10,7 +10,7 @@ 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.2" > /shopware_version && \
+    echo "6.5.8.11" > /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
diff --git a/shopware/8.1/6.5.7.2/Dockerfile.cli → shopware/8.1/6.5.8.11/Dockerfile.cli b/shopware/8.1/6.5.7.2/Dockerfile.cli → shopware/8.1/6.5.8.11/Dockerfile.cli
@@ -1,7 +1,7 @@
 FROM ghcr.io/friendsofshopware/shopware-cli as project-creator
 
 WORKDIR /
-RUN shopware-cli project create shop 6.5.7.2
+RUN shopware-cli project create shop 6.5.8.11
 
 FROM ghcr.io/shyim/shopware-nginx:8.1.29
 
@@ -10,7 +10,7 @@ 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.2" > /shopware_version && \
+    echo "6.5.8.11" > /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

diff --git a/shopware/8.2/6.5.7.2/Dockerfile → shopware/8.2/6.5.8.11/Dockerfile b/shopware/8.2/6.5.7.2/Dockerfile → shopware/8.2/6.5.8.11/Dockerfile
@@ -1,7 +1,7 @@
 FROM ghcr.io/friendsofshopware/shopware-cli as project-creator
 
 WORKDIR /
-RUN shopware-cli project create shop 6.5.7.2
+RUN shopware-cli project create shop 6.5.8.11
 
 FROM ghcr.io/shyim/shopware-nginx:8.2.20
 
@@ -10,7 +10,7 @@ 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.2" > /shopware_version && \
+    echo "6.5.8.11" > /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
diff --git a/shopware/8.2/6.5.7.2/Dockerfile.cli → shopware/8.2/6.5.8.11/Dockerfile.cli b/shopware/8.2/6.5.7.2/Dockerfile.cli → shopware/8.2/6.5.8.11/Dockerfile.cli
@@ -1,7 +1,7 @@
 FROM ghcr.io/friendsofshopware/shopware-cli as project-creator
 
 WORKDIR /
-RUN shopware-cli project create shop 6.5.7.2
+RUN shopware-cli project create shop 6.5.8.11
 
 FROM ghcr.io/shyim/shopware-nginx:8.2.20
 
@@ -10,7 +10,7 @@ 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.2" > /shopware_version && \
+    echo "6.5.8.11" > /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