From ec778aba876c17925de78822c8d8081c0a86d2df Mon Sep 17 00:00:00 2001 From: Marko Bocevski Date: Mon, 25 Jan 2021 14:22:34 +0100 Subject: [PATCH] Pin pip to 20.3.3 due to issue with 20.3.4 --- 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 afe4e45..fd61b9d 100644 --- a/images/ckan/2.7/Dockerfile +++ b/images/ckan/2.7/Dockerfile @@ -47,7 +47,7 @@ RUN mkdir -p ${SRC_DIR} # Install pip RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ - python ${SRC_DIR}/get-pip.py + python ${SRC_DIR}/get-pip.py 'pip==20.3.3' # Fetch and build CKAN and requirements RUN pip install -e git+${GIT_URL}@${GIT_BRANCH}#egg=ckan @@ -88,7 +88,7 @@ RUN mkdir -p ${SRC_DIR} # Install pip RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ - python ${SRC_DIR}/get-pip.py + python ${SRC_DIR}/get-pip.py 'pip==20.3.3' # Fetch and build the default CKAN extensions RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#egg=ckanext-envvars @@ -130,7 +130,7 @@ RUN apk add --no-cache \ # Install pip RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ - python ${SRC_DIR}/get-pip.py + python ${SRC_DIR}/get-pip.py 'pip==20.3.3' # Get artifacts from build stages COPY --from=ckanbuild /wheels /srv/app/wheels diff --git a/images/ckan/2.7/Dockerfile.focal b/images/ckan/2.7/Dockerfile.focal index 70675dc..af263ae 100644 --- a/images/ckan/2.7/Dockerfile.focal +++ b/images/ckan/2.7/Dockerfile.focal @@ -72,7 +72,7 @@ RUN mkdir -p ${SRC_DIR} # Install pip RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ - python ${SRC_DIR}/get-pip.py + python ${SRC_DIR}/get-pip.py 'pip==20.3.3' # Fetch and build CKAN and requirements RUN pip install -e git+${GIT_URL}@${GIT_BRANCH}#egg=ckan @@ -115,7 +115,7 @@ RUN mkdir -p ${SRC_DIR} # Install pip RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ - python ${SRC_DIR}/get-pip.py + python ${SRC_DIR}/get-pip.py 'pip==20.3.3' # Fetch and build the default CKAN extensions RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#egg=ckanext-envvars @@ -181,7 +181,7 @@ RUN apt-get update && \ # Install pip RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ - python ${SRC_DIR}/get-pip.py + python ${SRC_DIR}/get-pip.py 'pip==20.3.3' # Get artifacts from build stages COPY --from=ckanbuild /wheels /srv/app/wheels diff --git a/images/ckan/2.8/Dockerfile b/images/ckan/2.8/Dockerfile index a79ed5e..ae5dc10 100644 --- a/images/ckan/2.8/Dockerfile +++ b/images/ckan/2.8/Dockerfile @@ -43,7 +43,7 @@ RUN mkdir -p ${SRC_DIR} # Install pip RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ - python ${SRC_DIR}/get-pip.py + python ${SRC_DIR}/get-pip.py 'pip==20.3.3' # Fetch and build CKAN and requirements RUN pip install -e git+${GIT_URL}@${GIT_BRANCH}#egg=ckan @@ -84,7 +84,7 @@ RUN mkdir -p ${SRC_DIR} # Install pip RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ - python ${SRC_DIR}/get-pip.py + python ${SRC_DIR}/get-pip.py 'pip==20.3.3' # Fetch and build the default CKAN extensions RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#egg=ckanext-envvars @@ -123,7 +123,7 @@ RUN apk add --no-cache git \ # Install pip RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ - python ${SRC_DIR}/get-pip.py + python ${SRC_DIR}/get-pip.py 'pip==20.3.3' # Get artifacts from build stages COPY --from=ckanbuild /wheels /srv/app/wheels diff --git a/images/ckan/2.8/Dockerfile.focal b/images/ckan/2.8/Dockerfile.focal index 9c98e03..27f1ded 100644 --- a/images/ckan/2.8/Dockerfile.focal +++ b/images/ckan/2.8/Dockerfile.focal @@ -64,7 +64,7 @@ RUN mkdir -p ${SRC_DIR} # Install pip RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ - python ${SRC_DIR}/get-pip.py + python ${SRC_DIR}/get-pip.py 'pip==20.3.3' # Fetch and build CKAN and requirements RUN pip install -e git+${GIT_URL}@${GIT_BRANCH}#egg=ckan @@ -107,7 +107,7 @@ RUN mkdir -p ${SRC_DIR} # Install pip RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ - python ${SRC_DIR}/get-pip.py + python ${SRC_DIR}/get-pip.py 'pip==20.3.3' # Fetch and build the default CKAN extensions RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#egg=ckanext-envvars @@ -166,7 +166,7 @@ RUN apt-get update && \ # Install pip RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ - python ${SRC_DIR}/get-pip.py + python ${SRC_DIR}/get-pip.py 'pip==20.3.3' # Get artifacts from build stages COPY --from=ckanbuild /wheels /srv/app/wheels