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

Changes by create-pull-request action
shyim · Mar 3, 2024 · ab67c70 · ab67c70
2 parents a4a7d29 + 8f788d6
commit ab67c70
Show file tree

Hide file tree

Showing 13 changed files with 78 additions and 196 deletions.
diff --git a/.circleci/docker-build.yml b/.circleci/docker-build.yml
@@ -48,11 +48,11 @@ jobs:
 
       - run: echo "$GHCR_PASSWORD" | docker login ghcr.io -u shyim --password-stdin
 
-      - run: docker build -t ghcr.io/shyim/shopware-nginx:8.2-arm64 -t ghcr.io/shyim/shopware-nginx:8.2.15-arm64 -f nginx/8.2/Dockerfile .
+      - run: docker build -t ghcr.io/shyim/shopware-nginx:8.2-arm64 -t ghcr.io/shyim/shopware-nginx:8.2.16-arm64 -f nginx/8.2/Dockerfile .
 
       - run: docker push ghcr.io/shyim/shopware-nginx:8.2-arm64
 
-      - run: docker push ghcr.io/shyim/shopware-nginx:8.2.15-arm64
+      - run: docker push ghcr.io/shyim/shopware-nginx:8.2.16-arm64
 
   php82-amd64:
       machine:
@@ -64,11 +64,11 @@ jobs:
 
         - run: echo "$GHCR_PASSWORD" | docker login ghcr.io -u shyim --password-stdin
 
-        - run: docker build -t ghcr.io/shyim/shopware-nginx:8.2-amd64 -t ghcr.io/shyim/shopware-nginx:8.2.15-amd64 -f nginx/8.2/Dockerfile .
+        - run: docker build -t ghcr.io/shyim/shopware-nginx:8.2-amd64 -t ghcr.io/shyim/shopware-nginx:8.2.16-amd64 -f nginx/8.2/Dockerfile .
 
         - run: docker push ghcr.io/shyim/shopware-nginx:8.2-amd64
 
-        - run: docker push ghcr.io/shyim/shopware-nginx:8.2.15-amd64
+        - run: docker push ghcr.io/shyim/shopware-nginx:8.2.16-amd64
 
   php83-arm64:
     machine:
@@ -80,11 +80,11 @@ jobs:
 
       - run: echo "$GHCR_PASSWORD" | docker login ghcr.io -u shyim --password-stdin
 
-      - run: docker build -t ghcr.io/shyim/shopware-nginx:8.3-arm64 -t ghcr.io/shyim/shopware-nginx:8.3.2-arm64 -f nginx/8.3/Dockerfile .
+      - run: docker build -t ghcr.io/shyim/shopware-nginx:8.3-arm64 -t ghcr.io/shyim/shopware-nginx:8.3.3-arm64 -f nginx/8.3/Dockerfile .
 
       - run: docker push ghcr.io/shyim/shopware-nginx:8.3-arm64
 
-      - run: docker push ghcr.io/shyim/shopware-nginx:8.3.2-arm64
+      - run: docker push ghcr.io/shyim/shopware-nginx:8.3.3-arm64
 
   php83-amd64:
       machine:
@@ -96,11 +96,11 @@ jobs:
 
         - run: echo "$GHCR_PASSWORD" | docker login ghcr.io -u shyim --password-stdin
 
-        - run: docker build -t ghcr.io/shyim/shopware-nginx:8.3-amd64 -t ghcr.io/shyim/shopware-nginx:8.3.2-amd64 -f nginx/8.3/Dockerfile .
+        - run: docker build -t ghcr.io/shyim/shopware-nginx:8.3-amd64 -t ghcr.io/shyim/shopware-nginx:8.3.3-amd64 -f nginx/8.3/Dockerfile .
 
         - run: docker push ghcr.io/shyim/shopware-nginx:8.3-amd64
 
-        - run: docker push ghcr.io/shyim/shopware-nginx:8.3.2-amd64
+        - run: docker push ghcr.io/shyim/shopware-nginx:8.3.3-amd64
 
 
   merge-manifest:
@@ -119,21 +119,21 @@ jobs:
 
       - run: docker manifest push ghcr.io/shyim/shopware-nginx:8.1.27
 
-      - run: docker manifest create ghcr.io/shyim/shopware-nginx:8.2 --amend ghcr.io/shyim/shopware-nginx:8.2.15-amd64 --amend ghcr.io/shyim/shopware-nginx:8.2.15-arm64
+      - run: docker manifest create ghcr.io/shyim/shopware-nginx:8.2 --amend ghcr.io/shyim/shopware-nginx:8.2.16-amd64 --amend ghcr.io/shyim/shopware-nginx:8.2.16-arm64
 
-      - run: docker manifest create ghcr.io/shyim/shopware-nginx:8.2.15 --amend ghcr.io/shyim/shopware-nginx:8.2.15-amd64 --amend ghcr.io/shyim/shopware-nginx:8.2.15-arm64
+      - run: docker manifest create ghcr.io/shyim/shopware-nginx:8.2.16 --amend ghcr.io/shyim/shopware-nginx:8.2.16-amd64 --amend ghcr.io/shyim/shopware-nginx:8.2.16-arm64
 
       - run: docker manifest push ghcr.io/shyim/shopware-nginx:8.2
 
-      - run: docker manifest push ghcr.io/shyim/shopware-nginx:8.2.15
+      - run: docker manifest push ghcr.io/shyim/shopware-nginx:8.2.16
 
