Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updates to Alpine and Ubuntu versions #62

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions images/ckan/2.7/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
##################
### Build CKAN ###
##################
FROM alpine:3.14.2 as ckanbuild
FROM alpine:3.15.0 as ckanbuild

# Used by Github Actions to tag the image with
ENV IMAGE_TAG=2.7.12
Expand Down Expand Up @@ -64,7 +64,7 @@ RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==21.1.2 greenlet==1.1.0
###########################
### Default-Extensions ####
###########################
FROM alpine:3.14.2 as extbuild
FROM alpine:3.15.0 as extbuild

# Set src dirs
ENV SRC_DIR=/srv/app/src
Expand Down Expand Up @@ -96,7 +96,7 @@ RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e
############
### MAIN ###
############
FROM alpine:3.14.2
FROM alpine:3.15.0

LABEL maintainer="Keitaro Inc <[email protected]>"
LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan
Expand Down
6 changes: 3 additions & 3 deletions images/ckan/2.7/Dockerfile.focal
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
##################
### Build CKAN ###
##################
FROM ubuntu:focal-20210827 as ckanbuild
FROM ubuntu:focal-20220105 as ckanbuild

# Used by Github Actions to tag the image with
ENV IMAGE_TAG=2.7.12-focal
Expand Down Expand Up @@ -89,7 +89,7 @@ RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==21.1.2 greenlet==1.1.0
###########################
### Default-Extensions ####
###########################
FROM ubuntu:focal-20210827 as extbuild
FROM ubuntu:focal-20220105 as extbuild

# Set src dirs
ENV SRC_DIR=/srv/app/src
Expand Down Expand Up @@ -123,7 +123,7 @@ RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e
############
### MAIN ###
############
FROM ubuntu:focal-20210827
FROM ubuntu:focal-20220105

LABEL maintainer="Keitaro Inc <[email protected]>"
LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan
Expand Down
6 changes: 3 additions & 3 deletions images/ckan/2.8/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
##################
### Build CKAN ###
##################
FROM alpine:3.14.2 as ckanbuild
FROM alpine:3.15.0 as ckanbuild

# Used by Github Actions to tag the image with
ENV IMAGE_TAG=2.8.10
Expand Down Expand Up @@ -60,7 +60,7 @@ RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==21.1.2 greenlet==1.1.0
###########################
### Default-Extensions ####
###########################
FROM alpine:3.14.2 as extbuild
FROM alpine:3.15.0 as extbuild

# Set src dirs
ENV SRC_DIR=/srv/app/src
Expand Down Expand Up @@ -92,7 +92,7 @@ RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e
############
### MAIN ###
############
FROM alpine:3.14.2
FROM alpine:3.15.0

LABEL maintainer="Keitaro Inc <[email protected]>"
LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan
Expand Down
6 changes: 3 additions & 3 deletions images/ckan/2.8/Dockerfile.focal
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
##################
### Build CKAN ###
##################
FROM ubuntu:focal-20210827 as ckanbuild
FROM ubuntu:focal-20220105 as ckanbuild

# Used by Github Actions to tag the image with
ENV IMAGE_TAG=2.8.10-focal
Expand Down Expand Up @@ -81,7 +81,7 @@ RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==21.1.2 greenlet==1.1.0
###########################
### Default-Extensions ####
###########################
FROM ubuntu:focal-20210827 as extbuild
FROM ubuntu:focal-20220105 as extbuild

# Set src dirs
ENV SRC_DIR=/srv/app/src
Expand Down Expand Up @@ -115,7 +115,7 @@ RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e
############
### MAIN ###
############
FROM ubuntu:focal-20210827
FROM ubuntu:focal-20220105

LABEL maintainer="Keitaro Inc <[email protected]>"
LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan
Expand Down
4 changes: 4 additions & 0 deletions images/ckan/2.9/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
##################
### Build CKAN ###
##################

FROM alpine:3.13.7 as ckanbuild

# Used by Github Actions to tag the image with
Expand Down Expand Up @@ -79,6 +80,7 @@ ENV DEFAULT_EXTENSIONS envvars
ENV ENVVARS_GIT_URL=https://github.com/okfn/ckanext-envvars
ENV ENVVARS_GIT_BRANCH=0.0.1


RUN apk add --no-cache \
python3 \
python3-dev \
Expand Down Expand Up @@ -115,8 +117,10 @@ ENV CKAN_SITE_URL=http://localhost:5000
ENV CKAN__PLUGINS envvars image_view text_view recline_view datastore datapusher

# Install necessary packages to run CKAN

RUN apk add --no-cache \
python3 \
git \
bash \
gettext \
curl \
Expand Down
6 changes: 3 additions & 3 deletions images/ckan/2.9/Dockerfile.focal
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
##################
### Build CKAN ###
##################
FROM ubuntu:focal-20210827 as ckanbuild
FROM ubuntu:focal-20220105 as ckanbuild

# Used by Github Actions to tag the image with
ENV IMAGE_TAG=2.9.5-focal
Expand Down Expand Up @@ -87,7 +87,7 @@ RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==21.1.2 greenlet==1.1.0
###########################
### Default-Extensions ####
###########################
FROM ubuntu:focal-20210827 as extbuild
FROM ubuntu:focal-20220105 as extbuild

# Set src dirs
ENV SRC_DIR=/srv/app/src
Expand Down Expand Up @@ -127,7 +127,7 @@ RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e
############
### MAIN ###
############
FROM ubuntu:focal-20210827
FROM ubuntu:focal-20220105

LABEL maintainer="Keitaro Inc <[email protected]>"
LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan
Expand Down
11 changes: 11 additions & 0 deletions images/ckan/2.9/patches/03_patch_requirements_in.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- ckan/requirements.in 2022-01-19 01:33:36.736080826 +0100
+++ ckan/requirements.in 2022-01-19 01:35:54.517310487 +0100
@@ -13,7 +13,7 @@
flask-multistatic==1.0
Jinja2==2.10.1
PyJWT==1.7.1
-Markdown==2.6.7
+Markdown==3.3.3
passlib==1.6.5
polib==1.0.7
psycopg2==2.8.2
11 changes: 11 additions & 0 deletions images/ckan/2.9/patches/04_patch_requirements_txt.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- ckan/requirements.txt 2022-01-19 01:33:36.736080826 +0100
+++ ckan/requirements.txt 2022-01-19 01:37:35.882216912 +0100
@@ -23,7 +23,7 @@
jinja2==2.10.1 # via -r requirements.in, flask, flask-babel
lxml==4.6.3 # via feedgen
mako==1.1.5 # via alembic
-markdown==2.6.7 # via -r requirements.in
+markdown==3.3.3 # via -r requirements.in
markupsafe==1.1.1 # via jinja2, mako
nose==1.3.7 # via pyutilib
passlib==1.6.5 # via -r requirements.in