Upgrading to Version 6.0.7+230515

* Update hadolint/hadolint-action action to v3

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Markus Opolka <markus.opolka@netways.de>

.github/renovate.json

@@ -0,0 +1,9 @@
+{
+  "extends": [
+    "config:base"
+  ],
+  "enabledManagers": ["dockerfile", "github-actions"],
+  "dockerfile": {
+    "ignorePaths": ["4.0", "nginx-certbot"]
+  }
+}

.github/workflows/build-latest-container-images.yaml

@@ -16,10 +16,10 @@ jobs:
           - 6.0/fpm/Dockerfile
     steps:
       - uses: actions/checkout@v3
-      - uses: hadolint/hadolint-action@v1.5.0
+      - uses: hadolint/hadolint-action@v3.1.0
         with:
           dockerfile: ${{ matrix.dockerfile }}
-          ignore: DL4006 DL3008 DL3018
+          ignore: "DL4006,DL3008,DL3018"
 
   push_images_to_registries:
     name: Push Container Images to registries
@@ -59,7 +59,7 @@ jobs:
             latest=true
             suffix=-apache
       - name: 'Build and push latest Apache container images'
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: 6.0/apache
           push: true
@@ -80,7 +80,7 @@ jobs:
             latest=false
             suffix=-fpm
       - name: 'Build and push latest fpm container images'
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: 6.0/fpm
           push: true
@@ -101,7 +101,7 @@ jobs:
             latest=false
             suffix=-fpm-alpine
       - name: 'Build and push latest fpm-alpine container images'
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: 6.0/fpm-alpine
           push: true

.github/workflows/build-lts-container-images.yaml

@@ -16,10 +16,10 @@ jobs:
           - 5.0/fpm/Dockerfile
     steps:
       - uses: actions/checkout@v3
-      - uses: hadolint/hadolint-action@v1.5.0
+      - uses: hadolint/hadolint-action@v3.1.0
         with:
           dockerfile: ${{ matrix.dockerfile }}
-          ignore: DL4006 DL3008 DL3018
+          ignore: "DL4006,DL3008,DL3018"
 
   push_images_to_registries:
     name: 'Push container images to registries'
@@ -29,11 +29,6 @@ jobs:
     permissions:
       packages: write
       contents: read
-    strategy:
-      matrix:
-        platform:
-          - linux/amd64
-          - linux/arm64
     steps:
       - name: 'Check out the repo'
         uses: actions/checkout@v3
@@ -64,13 +59,13 @@ jobs:
             latest=false
             suffix=-apache
       - name: 'Build and push LTS apache container images'
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: 5.0/apache
           push: true
           tags: ${{ steps.metadata-apache.outputs.tags }}
           labels: ${{ steps.metadata-apache.outputs.labels }}
-          platforms: ${{ matrix.platform }}
+          platforms: linux/amd64,linux/arm64
 
       - name: 'FPM variant metadata'
         id: metadata-fpm
@@ -85,13 +80,13 @@ jobs:
             latest=false
             suffix=-fpm
       - name: 'Build and push LTS fpm container images'
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: 5.0/fpm
           push: true
           tags: ${{ steps.metadata-fpm.outputs.tags }}
           labels: ${{ steps.metadata-apache.outputs.labels }}
-          platforms: ${{ matrix.platform }}
+          platforms: linux/amd64,linux/arm64
 
       - name: 'FPM Alpine variant metadata'
         id: metadata-fpm-alpine
@@ -106,10 +101,10 @@ jobs:
             latest=false
             suffix=-fpm-alpine
       - name: 'Build and push LTS fpm-alpine container images'
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: 5.0/fpm-alpine
           push: true
           tags: ${{ steps.metadata-fpm-alpine.outputs.tags }}
           labels: ${{ steps.metadata-apache.outputs.labels }}
-          platforms: ${{ matrix.platform }}
+          platforms: linux/amd64,linux/arm64

.github/workflows/lint-dockerfiles.yaml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: hadolint/hadolint-action@v1.5.0
+      - uses: hadolint/hadolint-action@v3.1.0
         with:
           dockerfile: ${{ matrix.dockerfile }}
-          ignore: DL4006 DL3008 DL3018
+          ignore: "DL4006,DL3008,DL3018"

.github/workflows/test-arm-container-images.yaml

@@ -33,7 +33,7 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: 'Build Container images'
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: 6.0/${{ matrix.context }}
           push: false
@@ -42,7 +42,7 @@ jobs:
           platforms: ${{ matrix.platform }}
 
       - name: 'Run Structure tests'
-        uses: plexsystems/container-structure-test-action@v0.2.0
+        uses: plexsystems/container-structure-test-action@v0.3.0
         with:
           image: docker.io/martialblog/limesurvey:6-${{ matrix.context }}
           config: tests/${{ matrix.context }}-tests.yaml

.github/workflows/test-latest-container-images.yaml

@@ -25,7 +25,7 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: 'Build Container images'
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: 6.0/${{ matrix.context }}
           push: false
@@ -33,7 +33,7 @@ jobs:
           tags: docker.io/martialblog/limesurvey:6-${{ matrix.context }}
 
       - name: 'Run Structure tests'
-        uses: plexsystems/container-structure-test-action@v0.2.0
+        uses: plexsystems/container-structure-test-action@v0.3.0
         with:
           image: docker.io/martialblog/limesurvey:6-${{ matrix.context }}
           config: tests/${{ matrix.context }}-tests.yaml

.github/workflows/test-lts-container-images.yaml

@@ -23,7 +23,7 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: 'Build Container images'
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: 5.0/${{ matrix.context }}
           push: false
