Fix hadolint Action config

Upgrading to Version 6.0.1+230411
Update hadolint/hadolint-action action to v3 (#147 )
2025-12-06 16:39:11 +01:00 · 2023-04-18 15:12:00 +02:00 · 2023-04-18 09:37:50 +02:00 · 2023-04-14 10:28:31 +02:00 · 2023-04-13 13:47:50 +02:00 · 2023-04-13 13:17:49 +02:00
10 changed files with 33 additions and 24 deletions
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -0,0 +1,9 @@
+{
+  "extends": [
+    "config:base"
+  ],
+  "enabledManagers": ["dockerfile", "github-actions"],
+  "dockerfile": {
+    "ignorePaths": ["4.0", "nginx-certbot"]
+  }
+}
--- a/.github/workflows/build-latest-container-images.yaml
+++ b/.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
--- a/.github/workflows/build-lts-container-images.yaml
+++ b/.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'
@@ -64,7 +64,7 @@ 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
@@ -85,7 +85,7 @@ 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
@@ -106,7 +106,7 @@ 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
--- a/.github/workflows/lint-dockerfiles.yaml
+++ b/.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"
--- a/.github/workflows/test-arm-container-images.yaml
+++ b/.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
--- a/.github/workflows/test-latest-container-images.yaml
+++ b/.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
--- a/.github/workflows/test-lts-container-images.yaml
+++ b/.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
--- a/6.0/apache/Dockerfile
+++ b/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 sha256_checksum="ee636330911150b5f109323b6226c48d9fd7634856b251bbf66a75a29d4b4756"
+ARG version="6.0.1+230411"
+ARG sha256_checksum="ab06006760677ff2fdee315392ee6d5b869f0144f7adaf2bc94879162a378589"
 ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
 ARG USER=www-data
 ARG LISTEN_PORT=8080
--- a/6.0/fpm-alpine/Dockerfile
+++ b/6.0/fpm-alpine/Dockerfile
@@ -34,8 +34,8 @@ RUN set -ex; \
        tidy \
        zip

-ARG version="6.0.0+230405"
-ARG sha256_checksum="ee636330911150b5f109323b6226c48d9fd7634856b251bbf66a75a29d4b4756"
+ARG version="6.0.1+230411"
+ARG sha256_checksum="ab06006760677ff2fdee315392ee6d5b869f0144f7adaf2bc94879162a378589"
 ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
 ARG USER=www-data
 ENV LIMESURVEY_VERSION=$version
--- a/6.0/fpm/Dockerfile
+++ b/6.0/fpm/Dockerfile
@@ -46,8 +46,8 @@ RUN set -ex; \
        tidy \
        zip

-ARG version="6.0.0+230405"
-ARG sha256_checksum="ee636330911150b5f109323b6226c48d9fd7634856b251bbf66a75a29d4b4756"
+ARG version="6.0.1+230411"
+ARG sha256_checksum="ab06006760677ff2fdee315392ee6d5b869f0144f7adaf2bc94879162a378589"
 ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
 ARG USER=www-data
 ENV LIMESURVEY_VERSION=$version
Author	SHA1	Message	Date
Markus Opolka	d3c5ed4e35	Fix hadolint Action config	2023-04-18 15:12:00 +02:00
Markus Opolka	b1b32c2380	Upgrading to Version 6.0.1+230411	2023-04-18 09:37:50 +02:00
renovate[bot]	f79d1e3a9d	Update hadolint/hadolint-action action to v3 (#147 ) * 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>	2023-04-14 10:28:31 +02:00
Markus Opolka	bfa8bbb85a	Merge pull request #146 from martialblog/renovate/docker-build-push-action-4.x Update docker/build-push-action action to v4	2023-04-13 13:47:50 +02:00
Markus Opolka	9ff5cdf1cb	Merge pull request #145 from martialblog/renovate/plexsystems-container-structure-test-action-0.x Update plexsystems/container-structure-test-action action to v0.3.0	2023-04-13 13:17:49 +02:00
renovate[bot]	3552c1b90d	Update docker/build-push-action action to v4	2023-04-13 11:04:01 +00:00
renovate[bot]	76a7f28105	Update plexsystems/container-structure-test-action action to v0.3.0	2023-04-13 11:03:54 +00:00
Markus Opolka	36d49a4fbb	Merge pull request #143 from martialblog/renovate/hadolint-hadolint-action-1.x Update hadolint/hadolint-action action to v1.7.0	2023-04-13 08:17:04 +02:00
renovate[bot]	b9c9c3f854	Update hadolint/hadolint-action action to v1.7.0	2023-04-13 06:07:46 +00:00
renovate[bot]	6e06dec555	Configure Renovate (#98 ) * Add renovate.json --------- Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: Markus Opolka <markus@martialblog.de>	2023-04-13 08:07:09 +02:00
Markus Opolka	b9627cda92	Merge pull request #141 from martialblog/chore/update-gh-actions Update GitHub Actions	2023-04-12 13:05:19 +02:00