The PIP version is not pinned to 19.0.2 any more (apache#10542)

Fixes apache#10516 (cherry picked from commit 018ae0e)
potiuk · Sep 14, 2020 · ee10510 · ee10510
1 parent 8590509
commit ee10510
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 22 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -42,7 +42,6 @@ ARG AIRFLOW_HOME=/opt/airflow
 ARG AIRFLOW_UID="50000"
 ARG AIRFLOW_GID="50000"
 
-ARG PIP_VERSION="20.2.3"
 ARG CASS_DRIVER_BUILD_CONCURRENCY="8"
 
 ARG PYTHON_BASE_IMAGE="python:3.6-slim-buster"
@@ -147,11 +146,6 @@ RUN KEY="A4A9406876FCBD3C456770C88C718D3B5072E1F5" \
     && apt-get autoremove -yqq --purge \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-ARG PIP_VERSION
-ENV PIP_VERSION=${PIP_VERSION}
-
-RUN pip install --upgrade pip==${PIP_VERSION}
-
 ARG AIRFLOW_REPO=apache/airflow
 ENV AIRFLOW_REPO=${AIRFLOW_REPO}
 
@@ -329,10 +323,6 @@ RUN KEY="A4A9406876FCBD3C456770C88C718D3B5072E1F5" \
     && apt-get autoremove -yqq --purge \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-ARG PIP_VERSION
-ENV PIP_VERSION=${PIP_VERSION}
-RUN pip install --upgrade pip==${PIP_VERSION}
-
 ENV AIRFLOW_UID=${AIRFLOW_UID}
 ENV AIRFLOW_GID=${AIRFLOW_GID}
 
@@ -393,4 +383,4 @@ LABEL org.apache.airflow.mainImage.buildId=${BUILD_ID}
 LABEL org.apache.airflow.mainImage.commitSha=${COMMIT_SHA}
 
 ENTRYPOINT ["/usr/bin/dumb-init", "--", "/entrypoint"]
-CMD ["airflow", "--help"]
+CMD ["--help"]
diff --git a/Dockerfile.ci b/Dockerfile.ci
@@ -76,6 +76,7 @@ RUN curl --fail --location https://deb.nodesource.com/setup_10.x | bash - \
            libsasl2-dev \
            libsasl2-modules \
            libssl-dev \
+           libenchant-dev \
            locales  \
            netcat \
            nodejs \
@@ -165,13 +166,6 @@ ARG PIP_NO_CACHE_DIR="true"
 ENV PIP_NO_CACHE_DIR=${PIP_NO_CACHE_DIR}
 RUN echo "Pip no cache dir: ${PIP_NO_CACHE_DIR}"
 
-# PIP version used to install dependencies
-ARG PIP_VERSION="20.2.3"
-ENV PIP_VERSION=${PIP_VERSION}
-RUN echo "Pip version: ${PIP_VERSION}"
-
-RUN pip install --upgrade pip==${PIP_VERSION}
-
 ARG HOME=/root
 ENV HOME=${HOME}
 

diff --git a/IMAGES.rst b/IMAGES.rst
@@ -276,8 +276,6 @@ The following build arguments (``--build-arg`` in docker build command) can be u
 | ``PIP_NO_CACHE_DIR``                     | ``true``                                 | if true, then no pip cache will be       |
 |                                          |                                          | stored                                   |
 +------------------------------------------+------------------------------------------+------------------------------------------+
-| ``PIP_VERSION``                          | ``19.0.2``                               | version of PIP to use                    |
-+------------------------------------------+------------------------------------------+------------------------------------------+
 | ``HOME``                                 | ``/root``                                | Home directory of the root user (CI      |
 |                                          |                                          | image has root user as default)          |
 +------------------------------------------+------------------------------------------+------------------------------------------+
@@ -420,8 +418,6 @@ The following build arguments (``--build-arg`` in docker build command) can be u
 +------------------------------------------+------------------------------------------+------------------------------------------+
 | ``AIRFLOW_USER_HOME_DIR``                | ``/home/airflow``                        | Home directory of the Airflow user       |
 +------------------------------------------+------------------------------------------+------------------------------------------+
-| ``PIP_VERSION``                          | ``19.0.2``                               | version of PIP to use                    |
-+------------------------------------------+------------------------------------------+------------------------------------------+
 | ``CASS_DRIVER_BUILD_CONCURRENCY``        | ``8``                                    | Number of processors to use for          |
 |                                          |                                          | cassandra PIP install (speeds up         |
 |                                          |                                          | installing in case cassandra extra is    |