From 2f44fc77f5928cac94e10a5d35fa38e730fe511a Mon Sep 17 00:00:00 2001 From: "Douglas Cerna (Soy Douglas)" Date: Sun, 7 Jul 2024 00:01:18 +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 --- Dockerfile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5fd5300b7..5e0b42699 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,8 +11,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 \ @@ -28,9 +28,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 @@ -129,20 +129,20 @@ FROM base AS archivematica-storage-service WORKDIR /src/storage_service -ENV DJANGO_SETTINGS_MODULE storage_service.settings.local -ENV PYTHONPATH /src/storage_service -ENV SS_GUNICORN_BIND 0.0.0.0:8000 -ENV SS_GUNICORN_CHDIR /src/storage_service -ENV SS_GUNICORN_ACCESSLOG - -ENV SS_GUNICORN_ERRORLOG - -ENV FORWARDED_ALLOW_IPS * +ENV DJANGO_SETTINGS_MODULE=storage_service.settings.local +ENV PYTHONPATH=/src/storage_service +ENV SS_GUNICORN_BIND=0.0.0.0:8000 +ENV SS_GUNICORN_CHDIR=/src/storage_service +ENV SS_GUNICORN_ACCESSLOG=- +ENV SS_GUNICORN_ERRORLOG=- +ENV FORWARDED_ALLOW_IPS=* RUN set -ex \ && export SS_DB_URL=mysql://ne:ver@min/d \ && pyenv exec python3 ./manage.py collectstatic --noinput --clear \ && pyenv exec python3 ./manage.py compilemessages -ENV DJANGO_SETTINGS_MODULE storage_service.settings.production +ENV DJANGO_SETTINGS_MODULE=storage_service.settings.production EXPOSE 8000