Dockerfiles: replace ENV syntax with new one (=)

wagner-intevation · wagner-intevation · commit 3b7d70366f92 · 2026-02-10T10:31:29.000+01:00
diff --git a/database/Dockerfile b/database/Dockerfile
@@ -4,9 +4,9 @@ ARG INTELMQ_CERTBUND_CONTACT_REVISION
 ARG INTELMQ_REVISION
 ARG INTELMQ_MAILGEN_REVISION
 
-ENV INTELMQ_CERTBUND_CONTACT_REVISION ${INTELMQ_CERTBUND_CONTACT_REVISION}
-ENV INTELMQ_REVISION ${INTELMQ_REVISION}
-ENV INTELMQ_MAILGEN_REVISION ${INTELMQ_MAILGEN_REVISION}
+ENV INTELMQ_CERTBUND_CONTACT_REVISION=${INTELMQ_CERTBUND_CONTACT_REVISION}
+ENV INTELMQ_REVISION=${INTELMQ_REVISION}
+ENV INTELMQ_MAILGEN_REVISION=${INTELMQ_MAILGEN_REVISION}
 
 # Install python3 deps and stuff
 RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y git curl python3-pip python3-psycopg2
diff --git a/database/Dockerfile.full-pkg b/database/Dockerfile.full-pkg
@@ -1,7 +1,7 @@
 FROM postgres:17-bookworm
 
 ARG INTELMQ_UNSTABLE_REPOSITORY
-ENV INTELMQ_UNSTABLE_REPOSITORY ${INTELMQ_UNSTABLE_REPOSITORY}
+ENV INTELMQ_UNSTABLE_REPOSITORY=${INTELMQ_UNSTABLE_REPOSITORY}
 
 WORKDIR /opt
 
diff --git a/database/Dockerfile.pkg b/database/Dockerfile.pkg
@@ -1,7 +1,7 @@
 FROM postgres:17-bookworm
 
 ARG INTELMQ_UNSTABLE_REPOSITORY
-ENV INTELMQ_UNSTABLE_REPOSITORY ${INTELMQ_UNSTABLE_REPOSITORY}
+ENV INTELMQ_UNSTABLE_REPOSITORY=${INTELMQ_UNSTABLE_REPOSITORY}
 
 WORKDIR /opt
 
diff --git a/fody-backend/Dockerfile b/fody-backend/Dockerfile
@@ -3,8 +3,8 @@ FROM ubuntu:22.04
 ARG REVISION
 ARG INTELMQ_MAILGEN_REVISION
 
-ENV REVISION ${REVISION}
-ENV INTELMQ_MAILGEN_REVISION ${INTELMQ_MAILGEN_REVISION}
+ENV REVISION=${REVISION}
+ENV INTELMQ_MAILGEN_REVISION=${INTELMQ_MAILGEN_REVISION}
 
 # Install dependencies and stuff
 RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y git python3-pip python3-psycopg2 python3-dateutil libgpgme-dev sqlite3 python3-gpg python3-jsonschema
@@ -27,7 +27,7 @@ RUN git clone https://github.com/Intevation/intelmq-fody-backend.git
 
 RUN cd intelmq-fody-backend && git checkout $REVISION
 
-ENV FODY_SESSION_CONFIG /etc/intelmq/fody-session.conf
+ENV FODY_SESSION_CONFIG=/etc/intelmq/fody-session.conf
 
 COPY fody-backend/conf/fody-session.conf /etc/intelmq/fody-session.conf
 
diff --git a/fody/Dockerfile b/fody/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:22.04
 
 ARG REVISION
 
-ENV REVISION ${REVISION}
+ENV REVISION=${REVISION}
 
 COPY common/setup-apt.sh /opt/
 RUN /opt/setup-apt.sh node
diff --git a/fody/Dockerfile.full-pkg b/fody/Dockerfile.full-pkg
@@ -1,15 +1,15 @@
 FROM ubuntu:22.04
 
 ARG INTELMQ_UNSTABLE_REPOSITORY
-ENV INTELMQ_UNSTABLE_REPOSITORY ${INTELMQ_UNSTABLE_REPOSITORY}
+ENV INTELMQ_UNSTABLE_REPOSITORY=${INTELMQ_UNSTABLE_REPOSITORY}
 
 # Fody backend requires UTF-8 locale
 RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y locales
 RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
     locale-gen
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US:en
+ENV LC_ALL=en_US.UTF-8
 
 COPY common/setup-apt.sh /opt/
 RUN /opt/setup-apt.sh intelmq
diff --git a/fody/Dockerfile.pkg b/fody/Dockerfile.pkg
@@ -1,15 +1,15 @@
 FROM ubuntu:22.04
 
 ARG INTELMQ_UNSTABLE_REPOSITORY
