Merge pull request #46 from keitaroinc/fix-pip
Fix pip url for python 2.7
This commit is contained in:
commit
64d4d5f1fb
|
@ -1,7 +1,7 @@
|
|||
###################
|
||||
### 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
|
||||
ENV HARVEST_GIT_URL=https://github.com/ckan/ckanext-harvest
|
||||
|
@ -30,7 +30,7 @@ USER ckan
|
|||
############
|
||||
### MAIN ###
|
||||
############
|
||||
FROM ghcr.io/keitaroinc/ckan:2.9.1
|
||||
FROM ghcr.io/keitaroinc/ckan:2.9.2
|
||||
|
||||
LABEL maintainer="Keitaro Inc <info@keitaro.com>"
|
||||
|
||||
|
|
|
@ -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/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'
|
||||
|
||||
# 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/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'
|
||||
|
||||
# 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/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'
|
||||
|
||||
# Get artifacts from build stages
|
||||
|
|
|
@ -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
|
||||
|
@ -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/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'
|
||||
|
||||
# Fetch and build CKAN and requirements
|
||||
|
@ -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
|
||||
|
@ -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/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'
|
||||
|
||||
# Fetch and build the default CKAN extensions
|
||||
|
@ -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 <info@keitaro.com>"
|
||||
LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan
|
||||
|
@ -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/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'
|
||||
|
||||
# Get artifacts from build stages
|
||||
|
|
|
@ -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/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'
|
||||
|
||||
# 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/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'
|
||||
|
||||
# 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/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'
|
||||
|
||||
# Get artifacts from build stages
|
||||
|
|
|
@ -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
|
||||
|
@ -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/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'
|
||||
|
||||
# Fetch and build CKAN and requirements
|
||||
|
@ -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
|
||||
|
@ -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/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'
|
||||
|
||||
# Fetch and build the default CKAN extensions
|
||||
|
@ -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 <info@keitaro.com>"
|
||||
LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan
|
||||
|
@ -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/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'
|
||||
|
||||
# Get artifacts from build stages
|
||||
|
|
|
@ -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 <info@keitaro.com>"
|
||||
LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan
|
||||
|
|
Loading…
Reference in New Issue