Merge branch '3.x' of github.com:studio1gmbh/pimcore-docker into P233…

…64-1465-PXM-1089-update-images # Conflicts: # .github/workflows/release.yml # Dockerfile
studio1gmbh · Oct 1, 2024 · d90d87a · d90d87a
2 parents 901e2c4 + 0f72e17
commit d90d87a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 22 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,21 +19,6 @@ jobs:
         strategy:
             matrix:
                 include:
-                    - { tag: '1.x', php: '8.0', distro: bullseye, version-override: "v1-dev", latest-tag: false }
-                    - { tag: '1.x', php: '8.1', distro: bullseye, version-override: "v1-dev", latest-tag: false }
-                    - { tag: '1.x', php: '8.2', distro: bullseye, version-override: "v1-dev", latest-tag: false }
-                    - { tag: 'v1.3', php: '8.0', distro: bullseye, version-override: "", latest-tag: true }
-                    - { tag: 'v1.3', php: '8.1', distro: bullseye, version-override: "", latest-tag: true }
-                    - { tag: 'v1.3', php: '8.2', distro: bullseye, version-override: "", latest-tag: false }
-                    - { tag: 'v2.0', php: '8.2', distro: bullseye, version-override: "", latest-tag: false }
-                    - { tag: '2.x', php: '8.2', distro: bullseye, version-override: "v2-dev", latest-tag: false }
-                    - { tag: 'v3.0', php: '8.2', distro: bookworm, version-override: "", latest-tag: false }
-                    - { tag: 'v3.1', php: '8.2', distro: bookworm, version-override: "", latest-tag: false }
-                    - { tag: 'v3.2', php: '8.2', distro: bookworm, version-override: "", latest-tag: false }
-                    - { tag: 'v3.3', php: '8.2', distro: bookworm, version-override: "", latest-tag: true }
-                    - { tag: 'v3.3', php: '8.3', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "", latest-tag: true }
-                    - { tag: '3.x', php: '8.2', distro: bookworm, version-override: "v3-dev", latest-tag: false }
-                    - { tag: '3.x', php: '8.3', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "v3-dev", latest-tag: false }
                     #- { tag: '1.x', php: '8.0', distro: bullseye, version-override: "v1-dev", latest-tag: false }
                     #- { tag: '1.x', php: '8.1', distro: bullseye, version-override: "v1-dev", latest-tag: false }
                     #- { tag: '1.x', php: '8.2', distro: bullseye, version-override: "v1-dev", latest-tag: false }
@@ -50,30 +35,29 @@ jobs:
                     #- { tag: '3.x', php: '8.2', distro: bookworm, version-override: "v3-dev", latest-tag: false }
                     #- { tag: '3.x', php: '8.3', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "v3-dev", latest-tag: false }
 
-
         steps:
-            -   uses: actions/checkout@v3
+            -   uses: actions/checkout@v4
                 with:
                     ref: ${{ matrix.tag }}
 
             -   name: Login to DockerHub Registry
                 run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
 
             -   name: Cache Docker layers
-                uses: actions/cache@v3
+                uses: actions/cache@v4
                 with:
                     path: /tmp/.buildx-cache
                     key: ${{ runner.os }}-buildx-${{ matrix.php }}-${{ matrix.distro }}-${{ matrix.tag }}
                     restore-keys: |
                         ${{ runner.os }}-buildx-${{ matrix.php }}-${{ matrix.distro }}-${{ matrix.tag }}-
 
             -   name: Set up QEMU
-                uses: docker/setup-qemu-action@v2
+                uses: docker/setup-qemu-action@v3
                 with:
                     platforms: 'amd64,arm64'
 
             -   name: Set up Buildx
-                uses: docker/setup-buildx-action@v2
+                uses: docker/setup-buildx-action@v3
 
             -   name: Configure and build images
                 id: vars

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -50,7 +50,7 @@ jobs:
                             docker run --rm pimcore-image test ! -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
                         fi
 
-                        docker run --rm pimcore-image composer create-project pimcore/skeleton:11.x-dev pimcore --no-scripts
+                        docker run --rm pimcore-image composer create-project pimcore/skeleton:2024.x-dev pimcore --no-scripts
 
                         if [ "$imageVariant" != "min" ]; then
                             docker run -v "$(pwd)/.github/files":/var/www/html --rm pimcore-image php test_heif.php

diff --git a/Dockerfile b/Dockerfile
@@ -31,7 +31,6 @@ RUN set -eux; \
         # studio1 start
         nodejs npm cifs-utils iputils-ping htop nano m4 \
         # studio1 end
-
     ; \
     \
     docker-php-ext-configure gd --enable-gd --with-jpeg; \

diff --git a/files/conf/php-fpm/php-fpm.conf b/files/conf/php-fpm/php-fpm.conf
@@ -1,5 +1,6 @@
 ; File overwrites the original values with environment variables
 [www]
+listen = ${PHP_FPM_LISTEN}
 pm = ${PHP_FPM_PM}
 pm.max_children = ${PHP_FPM_PM_MAX_CHILDREN}
 pm.start_servers = ${PHP_FPM_PM_START_SERVERS}