From ebdb2656b6d8af3e0e8aa96359b02dba013ab88c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Fri, 5 Jul 2024 11:09:09 +0200 Subject: [PATCH] fix: deprecated Dockerfile ENV syntax --- Dockerfile | 6 +++--- alpine.Dockerfile | 6 +++--- dev-alpine.Dockerfile | 4 ++-- dev.Dockerfile | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 26bcf37..6a0ae17 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,8 +27,8 @@ CMD ["--config", "/etc/caddy/Caddyfile", "--adapter", "caddyfile"] HEALTHCHECK CMD curl -f http://localhost:2019/metrics || exit 1 # See https://caddyserver.com/docs/conventions#file-locations for details -ENV XDG_CONFIG_HOME /config -ENV XDG_DATA_HOME /data +ENV XDG_CONFIG_HOME=/config +ENV XDG_DATA_HOME=/data EXPOSE 80 EXPOSE 443 @@ -50,7 +50,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] COPY --from=golang-base /usr/local/go /usr/local/go -ENV PATH /usr/local/go/bin:$PATH +ENV PATH=/usr/local/go/bin:$PATH # This is required to link the FrankenPHP binary to the PHP binary RUN apt-get update && \ diff --git a/alpine.Dockerfile b/alpine.Dockerfile index 00addd5..33e99a0 100644 --- a/alpine.Dockerfile +++ b/alpine.Dockerfile @@ -24,8 +24,8 @@ CMD ["--config", "/etc/caddy/Caddyfile", "--adapter", "caddyfile"] HEALTHCHECK CMD curl -f http://localhost:2019/metrics || exit 1 # See https://caddyserver.com/docs/conventions#file-locations for details -ENV XDG_CONFIG_HOME /config -ENV XDG_DATA_HOME /data +ENV XDG_CONFIG_HOME=/config +ENV XDG_DATA_HOME=/data EXPOSE 80 EXPOSE 443 @@ -47,7 +47,7 @@ SHELL ["/bin/ash", "-eo", "pipefail", "-c"] COPY --link --from=golang-base /usr/local/go /usr/local/go -ENV PATH /usr/local/go/bin:$PATH +ENV PATH=/usr/local/go/bin:$PATH # hadolint ignore=SC2086 RUN apk add --no-cache --virtual .build-deps \ diff --git a/dev-alpine.Dockerfile b/dev-alpine.Dockerfile index 3f95eef..d19e188 100644 --- a/dev-alpine.Dockerfile +++ b/dev-alpine.Dockerfile @@ -2,7 +2,7 @@ FROM golang:1.22-alpine ENV CFLAGS="-ggdb3" -ENV PHPIZE_DEPS \ +ENV PHPIZE_DEPS="\ autoconf \ dpkg-dev \ file \ @@ -11,7 +11,7 @@ ENV PHPIZE_DEPS \ libc-dev \ make \ pkgconfig \ - re2c + re2c" RUN apk add --no-cache \ $PHPIZE_DEPS \ diff --git a/dev.Dockerfile b/dev.Dockerfile index a64afc0..7afef17 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -2,7 +2,7 @@ FROM golang:1.22 ENV CFLAGS="-ggdb3" -ENV PHPIZE_DEPS \ +ENV PHPIZE_DEPS="\ autoconf \ dpkg-dev \ file \ @@ -11,7 +11,7 @@ ENV PHPIZE_DEPS \ libc-dev \ make \ pkg-config \ - re2c + re2c" # hadolint ignore=DL3009 RUN apt-get update && \