Skip to content
This repository has been archived by the owner on Aug 4, 2023. It is now read-only.

Update Dockerfiles with small improvements #1016

Merged
merged 1 commit into from
Feb 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions docker/airflow/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
dhruvkb marked this conversation as resolved.
Show resolved Hide resolved
ENV PIP_NO_COLOR=1

# Airflow/workflow configuration
Expand All @@ -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/*

Expand Down
17 changes: 8 additions & 9 deletions docker/local_postgres/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
dhruvkb marked this conversation as resolved.
Show resolved Hide resolved
&& pip3 install pgcli==${PGCLI_VERSION}
&& pip3 install -U pip pgcli==${PGCLI_VERSION}

COPY *.sql /docker-entrypoint-initdb.d/