-ENV INTELMQ_UNSTABLE_REPOSITORY ${INTELMQ_UNSTABLE_REPOSITORY}
+ENV INTELMQ_UNSTABLE_REPOSITORY=${INTELMQ_UNSTABLE_REPOSITORY}
 
 # Fody backend requires UTF-8 locale
 RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y locales
 RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
     locale-gen
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US:en
+ENV LC_ALL=en_US.UTF-8
 
 # Copy the intelmq packages into the container
 COPY packages/* /opt/packages/
diff --git a/intelmq/Dockerfile b/intelmq/Dockerfile
@@ -6,11 +6,11 @@ ARG INTELMQ_MANAGER_REVISION
 ARG INTELMQ_CERTBUND_CONTACT_REVISION
 ARG INTELMQ_MAILGEN_REVISION
 
-ENV INTELMQ_REVISION ${INTELMQ_REVISION}
-ENV INTELMQ_API_REVISION ${INTELMQ_API_REVISION}
-ENV INTELMQ_MANAGER_REVISION ${INTELMQ_MANAGER_REVISION}
-ENV INTELMQ_CERTBUND_CONTACT_REVISION ${INTELMQ_CERTBUND_CONTACT_REVISION}
-ENV INTELMQ_MAILGEN_REVISION ${INTELMQ_MAILGEN_REVISION}
+ENV INTELMQ_REVISION=${INTELMQ_REVISION}
+ENV INTELMQ_API_REVISION=${INTELMQ_API_REVISION}
+ENV INTELMQ_MANAGER_REVISION=${INTELMQ_MANAGER_REVISION}
+ENV INTELMQ_CERTBUND_CONTACT_REVISION=${INTELMQ_CERTBUND_CONTACT_REVISION}
+ENV INTELMQ_MAILGEN_REVISION=${INTELMQ_MAILGEN_REVISION}
 
 RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y \
     apache2 libapache2-mod-wsgi-py3 cron git \
diff --git a/intelmq/Dockerfile.full-pkg b/intelmq/Dockerfile.full-pkg
@@ -1,7 +1,7 @@
 FROM ubuntu:22.04
 
 ARG INTELMQ_UNSTABLE_REPOSITORY
-ENV INTELMQ_UNSTABLE_REPOSITORY ${INTELMQ_UNSTABLE_REPOSITORY}
+ENV INTELMQ_UNSTABLE_REPOSITORY=${INTELMQ_UNSTABLE_REPOSITORY}
 
 COPY common/setup-apt.sh /opt/
 RUN /opt/setup-apt.sh intelmq
diff --git a/intelmq/Dockerfile.pkg b/intelmq/Dockerfile.pkg
@@ -1,7 +1,7 @@
 FROM ubuntu:22.04
 
 ARG INTELMQ_UNSTABLE_REPOSITORY
-ENV INTELMQ_UNSTABLE_REPOSITORY ${INTELMQ_UNSTABLE_REPOSITORY}
+ENV INTELMQ_UNSTABLE_REPOSITORY=${INTELMQ_UNSTABLE_REPOSITORY}
 
 # Copy the intelmq packages into the container
 COPY packages/* /opt/packages/
diff --git a/mailgen/Dockerfile b/mailgen/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:22.04
 
 ARG INTELMQ_MAILGEN_REVISION
 
-ENV INTELMQ_MAILGEN_REVISION ${INTELMQ_MAILGEN_REVISION}
+ENV INTELMQ_MAILGEN_REVISION=${INTELMQ_MAILGEN_REVISION}
 
 # Install git to be able to clone the mailgen repo
 RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y git \
diff --git a/pkg/intelmq-packaging/Dockerfile b/pkg/intelmq-packaging/Dockerfile
@@ -26,9 +26,9 @@ RUN DEBIAN_FRONTEND=noninteractive \
     gnupg
 
 RUN locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US:en
+ENV LC_ALL=en_US.UTF-8
 
 RUN apt-get update
 
diff --git a/webinput-csv-backend/Dockerfile b/webinput-csv-backend/Dockerfile
@@ -3,8 +3,8 @@ FROM ubuntu:22.04
 ARG REVISION
 ARG INTELMQ_PYPI_VERSION
 
-ENV REVISION ${REVISION}
-ENV INTELMQ_PYPI_VERSION ${INTELMQ_PYPI_VERSION}
+ENV REVISION=${REVISION}
+ENV INTELMQ_PYPI_VERSION=${INTELMQ_PYPI_VERSION}
 
 # Install dependencies
 COPY common/setup-apt.sh /opt/
@@ -18,11 +18,11 @@ RUN git clone https://github.com/Intevation/intelmq-webinput-csv.git
 
 RUN cd intelmq-webinput-csv && git checkout $REVISION
 
-ENV WEBINPUT_CSV_SESSION_CONFIG /etc/intelmq/webinput-session.conf
+ENV WEBINPUT_CSV_SESSION_CONFIG=/etc/intelmq/webinput-session.conf
 
 COPY webinput-csv-backend/webinput-session.conf /etc/intelmq/webinput-session.conf
 
-ENV WEBINPUT_CSV_CONFIG /etc/intelmq/webinput_csv.conf
+ENV WEBINPUT_CSV_CONFIG=/etc/intelmq/webinput_csv.conf
 
 COPY webinput-csv-backend/webinput_csv.conf /etc/intelmq/webinput_csv.conf
 
diff --git a/webinput-csv-backend/mailgen.Dockerfile b/webinput-csv-backend/mailgen.Dockerfile
@@ -8,11 +8,11 @@ ARG INTELMQ_MANAGER_REVISION
 ARG INTELMQ_CERTBUND_CONTACT_REVISION
 ARG INTELMQ_MAILGEN_REVISION
 
-ENV INTELMQ_REVISION ${INTELMQ_REVISION}
-ENV INTELMQ_API_REVISION ${INTELMQ_API_REVISION}
-ENV INTELMQ_MANAGER_REVISION ${INTELMQ_MANAGER_REVISION}
-ENV INTELMQ_CERTBUND_CONTACT_REVISION ${INTELMQ_CERTBUND_CONTACT_REVISION}
-ENV INTELMQ_MAILGEN_REVISION ${INTELMQ_MAILGEN_REVISION}
+ENV INTELMQ_REVISION=${INTELMQ_REVISION}
+ENV INTELMQ_API_REVISION=${INTELMQ_API_REVISION}
+ENV INTELMQ_MANAGER_REVISION=${INTELMQ_MANAGER_REVISION}
+ENV INTELMQ_CERTBUND_CONTACT_REVISION=${INTELMQ_CERTBUND_CONTACT_REVISION}
+ENV INTELMQ_MAILGEN_REVISION=${INTELMQ_MAILGEN_REVISION}
 
 COPY common/setup-apt.sh /opt/
 RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y \
@@ -122,7 +122,7 @@ RUN chmod +x /opt/startup.sh
 
 ARG INTELMQ_MAILGEN_REVISION
 
-ENV INTELMQ_MAILGEN_REVISION ${INTELMQ_MAILGEN_REVISION}
+ENV INTELMQ_MAILGEN_REVISION=${INTELMQ_MAILGEN_REVISION}
 
 # Install git to be able to clone the mailgen repo
 RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y git \
@@ -166,13 +166,14 @@ RUN git clone https://github.com/Intevation/intelmq-webinput-csv.git
 
 RUN cd intelmq-webinput-csv && git checkout $SOURCE_WEBINPUT_CSV_REVISION
 
-ENV WEBINPUT_CSV_SESSION_CONFIG /etc/intelmq/webinput-session.conf
+ENV WEBINPUT_CSV_SESSION_CONFIG=/etc/intelmq/webinput-session.conf
 
 COPY webinput-csv-backend/webinput-session.conf /etc/intelmq/webinput-session.conf
 
-ENV WEBINPUT_CSV_CONFIG /etc/intelmq/webinput_csv.conf
+ENV WEBINPUT_CSV_CONFIG=/etc/intelmq/webinput_csv.conf
 
 COPY webinput-csv-backend/webinput_csv.conf /etc/intelmq/webinput_csv.conf
+#RUN sed -i 's#"prefix": ""#"prefix": "/intelmq-webinput/"#' /etc/intelmq/webinput_csv.conf
 
 RUN mkdir -p /opt/intelmq/etc
 
diff --git a/webinput-csv/Dockerfile b/webinput-csv/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:22.04
 
 ARG REVISION
 
-ENV REVISION ${REVISION}
+ENV REVISION=${REVISION}
 
 COPY common/setup-apt.sh /opt/
 RUN /opt/setup-apt.sh node
diff --git a/webinput-csv/Dockerfile.full-pkg b/webinput-csv/Dockerfile.full-pkg
@@ -1,7 +1,7 @@
 FROM ubuntu:22.04
 
 ARG INTELMQ_UNSTABLE_REPOSITORY
-ENV INTELMQ_UNSTABLE_REPOSITORY ${INTELMQ_UNSTABLE_REPOSITORY}
+ENV INTELMQ_UNSTABLE_REPOSITORY=${INTELMQ_UNSTABLE_REPOSITORY}
 
 COPY common/setup-apt.sh /opt/
 RUN /opt/setup-apt.sh intelmq
diff --git a/webinput-csv/Dockerfile.pkg b/webinput-csv/Dockerfile.pkg
@@ -1,15 +1,15 @@
 FROM ubuntu:22.04
 
 ARG INTELMQ_UNSTABLE_REPOSITORY
-ENV INTELMQ_UNSTABLE_REPOSITORY ${INTELMQ_UNSTABLE_REPOSITORY}
+ENV INTELMQ_UNSTABLE_REPOSITORY=${INTELMQ_UNSTABLE_REPOSITORY}
 
 RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y locales
 
 RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
     locale-gen
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US:en
+ENV LC_ALL=en_US.UTF-8
 
 # Copy the packages into the container
 COPY packages/* /opt/packages/
