Skip to content

Commit

Permalink
Update / Override PIP version in Env Vars (#263)
Browse files Browse the repository at this point in the history 
Looks like latest version of Python slim buster image adds an env variable for PIP version which is causing few issues and incompatibilities.

Example: https://hub.docker.com/layers/python/library/python/3.7-slim/images/sha256-ae56b562bf6fd5568945e4d6852c410fe43cce8edfdc79f04611da8f26c6a642?context=explore

contains: ` ENV PYTHON_PIP_VERSION=21.1.2` while we install 19.3.1
  • Loading branch information
@kaxil
kaxil committed May 26, 2021
1 parent 3ac70d7 commit ab60218
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 10 deletions.
4 changes: 3 additions & 1 deletion 1.10.10/buster/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ ARG PYTHON_BASE_IMAGE
ENV PYTHON_BASE_IMAGE=${PYTHON_BASE_IMAGE}
ARG PYTHON_MAJOR_MINOR_VERSION
ENV PYTHON_MAJOR_MINOR_VERSION=${PYTHON_MAJOR_MINOR_VERSION}
ARG PIP_VERSION="19.3.1"
ENV PYTHON_PIP_VERSION=${PIP_VERSION}

# Make sure noninteractie debian install is used and language variables set
ENV DEBIAN_FRONTEND=noninteractive LANGUAGE=C.UTF-8 LANG=C.UTF-8 LC_ALL=C.UTF-8 \
Expand Down Expand Up @@ -78,7 +80,7 @@ RUN apt-get update \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

RUN pip install --upgrade pip==19.3.1
RUN pip install --upgrade pip=="${PYTHON_PIP_VERSION}"

RUN useradd --uid $ASTRONOMER_UID --create-home ${ASTRONOMER_USER} \
&& groupadd astrogroup --gid 101 \
Expand Down
4 changes: 3 additions & 1 deletion 1.10.12/buster/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ ARG PYTHON_BASE_IMAGE
ENV PYTHON_BASE_IMAGE=${PYTHON_BASE_IMAGE}
ARG PYTHON_MAJOR_MINOR_VERSION
ENV PYTHON_MAJOR_MINOR_VERSION=${PYTHON_MAJOR_MINOR_VERSION}
ARG PIP_VERSION="19.3.1"
ENV PYTHON_PIP_VERSION=${PIP_VERSION}

# Make sure noninteractie debian install is used and language variables set
ENV DEBIAN_FRONTEND=noninteractive LANGUAGE=C.UTF-8 LANG=C.UTF-8 LC_ALL=C.UTF-8 \
Expand Down Expand Up @@ -78,7 +80,7 @@ RUN apt-get update \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

RUN pip install --upgrade pip==19.3.1
RUN pip install --upgrade pip=="${PYTHON_PIP_VERSION}"

RUN useradd --uid $ASTRONOMER_UID --create-home ${ASTRONOMER_USER} \
&& groupadd astrogroup --gid 101 \
Expand Down
4 changes: 3 additions & 1 deletion 1.10.14/buster/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ ARG PYTHON_BASE_IMAGE
ENV PYTHON_BASE_IMAGE=${PYTHON_BASE_IMAGE}
ARG PYTHON_MAJOR_MINOR_VERSION
ENV PYTHON_MAJOR_MINOR_VERSION=${PYTHON_MAJOR_MINOR_VERSION}
ARG PIP_VERSION="19.3.1"
ENV PYTHON_PIP_VERSION=${PIP_VERSION}

# Make sure noninteractie debian install is used and language variables set
ENV DEBIAN_FRONTEND=noninteractive LANGUAGE=C.UTF-8 LANG=C.UTF-8 LC_ALL=C.UTF-8 \
Expand Down Expand Up @@ -78,7 +80,7 @@ RUN apt-get update \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

RUN pip install --upgrade pip==19.3.1
RUN pip install --upgrade pip=="${PYTHON_PIP_VERSION}"

RUN useradd --uid $ASTRONOMER_UID --create-home ${ASTRONOMER_USER} \
&& groupadd astrogroup --gid 101 \
Expand Down
4 changes: 3 additions & 1 deletion 1.10.15/buster/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ ARG PYTHON_BASE_IMAGE
ENV PYTHON_BASE_IMAGE=${PYTHON_BASE_IMAGE}
ARG PYTHON_MAJOR_MINOR_VERSION
ENV PYTHON_MAJOR_MINOR_VERSION=${PYTHON_MAJOR_MINOR_VERSION}
ARG PIP_VERSION="19.3.1"
ENV PYTHON_PIP_VERSION=${PIP_VERSION}

# Make sure noninteractie debian install is used and language variables set
ENV DEBIAN_FRONTEND=noninteractive LANGUAGE=C.UTF-8 LANG=C.UTF-8 LC_ALL=C.UTF-8 \
Expand Down Expand Up @@ -78,7 +80,7 @@ RUN apt-get update \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

RUN pip install --upgrade pip==19.3.1
RUN pip install --upgrade pip=="${PYTHON_PIP_VERSION}"

RUN useradd --uid $ASTRONOMER_UID --create-home ${ASTRONOMER_USER} \
&& groupadd astrogroup --gid 101 \
Expand Down
6 changes: 3 additions & 3 deletions 1.10.7/buster/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ LABEL io.astronomer.docker.uid="${ASTRONOMER_UID}"
ARG ORG="astronomer"


ENV AIRFLOW_REPOSITORY="https://github.com/${ORG}/airflow"
ENV AIRFLOW_HOME="/usr/local/airflow"
ENV PYTHONPATH=${PYTHONPATH:+${PYTHONPATH}:}${AIRFLOW_HOME}

Expand All @@ -46,6 +45,8 @@ ARG PYTHON_BASE_IMAGE
ENV PYTHON_BASE_IMAGE=${PYTHON_BASE_IMAGE}
ARG PYTHON_MAJOR_MINOR_VERSION
ENV PYTHON_MAJOR_MINOR_VERSION=${PYTHON_MAJOR_MINOR_VERSION}
ARG PIP_VERSION="19.3.1"
ENV PYTHON_PIP_VERSION=${PIP_VERSION}

# Make sure noninteractie debian install is used and language variables set
ENV DEBIAN_FRONTEND=noninteractive LANGUAGE=C.UTF-8 LANG=C.UTF-8 LC_ALL=C.UTF-8 \
Expand All @@ -69,7 +70,6 @@ RUN apt-get update \
libsasl2-2 \
libsasl2-modules \
libssl1.1 \
libcurl4 \
locales \
netcat \
rsync \
Expand All @@ -80,7 +80,7 @@ RUN apt-get update \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

RUN pip install --upgrade pip==19.3.1
RUN pip install --upgrade pip=="${PYTHON_PIP_VERSION}"

RUN useradd --uid $ASTRONOMER_UID --create-home ${ASTRONOMER_USER} \
&& groupadd astrogroup --gid 101 \
Expand Down
4 changes: 3 additions & 1 deletion 2.0.0/buster/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ ARG PYTHON_BASE_IMAGE
ENV PYTHON_BASE_IMAGE=${PYTHON_BASE_IMAGE}
ARG PYTHON_MAJOR_MINOR_VERSION
ENV PYTHON_MAJOR_MINOR_VERSION=${PYTHON_MAJOR_MINOR_VERSION}
ARG PIP_VERSION="19.3.1"
ENV PYTHON_PIP_VERSION=${PIP_VERSION}

# Make sure noninteractie debian install is used and language variables set
ENV DEBIAN_FRONTEND=noninteractive LANGUAGE=C.UTF-8 LANG=C.UTF-8 LC_ALL=C.UTF-8 \
Expand Down Expand Up @@ -78,7 +80,7 @@ RUN apt-get update \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

RUN pip install --upgrade pip==19.3.1
RUN pip install --upgrade pip=="${PYTHON_PIP_VERSION}"

RUN useradd --uid $ASTRONOMER_UID --create-home ${ASTRONOMER_USER} \
&& groupadd astrogroup --gid 101 \
Expand Down
4 changes: 3 additions & 1 deletion 2.0.2/buster/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ ARG PYTHON_BASE_IMAGE
ENV PYTHON_BASE_IMAGE=${PYTHON_BASE_IMAGE}
ARG PYTHON_MAJOR_MINOR_VERSION
ENV PYTHON_MAJOR_MINOR_VERSION=${PYTHON_MAJOR_MINOR_VERSION}
ARG PIP_VERSION="19.3.1"
ENV PYTHON_PIP_VERSION=${PIP_VERSION}

# Make sure noninteractie debian install is used and language variables set
ENV DEBIAN_FRONTEND=noninteractive LANGUAGE=C.UTF-8 LANG=C.UTF-8 LC_ALL=C.UTF-8 \
Expand Down Expand Up @@ -78,7 +80,7 @@ RUN apt-get update \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

RUN pip install --upgrade pip==19.3.1
RUN pip install --upgrade pip=="${PYTHON_PIP_VERSION}"

RUN useradd --uid $ASTRONOMER_UID --create-home ${ASTRONOMER_USER} \
&& groupadd astrogroup --gid 101 \
Expand Down
4 changes: 3 additions & 1 deletion 2.1.0/buster/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ ARG PYTHON_BASE_IMAGE
ENV PYTHON_BASE_IMAGE=${PYTHON_BASE_IMAGE}
ARG PYTHON_MAJOR_MINOR_VERSION
ENV PYTHON_MAJOR_MINOR_VERSION=${PYTHON_MAJOR_MINOR_VERSION}
ARG PIP_VERSION="19.3.1"
ENV PYTHON_PIP_VERSION=${PIP_VERSION}

# Make sure noninteractie debian install is used and language variables set
ENV DEBIAN_FRONTEND=noninteractive LANGUAGE=C.UTF-8 LANG=C.UTF-8 LC_ALL=C.UTF-8 \
Expand Down Expand Up @@ -78,7 +80,7 @@ RUN apt-get update \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

RUN pip install --upgrade pip==19.3.1
RUN pip install --upgrade pip=="${PYTHON_PIP_VERSION}"

RUN useradd --uid $ASTRONOMER_UID --create-home ${ASTRONOMER_USER} \
&& groupadd astrogroup --gid 101 \
Expand Down

0 comments on commit ab60218

Please sign in to comment.