From 2f9500cda7845b129c985089cce0dd979c496be2 Mon Sep 17 00:00:00 2001 From: Marko Bocevski Date: Mon, 25 Jan 2021 14:10:23 +0100 Subject: [PATCH] Pin the version of pip since pip dropped python2 support in 21.0 --- images/ckan/2.7/Dockerfile | 6 +++--- images/ckan/2.7/Dockerfile.focal | 6 +++--- images/ckan/2.8/Dockerfile | 6 +++--- images/ckan/2.8/Dockerfile.focal | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/images/ckan/2.7/Dockerfile b/images/ckan/2.7/Dockerfile index 3f04b83..afe4e45 100644 --- a/images/ckan/2.7/Dockerfile +++ b/images/ckan/2.7/Dockerfile @@ -46,7 +46,7 @@ RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.6/ma RUN mkdir -p ${SRC_DIR} # Install pip -RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/get-pip.py && \ +RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ python ${SRC_DIR}/get-pip.py # Fetch and build CKAN and requirements @@ -87,7 +87,7 @@ RUN apk add --no-cache \ RUN mkdir -p ${SRC_DIR} # Install pip -RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/get-pip.py && \ +RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ python ${SRC_DIR}/get-pip.py # Fetch and build the default CKAN extensions @@ -129,7 +129,7 @@ RUN apk add --no-cache \ mkdir -p ${SRC_DIR} # Install pip -RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/get-pip.py && \ +RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ python ${SRC_DIR}/get-pip.py # Get artifacts from build stages diff --git a/images/ckan/2.7/Dockerfile.focal b/images/ckan/2.7/Dockerfile.focal index b7c9cc7..70675dc 100644 --- a/images/ckan/2.7/Dockerfile.focal +++ b/images/ckan/2.7/Dockerfile.focal @@ -71,7 +71,7 @@ RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave / RUN mkdir -p ${SRC_DIR} # Install pip -RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/get-pip.py && \ +RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ python ${SRC_DIR}/get-pip.py # Fetch and build CKAN and requirements @@ -114,7 +114,7 @@ RUN apt-get update && \ RUN mkdir -p ${SRC_DIR} # Install pip -RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/get-pip.py && \ +RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ python ${SRC_DIR}/get-pip.py # Fetch and build the default CKAN extensions @@ -180,7 +180,7 @@ RUN apt-get update && \ mkdir -p ${SRC_DIR} # Install pip -RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/get-pip.py && \ +RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ python ${SRC_DIR}/get-pip.py # Get artifacts from build stages diff --git a/images/ckan/2.8/Dockerfile b/images/ckan/2.8/Dockerfile index 7380077..a79ed5e 100644 --- a/images/ckan/2.8/Dockerfile +++ b/images/ckan/2.8/Dockerfile @@ -42,7 +42,7 @@ RUN apk add --no-cache \ RUN mkdir -p ${SRC_DIR} # Install pip -RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/get-pip.py && \ +RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ python ${SRC_DIR}/get-pip.py # Fetch and build CKAN and requirements @@ -83,7 +83,7 @@ RUN apk add --no-cache \ RUN mkdir -p ${SRC_DIR} # Install pip -RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/get-pip.py && \ +RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ python ${SRC_DIR}/get-pip.py # Fetch and build the default CKAN extensions @@ -122,7 +122,7 @@ RUN apk add --no-cache git \ mkdir -p ${SRC_DIR} # Install pip -RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/get-pip.py && \ +RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ python ${SRC_DIR}/get-pip.py # Get artifacts from build stages diff --git a/images/ckan/2.8/Dockerfile.focal b/images/ckan/2.8/Dockerfile.focal index ffcf422..9c98e03 100644 --- a/images/ckan/2.8/Dockerfile.focal +++ b/images/ckan/2.8/Dockerfile.focal @@ -63,7 +63,7 @@ RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave / RUN mkdir -p ${SRC_DIR} # Install pip -RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/get-pip.py && \ +RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ python ${SRC_DIR}/get-pip.py # Fetch and build CKAN and requirements @@ -106,7 +106,7 @@ RUN apt-get update && \ RUN mkdir -p ${SRC_DIR} # Install pip -RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/get-pip.py && \ +RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ python ${SRC_DIR}/get-pip.py # Fetch and build the default CKAN extensions @@ -165,7 +165,7 @@ RUN apt-get update && \ mkdir -p ${SRC_DIR} # Install pip -RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/get-pip.py && \ +RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ python ${SRC_DIR}/get-pip.py # Get artifacts from build stages