diff --git a/images/ckan/2.9/Dockerfile b/images/ckan/2.9/Dockerfile index 41e0433..142ba85 100644 --- a/images/ckan/2.9/Dockerfile +++ b/images/ckan/2.9/Dockerfile @@ -1,7 +1,7 @@ ################## ### Build CKAN ### ################## -FROM alpine:3.18.2 as ckanbuild +FROM alpine:3.16 as ckanbuild # Used by Github Actions to tag the image with ENV IMAGE_TAG=2.9.9 @@ -59,14 +59,18 @@ COPY ./scripts/apply_ckan_patches.sh ${SRC_DIR}/apply_ckan_patches.sh # Apply patches RUN ${SRC_DIR}/apply_ckan_patches.sh RUN rm -rf /srv/app/src/ckan/.git + +#### PATCH SINCE CYTON UPDATED TO 3.0.0 ### +RUN sed -i 's/pyyaml==5.4.1/pyyaml>=6.0.1/g' ckan/requirements.txt + +# RUN pip-compile ckan/requirements.in RUN pip wheel --wheel-dir=/wheels -r ckan/requirements.txt RUN pip wheel --wheel-dir=/wheels uWSGI==2.0.20 gevent==21.12.0 greenlet==1.1.3 - ########################### ### Default-Extensions #### ########################### -FROM alpine:3.18.2 as extbuild +FROM alpine:3.16 as extbuild # Set src dirs ENV SRC_DIR=/srv/app/src @@ -101,7 +105,7 @@ RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e ############ ### MAIN ### ############ -FROM alpine:3.18.2 +FROM alpine:3.16 LABEL maintainer="Keitaro Inc " LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan