Fix pip url for python 2.7

This commit is contained in:
Marko Bocevski 2021-03-24 17:40:15 +01:00
parent af4a5353a4
commit 5b2c0b95a6
No known key found for this signature in database
GPG Key ID: C5B52A3811855AB3
5 changed files with 26 additions and 26 deletions

View File

@ -1,7 +1,7 @@
################### ###################
### Extensions #### ### Extensions ####
################### ###################
FROM ghcr.io/keitaroinc/ckan:2.9.1 as extbuild FROM ghcr.io/keitaroinc/ckan:2.9.2 as extbuild
# Locations and tags, please use specific tags or revisions # Locations and tags, please use specific tags or revisions
ENV HARVEST_GIT_URL=https://github.com/ckan/ckanext-harvest ENV HARVEST_GIT_URL=https://github.com/ckan/ckanext-harvest
@ -28,7 +28,7 @@ USER ckan
############ ############
### MAIN ### ### MAIN ###
############ ############
FROM ghcr.io/keitaroinc/ckan:2.9.1 FROM ghcr.io/keitaroinc/ckan:2.9.2
LABEL maintainer="Keitaro Inc <info@keitaro.com>" LABEL maintainer="Keitaro Inc <info@keitaro.com>"

View File

@ -46,8 +46,8 @@ RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.6/ma
RUN mkdir -p ${SRC_DIR} RUN mkdir -p ${SRC_DIR}
# Install pip # Install pip
RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py && \
python ${SRC_DIR}/get-pip.py 'pip==20.3.3' python ${SRC_DIR}/get-pip.py
# Fetch and build CKAN and requirements # Fetch and build CKAN and requirements
RUN pip install -e git+${GIT_URL}@${GIT_BRANCH}#egg=ckan RUN pip install -e git+${GIT_URL}@${GIT_BRANCH}#egg=ckan
@ -87,8 +87,8 @@ RUN apk add --no-cache \
RUN mkdir -p ${SRC_DIR} RUN mkdir -p ${SRC_DIR}
# Install pip # Install pip
RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py && \
python ${SRC_DIR}/get-pip.py 'pip==20.3.3' python ${SRC_DIR}/get-pip.py
# Fetch and build the default CKAN extensions # Fetch and build the default CKAN extensions
RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#egg=ckanext-envvars RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#egg=ckanext-envvars
@ -129,8 +129,8 @@ RUN apk add --no-cache \
mkdir -p ${SRC_DIR} mkdir -p ${SRC_DIR}
# Install pip # Install pip
RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py && \
python ${SRC_DIR}/get-pip.py 'pip==20.3.3' python ${SRC_DIR}/get-pip.py
# Get artifacts from build stages # Get artifacts from build stages
COPY --from=ckanbuild /wheels /srv/app/wheels COPY --from=ckanbuild /wheels /srv/app/wheels

View File

@ -71,8 +71,8 @@ RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /
RUN mkdir -p ${SRC_DIR} RUN mkdir -p ${SRC_DIR}
# Install pip # Install pip
RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py && \
python ${SRC_DIR}/get-pip.py 'pip==20.3.3' python ${SRC_DIR}/get-pip.py
# Fetch and build CKAN and requirements # Fetch and build CKAN and requirements
RUN pip install -e git+${GIT_URL}@${GIT_BRANCH}#egg=ckan RUN pip install -e git+${GIT_URL}@${GIT_BRANCH}#egg=ckan
@ -114,8 +114,8 @@ RUN apt-get update && \
RUN mkdir -p ${SRC_DIR} RUN mkdir -p ${SRC_DIR}
# Install pip # Install pip
RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py && \
python ${SRC_DIR}/get-pip.py 'pip==20.3.3' python ${SRC_DIR}/get-pip.py
# Fetch and build the default CKAN extensions # Fetch and build the default CKAN extensions
RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#egg=ckanext-envvars RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#egg=ckanext-envvars
@ -180,8 +180,8 @@ RUN apt-get update && \
mkdir -p ${SRC_DIR} mkdir -p ${SRC_DIR}
# Install pip # Install pip
RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py && \
python ${SRC_DIR}/get-pip.py 'pip==20.3.3' python ${SRC_DIR}/get-pip.py
# Get artifacts from build stages # Get artifacts from build stages
COPY --from=ckanbuild /wheels /srv/app/wheels COPY --from=ckanbuild /wheels /srv/app/wheels

View File

@ -42,8 +42,8 @@ RUN apk add --no-cache \
RUN mkdir -p ${SRC_DIR} RUN mkdir -p ${SRC_DIR}
# Install pip # Install pip
RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py && \
python ${SRC_DIR}/get-pip.py 'pip==20.3.3' python ${SRC_DIR}/get-pip.py
# Fetch and build CKAN and requirements # Fetch and build CKAN and requirements
RUN pip install -e git+${GIT_URL}@${GIT_BRANCH}#egg=ckan RUN pip install -e git+${GIT_URL}@${GIT_BRANCH}#egg=ckan
@ -83,8 +83,8 @@ RUN apk add --no-cache \
RUN mkdir -p ${SRC_DIR} RUN mkdir -p ${SRC_DIR}
# Install pip # Install pip
RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py && \
python ${SRC_DIR}/get-pip.py 'pip==20.3.3' python ${SRC_DIR}/get-pip.py
# Fetch and build the default CKAN extensions # Fetch and build the default CKAN extensions
RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#egg=ckanext-envvars RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#egg=ckanext-envvars
@ -122,8 +122,8 @@ RUN apk add --no-cache git \
mkdir -p ${SRC_DIR} mkdir -p ${SRC_DIR}
# Install pip # Install pip
RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py && \
python ${SRC_DIR}/get-pip.py 'pip==20.3.3' python ${SRC_DIR}/get-pip.py
# Get artifacts from build stages # Get artifacts from build stages
COPY --from=ckanbuild /wheels /srv/app/wheels COPY --from=ckanbuild /wheels /srv/app/wheels

View File

@ -63,8 +63,8 @@ RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /
RUN mkdir -p ${SRC_DIR} RUN mkdir -p ${SRC_DIR}
# Install pip # Install pip
RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py && \
python ${SRC_DIR}/get-pip.py 'pip==20.3.3' python ${SRC_DIR}/get-pip.py
# Fetch and build CKAN and requirements # Fetch and build CKAN and requirements
RUN pip install -e git+${GIT_URL}@${GIT_BRANCH}#egg=ckan RUN pip install -e git+${GIT_URL}@${GIT_BRANCH}#egg=ckan
@ -106,8 +106,8 @@ RUN apt-get update && \
RUN mkdir -p ${SRC_DIR} RUN mkdir -p ${SRC_DIR}
# Install pip # Install pip
RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py && \
python ${SRC_DIR}/get-pip.py 'pip==20.3.3' python ${SRC_DIR}/get-pip.py
# Fetch and build the default CKAN extensions # Fetch and build the default CKAN extensions
RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#egg=ckanext-envvars RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#egg=ckanext-envvars
@ -165,8 +165,8 @@ RUN apt-get update && \
mkdir -p ${SRC_DIR} mkdir -p ${SRC_DIR}
# Install pip # Install pip
RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \ RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py && \
python ${SRC_DIR}/get-pip.py 'pip==20.3.3' python ${SRC_DIR}/get-pip.py
# Get artifacts from build stages # Get artifacts from build stages
COPY --from=ckanbuild /wheels /srv/app/wheels COPY --from=ckanbuild /wheels /srv/app/wheels