diff --git a/images/ckan/2.7/Dockerfile b/images/ckan/2.7/Dockerfile index 3435bc3..3b042ad 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/pip/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/pip/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/pip/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 d22a37f..6d55f10 100644 --- a/images/ckan/2.7/Dockerfile.focal +++ b/images/ckan/2.7/Dockerfile.focal @@ -1,7 +1,7 @@ ################## ### Build CKAN ### ################## -FROM ubuntu:focal-20201106 as ckanbuild +FROM ubuntu:focal-20210217 as ckanbuild # Used by Github Actions to tag the image with ENV IMAGE_TAG=2.7.10-focal @@ -72,7 +72,7 @@ RUN mkdir -p ${SRC_DIR} # Install pip RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/pip/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 @@ -89,7 +89,7 @@ RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==20.6.2 greenlet==0.4.1 ########################### ### Default-Extensions #### ########################### -FROM ubuntu:focal-20201106 as extbuild +FROM ubuntu:focal-20210217 as extbuild # Set src dirs ENV SRC_DIR=/srv/app/src @@ -115,7 +115,7 @@ RUN mkdir -p ${SRC_DIR} # Install pip RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/pip/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 pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e ############ ### MAIN ### ############ -FROM ubuntu:focal-20201106 +FROM ubuntu:focal-20210217 LABEL maintainer="Keitaro Inc " LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan @@ -181,7 +181,7 @@ RUN apt-get update && \ # Install pip RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/pip/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 281995d..a7af7b4 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/pip/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/pip/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/pip/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 37e5baa..adc8b18 100644 --- a/images/ckan/2.8/Dockerfile.focal +++ b/images/ckan/2.8/Dockerfile.focal @@ -1,7 +1,7 @@ ################## ### Build CKAN ### ################## -FROM ubuntu:focal-20201106 as ckanbuild +FROM ubuntu:focal-20210217 as ckanbuild # Used by Github Actions to tag the image with ENV IMAGE_TAG=2.8.7-focal @@ -64,7 +64,7 @@ RUN mkdir -p ${SRC_DIR} # Install pip RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/pip/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 @@ -81,7 +81,7 @@ RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==20.6.2 greenlet==0.4.1 ########################### ### Default-Extensions #### ########################### -FROM ubuntu:focal-20201106 as extbuild +FROM ubuntu:focal-20210217 as extbuild # Set src dirs ENV SRC_DIR=/srv/app/src @@ -107,7 +107,7 @@ RUN mkdir -p ${SRC_DIR} # Install pip RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/pip/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 @@ -115,7 +115,7 @@ RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e ############ ### MAIN ### ############ -FROM ubuntu:focal-20201106 +FROM ubuntu:focal-20210217 LABEL maintainer="Keitaro Inc " LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan @@ -166,7 +166,7 @@ RUN apt-get update && \ # Install pip RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/pip/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.9/Dockerfile.focal b/images/ckan/2.9/Dockerfile.focal index 2521306..278cae9 100644 --- a/images/ckan/2.9/Dockerfile.focal +++ b/images/ckan/2.9/Dockerfile.focal @@ -1,7 +1,7 @@ ################## ### Build CKAN ### ################## -FROM ubuntu:focal-20201106 as ckanbuild +FROM ubuntu:focal-20210217 as ckanbuild # Used by Github Actions to tag the image with ENV IMAGE_TAG=2.9.2-focal @@ -87,7 +87,7 @@ RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==20.6.2 greenlet==0.4.1 ########################### ### Default-Extensions #### ########################### -FROM ubuntu:focal-20201106 as extbuild +FROM ubuntu:focal-20210217 as extbuild # Set src dirs ENV SRC_DIR=/srv/app/src @@ -124,7 +124,7 @@ RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e ############ ### MAIN ### ############ -FROM ubuntu:focal-20201106 +FROM ubuntu:focal-20210217 LABEL maintainer="Keitaro Inc " LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan