From 99ebaf767bbcc165c5a0f785a240c58251d36068 Mon Sep 17 00:00:00 2001 From: Ilyes512 Date: Tue, 31 Mar 2026 13:08:32 +0200 Subject: [PATCH 1/2] Added check-error to Dockerfiles --- apache/Dockerfile | 3 +++ fpm/Dockerfile | 3 +++ frankenphp/Dockerfile | 3 +++ 3 files changed, 9 insertions(+) diff --git a/apache/Dockerfile b/apache/Dockerfile index d56e1cb..e81e19a 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -1,3 +1,6 @@ +# syntax=docker/dockerfile:1 +# check=error=true + # Latest version of PHP base image: https://hub.docker.com/_/php/tags FROM php:8.5.4-apache-trixie AS runtime diff --git a/fpm/Dockerfile b/fpm/Dockerfile index 7848564..a54ca02 100644 --- a/fpm/Dockerfile +++ b/fpm/Dockerfile @@ -1,3 +1,6 @@ +# syntax=docker/dockerfile:1 +# check=error=true + # Latest version of PHP base image: https://hub.docker.com/_/php/tags FROM php:8.5.4-fpm-trixie AS runtime diff --git a/frankenphp/Dockerfile b/frankenphp/Dockerfile index 308285e..a37b12b 100644 --- a/frankenphp/Dockerfile +++ b/frankenphp/Dockerfile @@ -1,3 +1,6 @@ +# syntax=docker/dockerfile:1 +# check=error=true + # Latest version of FrankenPHP base image: https://hub.docker.com/r/dunglas/frankenphp/tags FROM dunglas/frankenphp:1.12.1-php8.5.4-trixie AS runtime From 33b8b8356468ae11e1bdd5b78c19f5d704c19564 Mon Sep 17 00:00:00 2001 From: Ilyes512 Date: Tue, 31 Mar 2026 13:14:04 +0200 Subject: [PATCH 2/2] Added lint taskfile to run the Dockerfile linter on all Dockerfiles --- Taskfile.dist.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Taskfile.dist.yml b/Taskfile.dist.yml index 10cca2e..05995df 100644 --- a/Taskfile.dist.yml +++ b/Taskfile.dist.yml @@ -20,6 +20,13 @@ tasks: - task: build:apache - task: build:frankenphp + lint: + desc: Apply a Dockerfile linter to all Dockerfiles + cmds: + - task: lint:fpm + - task: lint:apache + - task: lint:frankenphp + build:fpm: desc: Build all PHP Docker image targets of the FPM variant deps: [lint:fpm] @@ -110,22 +117,23 @@ tasks: lint:fpm: desc: Apply a Dockerfile linter (https://github.com/hadolint/hadolint) cmds: - - task: lint + - task: do:lint vars: { DOCKERFILE_PATH: fpm/Dockerfile } lint:apache: desc: Apply a Dockerfile linter (https://github.com/hadolint/hadolint) cmds: - - task: lint + - task: do:lint vars: { DOCKERFILE_PATH: apache/Dockerfile } lint:frankenphp: desc: Apply a Dockerfile linter (https://github.com/hadolint/hadolint) cmds: - - task: lint + - task: do:lint vars: { DOCKERFILE_PATH: frankenphp/Dockerfile } - lint: + do:lint: + internal: true cmds: - docker run --interactive