From 165419d767de4a8fe7703e84f03776e5f0701f8f Mon Sep 17 00:00:00 2001 From: Marko Bocevski Date: Wed, 19 May 2021 13:31:52 +0200 Subject: [PATCH] Update greenlet and gevent versions, pin alpine version to specific minor revision --- images/ckan/2.7/Dockerfile | 10 +++++----- images/ckan/2.7/Dockerfile.focal | 4 ++-- images/ckan/2.8/Dockerfile | 10 +++++----- images/ckan/2.8/Dockerfile.focal | 4 ++-- images/ckan/2.9/Dockerfile | 10 +++++----- images/ckan/2.9/Dockerfile.focal | 4 ++-- images/datapusher/Dockerfile | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/images/ckan/2.7/Dockerfile b/images/ckan/2.7/Dockerfile index df2808b..5a39a7d 100644 --- a/images/ckan/2.7/Dockerfile +++ b/images/ckan/2.7/Dockerfile @@ -1,7 +1,7 @@ ################## ### Build CKAN ### ################## -FROM alpine:3.13 as ckanbuild +FROM alpine:3.13.5 as ckanbuild # Used by Github Actions to tag the image with ENV IMAGE_TAG=2.7.11 @@ -58,13 +58,13 @@ COPY ./scripts/apply_ckan_patches.sh ${SRC_DIR}/apply_ckan_patches.sh RUN ${SRC_DIR}/apply_ckan_patches.sh RUN rm -rf /srv/app/src/ckan/.git RUN pip wheel --wheel-dir=/wheels -r ckan/requirements.txt -RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==20.6.2 greenlet==0.4.16 +RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==21.1.2 greenlet==1.1.0 ########################### ### Default-Extensions #### ########################### -FROM alpine:3.13 as extbuild +FROM alpine:3.13.5 as extbuild # Set src dirs ENV SRC_DIR=/srv/app/src @@ -96,7 +96,7 @@ RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e ############ ### MAIN ### ############ -FROM alpine:3.13 +FROM alpine:3.13.5 LABEL maintainer="Keitaro Inc " LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan @@ -138,7 +138,7 @@ COPY --from=extbuild /wheels /srv/app/ext_wheels COPY --from=ckanbuild /srv/app/src/ckan ${CKAN_DIR} # Additional install steps for build stages artifacts -RUN pip install --no-index --find-links=/srv/app/wheels uwsgi==2.0.19.1 gevent==20.6.2 +RUN pip install --no-index --find-links=/srv/app/wheels uwsgi==2.0.19.1 gevent==21.1.2 # Create a local user and group to run the app RUN addgroup -g 92 -S ckan && \ diff --git a/images/ckan/2.7/Dockerfile.focal b/images/ckan/2.7/Dockerfile.focal index 4d64afb..a5fa0a1 100644 --- a/images/ckan/2.7/Dockerfile.focal +++ b/images/ckan/2.7/Dockerfile.focal @@ -83,7 +83,7 @@ COPY ./scripts/apply_ckan_patches.sh ${SRC_DIR}/apply_ckan_patches.sh RUN ${SRC_DIR}/apply_ckan_patches.sh RUN rm -rf /srv/app/src/ckan/.git RUN pip wheel --wheel-dir=/wheels -r ckan/requirements.txt -RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==20.6.2 greenlet==0.4.16 +RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==21.1.2 greenlet==1.1.0 ########################### @@ -189,7 +189,7 @@ COPY --from=extbuild /wheels /srv/app/ext_wheels COPY --from=ckanbuild /srv/app/src/ckan ${CKAN_DIR} # Additional install steps for build stages artifacts -RUN pip install --no-index --find-links=/srv/app/wheels uwsgi==2.0.19.1 gevent==20.6.2 +RUN pip install --no-index --find-links=/srv/app/wheels uwsgi==2.0.19.1 gevent==21.1.2 # Create a local user and group to run the app RUN groupadd -g 92 ckan && \ diff --git a/images/ckan/2.8/Dockerfile b/images/ckan/2.8/Dockerfile index ded72f4..6fb652d 100644 --- a/images/ckan/2.8/Dockerfile +++ b/images/ckan/2.8/Dockerfile @@ -1,7 +1,7 @@ ################## ### Build CKAN ### ################## -FROM alpine:3.13 as ckanbuild +FROM alpine:3.13.5 as ckanbuild # Used by Github Actions to tag the image with ENV IMAGE_TAG=2.8.8 @@ -54,13 +54,13 @@ COPY ./scripts/apply_ckan_patches.sh ${SRC_DIR}/apply_ckan_patches.sh RUN ${SRC_DIR}/apply_ckan_patches.sh RUN rm -rf /srv/app/src/ckan/.git RUN pip wheel --wheel-dir=/wheels -r ckan/requirements.txt -RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==20.6.2 greenlet==0.4.16 +RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==21.1.2 greenlet==1.1.0 ########################### ### Default-Extensions #### ########################### -FROM alpine:3.13 as extbuild +FROM alpine:3.13.5 as extbuild # Set src dirs ENV SRC_DIR=/srv/app/src @@ -92,7 +92,7 @@ RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e ############ ### MAIN ### ############ -FROM alpine:3.13 +FROM alpine:3.13.5 LABEL maintainer="Keitaro Inc " LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan @@ -131,7 +131,7 @@ COPY --from=extbuild /wheels /srv/app/ext_wheels COPY --from=ckanbuild /srv/app/src/ckan ${CKAN_DIR} # Additional install steps for build stages artifacts -RUN pip install --no-index --find-links=/srv/app/wheels uwsgi==2.0.19.1 gevent==20.6.2 +RUN pip install --no-index --find-links=/srv/app/wheels uwsgi==2.0.19.1 gevent==21.1.2 # Create a local user and group to run the app RUN addgroup -g 92 -S ckan && \ diff --git a/images/ckan/2.8/Dockerfile.focal b/images/ckan/2.8/Dockerfile.focal index c89f38f..52dbac3 100644 --- a/images/ckan/2.8/Dockerfile.focal +++ b/images/ckan/2.8/Dockerfile.focal @@ -75,7 +75,7 @@ COPY ./scripts/apply_ckan_patches.sh ${SRC_DIR}/apply_ckan_patches.sh RUN ${SRC_DIR}/apply_ckan_patches.sh RUN rm -rf /srv/app/src/ckan/.git RUN pip wheel --wheel-dir=/wheels -r ckan/requirements.txt -RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==20.6.2 greenlet==0.4.16 +RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==21.1.2 greenlet==1.1.0 ########################### @@ -174,7 +174,7 @@ COPY --from=extbuild /wheels /srv/app/ext_wheels COPY --from=ckanbuild /srv/app/src/ckan ${CKAN_DIR} # Additional install steps for build stages artifacts -RUN pip install --no-index --find-links=/srv/app/wheels uwsgi==2.0.19.1 gevent==20.6.2 +RUN pip install --no-index --find-links=/srv/app/wheels uwsgi==2.0.19.1 gevent==21.1.2 # Create a local user and group to run the app RUN groupadd -g 92 ckan && \ diff --git a/images/ckan/2.9/Dockerfile b/images/ckan/2.9/Dockerfile index 1080e3b..70e7cd1 100644 --- a/images/ckan/2.9/Dockerfile +++ b/images/ckan/2.9/Dockerfile @@ -1,7 +1,7 @@ ################## ### Build CKAN ### ################## -FROM alpine:3.13 as ckanbuild +FROM alpine:3.13.5 as ckanbuild # Used by Github Actions to tag the image with ENV IMAGE_TAG=2.9.3 @@ -60,13 +60,13 @@ COPY ./scripts/apply_ckan_patches.sh ${SRC_DIR}/apply_ckan_patches.sh RUN ${SRC_DIR}/apply_ckan_patches.sh RUN rm -rf /srv/app/src/ckan/.git RUN pip wheel --wheel-dir=/wheels -r ckan/requirements.txt -RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==20.6.2 greenlet==0.4.16 +RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==21.1.2 greenlet==1.1.0 ########################### ### Default-Extensions #### ########################### -FROM alpine:3.13 as extbuild +FROM alpine:3.13.5 as extbuild # Set src dirs ENV SRC_DIR=/srv/app/src @@ -101,7 +101,7 @@ RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e ############ ### MAIN ### ############ -FROM alpine:3.13 +FROM alpine:3.13.5 LABEL maintainer="Keitaro Inc " LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan @@ -142,7 +142,7 @@ COPY --from=extbuild /wheels /srv/app/ext_wheels COPY --from=ckanbuild /srv/app/src/ckan ${CKAN_DIR} # Additional install steps for build stages artifacts -RUN pip install --no-index --find-links=/srv/app/wheels uwsgi==2.0.19.1 gevent==20.6.2 +RUN pip install --no-index --find-links=/srv/app/wheels uwsgi==2.0.19.1 gevent==21.1.2 # Create a local user and group to run the app RUN addgroup -g 92 -S ckan && \ diff --git a/images/ckan/2.9/Dockerfile.focal b/images/ckan/2.9/Dockerfile.focal index 39913fb..15efe51 100644 --- a/images/ckan/2.9/Dockerfile.focal +++ b/images/ckan/2.9/Dockerfile.focal @@ -81,7 +81,7 @@ COPY ./scripts/apply_ckan_patches.sh ${SRC_DIR}/apply_ckan_patches.sh RUN ${SRC_DIR}/apply_ckan_patches.sh RUN rm -rf /srv/app/src/ckan/.git RUN pip wheel --wheel-dir=/wheels -r ckan/requirements.txt -RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==20.6.2 greenlet==0.4.16 +RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==21.1.2 greenlet==1.1.0 ########################### @@ -186,7 +186,7 @@ COPY --from=extbuild /wheels /srv/app/ext_wheels COPY --from=ckanbuild /srv/app/src/ckan ${CKAN_DIR} # Additional install steps for build stages artifacts -RUN pip install --no-index --find-links=/srv/app/wheels uwsgi==2.0.19.1 gevent==20.6.2 +RUN pip install --no-index --find-links=/srv/app/wheels uwsgi==2.0.19.1 gevent==21.1.2 # Create a local user and group to run the app RUN groupadd -g 92 ckan && \ diff --git a/images/datapusher/Dockerfile b/images/datapusher/Dockerfile index 4894864..fcb51b8 100644 --- a/images/datapusher/Dockerfile +++ b/images/datapusher/Dockerfile @@ -1,7 +1,7 @@ ############# ### Build ### ############# -FROM alpine:3.13 as build +FROM alpine:3.13.5 as build # Used by Github Actions to tag the image with ENV IMAGE_TAG=0.0.17 @@ -56,7 +56,7 @@ RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==20.6.2 greenlet==0.4.1 ############ ### MAIN ### ############ -FROM alpine:3.13 +FROM alpine:3.13.5 LABEL maintainer="Keitaro Inc " LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan