CatalogueRevamping
/
docker-ckan
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* reverts to alpine 3.13 and native python 3.8 package 

* downgrades setuptools to 44.1.0 to fix ckan install issues on Ubuntu
* fixes solrconfig xml for CKAN 2.7
This commit is contained in:
blagoja.stojkoski 2022-01-20 15:21:59 +01:00
parent bf3a029937
commit a9abd4b36b
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compose/solr/solrconfig-2.7.12.xml
View File

@ -1 +1 @@
solrconfig-2.8.9.xml solrconfig-2.8.10.xml

28
images/ckan/2.9/Dockerfile
View File

@ -1,7 +1,7 @@
################## ##################
### Build CKAN ### ### Build CKAN ###
################## ##################
FROM alpine:3.14.2 as ckanbuild FROM alpine:3.13.7 as ckanbuild
# Used by Github Actions to tag the image with # Used by Github Actions to tag the image with
ENV IMAGE_TAG=2.9.5 ENV IMAGE_TAG=2.9.5
@ -17,11 +17,9 @@ ENV PIP_SRC=${SRC_DIR}
WORKDIR ${SRC_DIR} WORKDIR ${SRC_DIR}
# Packages to build CKAN requirements and plugins # Packages to build CKAN requirements and plugins
# Make sure we install python 3.8, cause CKAN is not compatible with 3.9 RUN apk add --no-cache \
RUN apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/v3.13/main \ python3 \
python3=3.8.10-r0 \ python3-dev \
python3-dev=3.8.10-r0 && \
apk add --no-cache \
git \ git \
curl \ curl \
postgresql-dev \ postgresql-dev \
@ -68,7 +66,7 @@ RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==21.1.2 greenlet==1.1.0
########################### ###########################
### Default-Extensions #### ### Default-Extensions ####
########################### ###########################
FROM alpine:3.14.2 as extbuild FROM alpine:3.13.7 as extbuild
# Set src dirs # Set src dirs
ENV SRC_DIR=/srv/app/src ENV SRC_DIR=/srv/app/src
@ -81,11 +79,9 @@ ENV DEFAULT_EXTENSIONS envvars
ENV ENVVARS_GIT_URL=https://github.com/okfn/ckanext-envvars ENV ENVVARS_GIT_URL=https://github.com/okfn/ckanext-envvars
ENV ENVVARS_GIT_BRANCH=0.0.1 ENV ENVVARS_GIT_BRANCH=0.0.1
# Make sure we install python 3.8, cause CKAN is not compatible with 3.9 RUN apk add --no-cache \
RUN apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/v3.13/main \ python3 \
python3=3.8.10-r0 \ python3-dev \
python3-dev=3.8.10-r0 && \
apk add --no-cache \
git \ git \
curl curl
@ -105,7 +101,7 @@ RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e
############ ############
### MAIN ### ### MAIN ###
############ ############
FROM alpine:3.14.2 FROM alpine:3.13.7
LABEL maintainer="Keitaro Inc <info@keitaro.com>" LABEL maintainer="Keitaro Inc <info@keitaro.com>"
LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan
@ -119,10 +115,8 @@ ENV CKAN_SITE_URL=http://localhost:5000
ENV CKAN__PLUGINS envvars image_view text_view recline_view datastore datapusher ENV CKAN__PLUGINS envvars image_view text_view recline_view datastore datapusher
# Install necessary packages to run CKAN # Install necessary packages to run CKAN
# Make sure we install python 3.8, cause CKAN is not compatible with 3.9 RUN apk add --no-cache \
RUN apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/v3.13/main \ python3 \
python3=3.8.10-r0 && \
apk add --no-cache git \
bash \ bash \
gettext \ gettext \
curl \ curl \

6
images/ckan/2.9/Dockerfile.focal
View File

@ -118,6 +118,9 @@ RUN mkdir -p ${SRC_DIR}
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/get-pip.py && \
python ${SRC_DIR}/get-pip.py python ${SRC_DIR}/get-pip.py
# Downgrade setuptools so that CKAN requirements can be built
RUN pip install setuptools==44.1.0
# 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,6 +183,9 @@ RUN apt-get update && \
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/get-pip.py && \
python ${SRC_DIR}/get-pip.py python ${SRC_DIR}/get-pip.py
# Downgrade setuptools so that CKAN requirements can be built
RUN pip install setuptools==44.1.0
# Get artifacts from build stages # Get artifacts from build stages
COPY --from=ckanbuild /wheels /srv/app/wheels COPY --from=ckanbuild /wheels /srv/app/wheels
COPY --from=extbuild /wheels /srv/app/ext_wheels COPY --from=extbuild /wheels /srv/app/ext_wheels