From ae6badcf5a51cbb9803729618cd567d36c59539e Mon Sep 17 00:00:00 2001
From: "Douglas Cerna (Soy Douglas)" <douglascerna@yahoo.com>
Date: Mon, 8 Jul 2024 19:37:22 +0000
Subject: [PATCH] Update ENV instructions in Dockerfile

The old syntax is now discouraged. See
https://docs.docker.com/engine/deprecated/#dockerfile-legacy-env-name-value-syntax
---
 hack/Dockerfile | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/hack/Dockerfile b/hack/Dockerfile
index 05ccc5fdf2..1d3e6a260f 100644
--- a/hack/Dockerfile
+++ b/hack/Dockerfile
@@ -14,8 +14,8 @@ FROM ubuntu:${UBUNTU_VERSION} AS base-builder
 
 ARG PYENV_DIR=/pyenv
 
-ENV DEBIAN_FRONTEND noninteractive
-ENV PYTHONUNBUFFERED 1
+ENV DEBIAN_FRONTEND=noninteractive
+ENV PYTHONUNBUFFERED=1
 
 RUN set -ex \
 	&& apt-get update \
@@ -35,9 +35,9 @@ RUN set -ex \
 	&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
 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
 
 ENV PYENV_ROOT=${PYENV_DIR}/data
 ENV PATH=$PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH
@@ -223,11 +223,11 @@ COPY --chown=${USER_ID}:${GROUP_ID} --link . /src
 
 FROM base AS archivematica-mcp-client
 
-ENV DJANGO_SETTINGS_MODULE settings.common
-ENV PYTHONPATH /src/src/MCPClient/lib/:/src/src/MCPClient/lib/clientScripts:/src/src/archivematicaCommon/lib/:/src/src/dashboard/src/
-ENV ARCHIVEMATICA_MCPCLIENT_ARCHIVEMATICACLIENTMODULES /src/src/MCPClient/lib/archivematicaClientModules
-ENV ARCHIVEMATICA_MCPCLIENT_CLIENTASSETSDIRECTORY /src/src/MCPClient/lib/assets/
-ENV ARCHIVEMATICA_MCPCLIENT_CLIENTSCRIPTSDIRECTORY /src/src/MCPClient/lib/clientScripts/
+ENV DJANGO_SETTINGS_MODULE=settings.common
+ENV PYTHONPATH=/src/src/MCPClient/lib/:/src/src/MCPClient/lib/clientScripts:/src/src/archivematicaCommon/lib/:/src/src/dashboard/src/
+ENV ARCHIVEMATICA_MCPCLIENT_ARCHIVEMATICACLIENTMODULES=/src/src/MCPClient/lib/archivematicaClientModules
+ENV ARCHIVEMATICA_MCPCLIENT_CLIENTASSETSDIRECTORY=/src/src/MCPClient/lib/assets/
+ENV ARCHIVEMATICA_MCPCLIENT_CLIENTSCRIPTSDIRECTORY=/src/src/MCPClient/lib/clientScripts/
 
 # Some scripts in archivematica-fpr-admin executed by MCPClient rely on certain
 # files being available in this image (e.g. see https://git.io/vA1wF).
@@ -240,8 +240,8 @@ ENTRYPOINT ["pyenv", "exec", "python3", "/src/src/MCPClient/lib/archivematicaCli
 
 FROM base AS archivematica-mcp-server
 
-ENV DJANGO_SETTINGS_MODULE settings.common
-ENV PYTHONPATH /src/src/MCPServer/lib/:/src/src/archivematicaCommon/lib/:/src/src/dashboard/src/
+ENV DJANGO_SETTINGS_MODULE=settings.common
+ENV PYTHONPATH=/src/src/MCPServer/lib/:/src/src/archivematicaCommon/lib/:/src/src/dashboard/src/
 
 ENTRYPOINT ["pyenv", "exec", "python3", "/src/src/MCPServer/lib/archivematicaMCP.py"]
 
@@ -270,17 +270,17 @@ COPY --chown=${USER_ID}:${GROUP_ID} --from=archivematica-dashboard-frontend-buil
 
 WORKDIR /src/src/dashboard/src
 
-ENV DJANGO_SETTINGS_MODULE settings.local
-ENV PYTHONPATH /src/src/dashboard/src/:/src/src/archivematicaCommon/lib/
-ENV AM_GUNICORN_BIND 0.0.0.0:8000
-ENV AM_GUNICORN_CHDIR /src/src/dashboard/src
-ENV FORWARDED_ALLOW_IPS *
+ENV DJANGO_SETTINGS_MODULE=settings.local
+ENV PYTHONPATH=/src/src/dashboard/src/:/src/src/archivematicaCommon/lib/
+ENV AM_GUNICORN_BIND=0.0.0.0:8000
+ENV AM_GUNICORN_CHDIR=/src/src/dashboard/src
+ENV FORWARDED_ALLOW_IPS=*
 
 RUN set -ex \
 	&& ./manage.py collectstatic --noinput --clear \
 	&& ./manage.py compilemessages
 
-ENV DJANGO_SETTINGS_MODULE settings.production
+ENV DJANGO_SETTINGS_MODULE=settings.production
 
 EXPOSE 8000