@@ -31,7 +31,7 @@ jobs:
           tags: docker.io/martialblog/limesurvey:5-${{ matrix.context }}
 
       - name: 'Run Structure tests'
-        uses: plexsystems/container-structure-test-action@v0.2.0
+        uses: plexsystems/container-structure-test-action@v0.3.0
         with:
           image: docker.io/martialblog/limesurvey:5-${{ matrix.context }}
           config: tests/${{ matrix.context }}-tests.yaml

3.0/apache/Dockerfile

@@ -59,8 +59,8 @@ RUN a2enmod headers rewrite remoteip; \
 # Use the default production configuration
 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 
-ARG version="3.28.55+230328"
+ARG version="3.28.56+230404"
-ARG sha256_checksum="7f820259aa68fcd2fff7a23e9261ad65af0b28085ef93a69bf14cc068ee829c5"
+ARG sha256_checksum="abfdc800d97feabbd448df4a2cfa72a954d2f6b013475132b0691ac2563e7228"
 ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
 ARG USER=root
 ARG LISTEN_PORT=80

3.0/fpm-alpine/Dockerfile

@@ -33,8 +33,8 @@ RUN set -ex; \
         tidy \
         zip
 
-ARG version="3.28.55+230328"
+ARG version="3.28.56+230404"
-ARG sha256_checksum="7f820259aa68fcd2fff7a23e9261ad65af0b28085ef93a69bf14cc068ee829c5"
+ARG sha256_checksum="abfdc800d97feabbd448df4a2cfa72a954d2f6b013475132b0691ac2563e7228"
 ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
 ENV LIMESURVEY_VERSION=$version
 

3.0/fpm/Dockerfile

@@ -46,8 +46,8 @@ RUN set -ex; \
         tidy \
         zip
 
-ARG version="3.28.55+230328"
+ARG version="3.28.56+230404"
-ARG sha256_checksum="7f820259aa68fcd2fff7a23e9261ad65af0b28085ef93a69bf14cc068ee829c5"
+ARG sha256_checksum="abfdc800d97feabbd448df4a2cfa72a954d2f6b013475132b0691ac2563e7228"
 ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
 ENV LIMESURVEY_VERSION=$version
 

5.0/apache/Dockerfile

@@ -60,8 +60,8 @@ RUN a2enmod headers rewrite remoteip; \
 # Use the default production configuration
 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 
-ARG version="5.6.14+230403"
+ARG version="5.6.21+230518"
-ARG sha256_checksum="671689d54db6c018c5dd764c852fccd5e582c4cf743bd7fe50329d2fbab5f8a7"
+ARG sha256_checksum="47ae13c225b7986e65913e3d2206fd53a7acf511166d2d1a73b5257830eacfef"
 ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
 ARG USER=www-data
 ARG LISTEN_PORT=8080

5.0/fpm-alpine/Dockerfile

@@ -34,8 +34,8 @@ RUN set -ex; \
         tidy \
         zip
 
-ARG version="5.6.14+230403"
+ARG version="5.6.21+230518"
-ARG sha256_checksum="671689d54db6c018c5dd764c852fccd5e582c4cf743bd7fe50329d2fbab5f8a7"
+ARG sha256_checksum="47ae13c225b7986e65913e3d2206fd53a7acf511166d2d1a73b5257830eacfef"
 ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
 ARG USER=www-data
 ENV LIMESURVEY_VERSION=$version

5.0/fpm/Dockerfile

@@ -46,8 +46,8 @@ RUN set -ex; \
         tidy \
         zip
 
-ARG version="5.6.14+230403"
+ARG version="5.6.21+230518"
-ARG sha256_checksum="671689d54db6c018c5dd764c852fccd5e582c4cf743bd7fe50329d2fbab5f8a7"
+ARG sha256_checksum="47ae13c225b7986e65913e3d2206fd53a7acf511166d2d1a73b5257830eacfef"
 ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
 ARG USER=www-data
 ENV LIMESURVEY_VERSION=$version

6.0/apache/Dockerfile

@@ -60,8 +60,8 @@ RUN a2enmod headers rewrite remoteip; \
 # Use the default production configuration
 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 
-ARG version="6.0.0+230405"
+ARG version="6.0.7+230515"
-ARG sha256_checksum="ee636330911150b5f109323b6226c48d9fd7634856b251bbf66a75a29d4b4756"
+ARG sha256_checksum="de13467a4963d9759bd24300b5bd5b07f3149b0a62943180afaadfbd0513fef7"
 ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
 ARG USER=www-data
 ARG LISTEN_PORT=8080

6.0/fpm-alpine/Dockerfile

@@ -34,8 +34,8 @@ RUN set -ex; \
         tidy \
         zip
 
-ARG version="6.0.0+230405"
+ARG version="6.0.7+230515"
-ARG sha256_checksum="ee636330911150b5f109323b6226c48d9fd7634856b251bbf66a75a29d4b4756"
+ARG sha256_checksum="de13467a4963d9759bd24300b5bd5b07f3149b0a62943180afaadfbd0513fef7"
 ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
 ARG USER=www-data
 ENV LIMESURVEY_VERSION=$version

6.0/fpm/Dockerfile

@@ -46,8 +46,8 @@ RUN set -ex; \
         tidy \
         zip
 
-ARG version="6.0.0+230405"
+ARG version="6.0.7+230515"
-ARG sha256_checksum="ee636330911150b5f109323b6226c48d9fd7634856b251bbf66a75a29d4b4756"
+ARG sha256_checksum="de13467a4963d9759bd24300b5bd5b07f3149b0a62943180afaadfbd0513fef7"
 ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
 ARG USER=www-data
 ENV LIMESURVEY_VERSION=$version