-      - run: docker manifest create ghcr.io/shyim/shopware-nginx:8.3 --amend ghcr.io/shyim/shopware-nginx:8.3.2-amd64 --amend ghcr.io/shyim/shopware-nginx:8.3.2-arm64
+      - run: docker manifest create ghcr.io/shyim/shopware-nginx:8.3 --amend ghcr.io/shyim/shopware-nginx:8.3.3-amd64 --amend ghcr.io/shyim/shopware-nginx:8.3.3-arm64
 
-      - run: docker manifest create ghcr.io/shyim/shopware-nginx:8.3.2 --amend ghcr.io/shyim/shopware-nginx:8.3.2-amd64 --amend ghcr.io/shyim/shopware-nginx:8.3.2-arm64
+      - run: docker manifest create ghcr.io/shyim/shopware-nginx:8.3.3 --amend ghcr.io/shyim/shopware-nginx:8.3.3-amd64 --amend ghcr.io/shyim/shopware-nginx:8.3.3-arm64
 
       - run: docker manifest push ghcr.io/shyim/shopware-nginx:8.3
 
-      - run: docker manifest push ghcr.io/shyim/shopware-nginx:8.3.2
+      - run: docker manifest push ghcr.io/shyim/shopware-nginx:8.3.3
 
 workflows:
   build-base-image:

diff --git a/.github/workflows/shopware.yml b/.github/workflows/shopware.yml
diff --git a/index_php.json b/index_php.json
@@ -1 +1 @@
-{"8.1":"8.1.27","8.2":"8.2.15","8.3":"8.3.2"}
+{"8.1":"8.1.27","8.2":"8.2.16","8.3":"8.3.3"}
diff --git a/nginx/8.2/Dockerfile b/nginx/8.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.2.15-fpm-alpine
+FROM php:8.2.16-fpm-alpine
 
 ENV APP_ENV=prod \
     LOCK_DSN=flock \

diff --git a/nginx/8.3/Dockerfile b/nginx/8.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.3.2-fpm-alpine
+FROM php:8.3.3-fpm-alpine
 
 ENV APP_ENV=prod \
     LOCK_DSN=flock \

diff --git a/shopware/8.1/6.5.1.0/Dockerfile b/shopware/8.1/6.5.1.0/Dockerfile
diff --git a/shopware/8.1/6.5.1.0/Dockerfile.cli b/shopware/8.1/6.5.1.0/Dockerfile.cli
diff --git a/shopware/8.1/6.5.0.0/Dockerfile → shopware/8.1/6.5.8.6/Dockerfile b/shopware/8.1/6.5.0.0/Dockerfile → shopware/8.1/6.5.8.6/Dockerfile
@@ -1,7 +1,7 @@
 FROM ghcr.io/friendsofshopware/shopware-cli as project-creator
 
 WORKDIR /
-RUN shopware-cli project create shop 6.5.0.0
+RUN shopware-cli project create shop 6.5.8.6
 
 FROM ghcr.io/shyim/shopware-nginx:8.1.27
 
@@ -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.0.0" > /shopware_version && \
+    echo "6.5.8.6" > /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.0.0/Dockerfile.cli → shopware/8.1/6.5.8.6/Dockerfile.cli b/shopware/8.1/6.5.0.0/Dockerfile.cli → shopware/8.1/6.5.8.6/Dockerfile.cli
@@ -1,7 +1,7 @@
 FROM ghcr.io/friendsofshopware/shopware-cli as project-creator
 
 WORKDIR /
-RUN shopware-cli project create shop 6.5.0.0
+RUN shopware-cli project create shop 6.5.8.6
 
 FROM ghcr.io/shyim/shopware-nginx:8.1.27
 
@@ -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.0.0" > /shopware_version && \
+    echo "6.5.8.6" > /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.0.0/Dockerfile b/shopware/8.2/6.5.0.0/Dockerfile
diff --git a/shopware/8.2/6.5.1.0/Dockerfile.cli b/shopware/8.2/6.5.1.0/Dockerfile.cli
diff --git a/shopware/8.2/6.5.1.0/Dockerfile → shopware/8.2/6.5.8.6/Dockerfile b/shopware/8.2/6.5.1.0/Dockerfile → shopware/8.2/6.5.8.6/Dockerfile
@@ -1,7 +1,7 @@
 FROM ghcr.io/friendsofshopware/shopware-cli as project-creator
 
 WORKDIR /
-RUN shopware-cli project create shop 6.5.1.0
+RUN shopware-cli project create shop 6.5.8.6
 
 FROM ghcr.io/shyim/shopware-nginx:8.2.15
 
@@ -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.1.0" > /shopware_version && \
+    echo "6.5.8.6" > /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.0.0/Dockerfile.cli → shopware/8.2/6.5.8.6/Dockerfile.cli b/shopware/8.2/6.5.0.0/Dockerfile.cli → shopware/8.2/6.5.8.6/Dockerfile.cli
@@ -1,7 +1,7 @@
 FROM ghcr.io/friendsofshopware/shopware-cli as project-creator
 
 WORKDIR /
-RUN shopware-cli project create shop 6.5.0.0
+RUN shopware-cli project create shop 6.5.8.6
 
 FROM ghcr.io/shyim/shopware-nginx:8.2.15
 
@@ -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.0.0" > /shopware_version && \
+    echo "6.5.8.6" > /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