Update Dockerfiles with small improvements (#1016)

WordPress · Feb 28, 2023 · 9cd0b97 · 9cd0b97
1 parent 3a9ffb9
commit 9cd0b97
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/docker/airflow/Dockerfile b/docker/airflow/Dockerfile
@@ -15,9 +15,8 @@ ENV PYTHONPATH=${DAGS_FOLDER}
 ENV PATH=${AIRFLOW_HOME}/.local/bin:$PATH
 
 # Container optimizations
-ENV PIPNOCACHEDIR=1
-ENV DEBIAN_FRONTEND=noninteractive
 ENV PYTHONUNBUFFERED=1
+ENV PIP_NO_CACHE_DIR=1
 ENV PIP_NO_COLOR=1
 
 # Airflow/workflow configuration
@@ -35,10 +34,11 @@ ENV AIRFLOW__LOGGING__REMOTE_BASE_LOG_FOLDER=s3://openverse-airflow-logs
 
 
 USER root
-RUN apt-get update && apt-get -yqq install \
-    build-essential \
-    libpq-dev \
-    libffi-dev \
+RUN apt-get update \
+    && apt-get -yqq install \
+      build-essential \
+      libpq-dev \
+      libffi-dev \
     && apt-get autoremove -y \
     && rm -rf /var/lib/apt/lists/*
 

diff --git a/docker/local_postgres/Dockerfile b/docker/local_postgres/Dockerfile
@@ -3,19 +3,18 @@ FROM postgres:13.6
 ARG PGCLI_VERSION=3.2.0
 
 # Container optimizations
-ARG DEBIAN_FRONTEND=noninteractive
-ENV PIPNOCACHEDIR=1
 ENV PYTHONUNBUFFERED=1
+ENV PIP_NO_CACHE_DIR=1
 ENV PIP_NO_COLOR=1
 
-RUN apt-get update && apt-get -yqq install \
-    python3-boto3 \
-    postgresql-plpython3-13 \
-    python3-pip \
-    libpq-dev \
+RUN apt-get update \
+    && apt-get -yqq install \
+      python3-boto3 \
+      postgresql-plpython3-13 \
+      python3-pip \
+      libpq-dev \
     && apt-get autoremove -y \
     && rm -rf /var/lib/apt/lists/* \
-    && pip3 install -U pip \
-    && pip3 install pgcli==${PGCLI_VERSION}
+    && pip3 install -U pip pgcli==${PGCLI_VERSION}
 
 COPY *.sql /docker-entrypoint-initdb.d/