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

Merge pull request #54 from keitaroinc/patch-releases 

New CKAN patch releases 2.9.4, 2.8.9, 2.7.12
This commit is contained in:
Blagoja Stojkoski 2021-09-22 17:55:15 +02:00 committed by GitHub
parent 5fe9bff738 4ebef5c6d9
commit dbc534ac72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 59 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Readme.md
View File

@ -48,7 +48,7 @@ We recommend to use a multi-stage approach to extend the docker images that we p
###################
### Extensions ####
###################
FROM ghcr.io/keitaroinc/ckan:2.9.3 as extbuild
FROM ghcr.io/keitaroinc/ckan:2.9.4 as extbuild
# Switch to the root user
USER root
@ -62,7 +62,7 @@ RUN pip wheel --wheel-dir=/wheels git+https://github.com/acmecorp/ckanext-acme@0
############
### MAIN ###
############
FROM ghcr.io/keitaroinc/ckan:2.9.3
FROM ghcr.io/keitaroinc/ckan:2.9.4
# Add the custom extensions to the plugins list
ENV CKAN__PLUGINS envvars image_view text_view recline_view datastore datapusher acme
@ -92,9 +92,9 @@ You can add scripts to CKAN custom images and copy them to the *docker-afterinit
## Build
To build a CKAN image run:
```sh
docker build --tag ghcr.io/keitaroinc/ckan:2.9.3 images/ckan/2.9
docker build --tag ghcr.io/keitaroinc/ckan:2.9.4 images/ckan/2.9
```
The –-tag ghcr.io/keitaroinc/ckan:2.9.3 flag sets the image name to ghcr.io/keitaroinc/ckan:2.9.3 and 'images/ckan/2.9' at the end tells docker build to use the context into the specified directory where the Dockerfile and related contents are.
The –-tag ghcr.io/keitaroinc/ckan:2.9.4 flag sets the image name to ghcr.io/keitaroinc/ckan:2.9.4 and 'images/ckan/2.9' at the end tells docker build to use the context into the specified directory where the Dockerfile and related contents are.
## Upload to DockerHub
>*It's recommended to upload built images to DockerHub*

2
compose/.env
View File

@ -12,7 +12,7 @@ POSTGRES_PORT=5432
DATASTORE_READONLY_PASSWORD=datastore
# CKAN
CKAN_VERSION=2.9.3
CKAN_VERSION=2.9.4
CKAN_SITE_ID=default
CKAN_SITE_URL=http://localhost:5000
CKAN_PORT=5000

1
compose/solr/solrconfig-2.7.11.xml
View File

@ -1 +0,0 @@
solrconfig-2.8.8.xml

1
compose/solr/solrconfig-2.7.12.xml Symbolic link
View File

@ -0,0 +1 @@
solrconfig-2.8.9.xml

0
compose/solr/solrconfig-2.8.8.xml → compose/solr/solrconfig-2.8.9.xml
View File

0
compose/solr/solrconfig-2.9.3.xml → compose/solr/solrconfig-2.9.4.xml
View File

2
examples/harvest/.env
View File

@ -12,7 +12,7 @@ POSTGRES_PORT=5432
DATASTORE_READONLY_PASSWORD=datastore
# CKAN
CKAN_VERSION=2.9.3
CKAN_VERSION=2.9.4
CKAN_SITE_ID=default
CKAN_SITE_URL=http://localhost:5000
CKAN_PORT=5000

4
examples/harvest/Dockerfile
View File

@ -1,7 +1,7 @@
###################
### Extensions ####
###################
FROM ghcr.io/keitaroinc/ckan:2.9.3 as extbuild
FROM ghcr.io/keitaroinc/ckan:2.9.4 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.3
FROM ghcr.io/keitaroinc/ckan:2.9.4
LABEL maintainer="Keitaro Inc <info@keitaro.com>"

2
examples/s3filestore/.env
View File

@ -12,7 +12,7 @@ POSTGRES_PORT=5432
DATASTORE_READONLY_PASSWORD=datastore
# CKAN
CKAN_VERSION=2.8.8
CKAN_VERSION=2.9.4
CKAN_SITE_ID=default
CKAN_SITE_URL=http://localhost:5000
CKAN_PORT=5000

4
examples/s3filestore/Dockerfile
View File

@ -1,7 +1,7 @@
###################
### Extensions ####
###################
FROM ghcr.io/keitaroinc/ckan:2.9.3 as extbuild
FROM ghcr.io/keitaroinc/ckan:2.9.4 as extbuild
# Locations and tags, please use specific tags or revisions
ENV S3FILESTORE_GIT_URL=https://github.com/keitaroinc/ckanext-s3filestore
@ -20,7 +20,7 @@ USER ckan
############
### MAIN ###
############
FROM ghcr.io/keitaroinc/ckan:2.9.3
FROM ghcr.io/keitaroinc/ckan:2.9.4
LABEL maintainer="Keitaro Inc <info@keitaro.com>"

10
images/ckan/2.7/Dockerfile
View File

@ -1,14 +1,14 @@
##################
### Build CKAN ###
##################
FROM alpine:3.13.5 as ckanbuild
FROM alpine:3.14.2 as ckanbuild
# Used by Github Actions to tag the image with
ENV IMAGE_TAG=2.7.11
ENV IMAGE_TAG=2.7.12
# Set CKAN version to build
ENV GIT_URL=https://github.com/ckan/ckan.git
ENV GIT_BRANCH=ckan-2.7.11
ENV GIT_BRANCH=ckan-2.7.12
# Set src dirs
ENV SRC_DIR=/srv/app/src
@ -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.13.5 as extbuild
FROM alpine:3.14.2 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.5
FROM alpine:3.14.2
LABEL maintainer="Keitaro Inc <info@keitaro.com>"
LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan

10
images/ckan/2.7/Dockerfile.focal
View File

@ -1,14 +1,14 @@
##################
### Build CKAN ###
##################
FROM ubuntu:focal-20210416 as ckanbuild
FROM ubuntu:focal-20210827 as ckanbuild
# Used by Github Actions to tag the image with
ENV IMAGE_TAG=2.7.11-focal
ENV IMAGE_TAG=2.7.12-focal
# Set CKAN version to build
ENV GIT_URL=https://github.com/ckan/ckan.git
ENV GIT_BRANCH=ckan-2.7.11
ENV GIT_BRANCH=ckan-2.7.12
# Set timezone
ENV TZ=UTC
@ -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-20210416 as extbuild
FROM ubuntu:focal-20210827 as extbuild
# Set src dirs
ENV SRC_DIR=/srv/app/src
@ -123,7 +123,7 @@ RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e
############
### MAIN ###
############
FROM ubuntu:focal-20210416
FROM ubuntu:focal-20210827
LABEL maintainer="Keitaro Inc <info@keitaro.com>"
LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan

10
images/ckan/2.8/Dockerfile
View File

@ -1,14 +1,14 @@
##################
### Build CKAN ###
##################
FROM alpine:3.13.5 as ckanbuild
FROM alpine:3.14.2 as ckanbuild
# Used by Github Actions to tag the image with
ENV IMAGE_TAG=2.8.8
ENV IMAGE_TAG=2.8.9
# Set CKAN version to build
ENV GIT_URL=https://github.com/ckan/ckan.git
ENV GIT_BRANCH=ckan-2.8.8
ENV GIT_BRANCH=ckan-2.8.9
# Set src dirs
ENV SRC_DIR=/srv/app/src
@ -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.13.5 as extbuild
FROM alpine:3.14.2 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.5
FROM alpine:3.14.2
LABEL maintainer="Keitaro Inc <info@keitaro.com>"
LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan

10
images/ckan/2.8/Dockerfile.focal
View File

@ -1,14 +1,14 @@
##################
### Build CKAN ###
##################
FROM ubuntu:focal-20210416 as ckanbuild
FROM ubuntu:focal-20210827 as ckanbuild
# Used by Github Actions to tag the image with
ENV IMAGE_TAG=2.8.8-focal
ENV IMAGE_TAG=2.8.9-focal
# Set CKAN version to build
ENV GIT_URL=https://github.com/ckan/ckan.git
ENV GIT_BRANCH=ckan-2.8.8
ENV GIT_BRANCH=ckan-2.8.9
# Set timezone
ENV TZ=UTC
@ -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-20210416 as extbuild
FROM ubuntu:focal-20210827 as extbuild
# Set src dirs
ENV SRC_DIR=/srv/app/src
@ -115,7 +115,7 @@ RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e
############
### MAIN ###
############
FROM ubuntu:focal-20210416
FROM ubuntu:focal-20210827
LABEL maintainer="Keitaro Inc <info@keitaro.com>"
LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan

34
images/ckan/2.9/Dockerfile
View File

@ -1,14 +1,14 @@
##################
### Build CKAN ###
##################
FROM alpine:3.13.5 as ckanbuild
FROM alpine:3.14.2 as ckanbuild
# Used by Github Actions to tag the image with
ENV IMAGE_TAG=2.9.3
ENV IMAGE_TAG=2.9.4
# Set CKAN version to build
ENV GIT_URL=https://github.com/ckan/ckan.git
ENV GIT_BRANCH=ckan-2.9.3
ENV GIT_BRANCH=ckan-2.9.4
# Set src dirs
ENV SRC_DIR=/srv/app/src
@ -17,10 +17,13 @@ ENV PIP_SRC=${SRC_DIR}
WORKDIR ${SRC_DIR}
# Packages to build CKAN requirements and plugins
RUN apk add --no-cache \
# Make sure we install python 3.8, cause CKAN is not compatible with 3.9
RUN apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/v3.13/main \
python3=3.8.10-r0 \
python3-dev=3.8.10-r0 && \
apk add --no-cache \
git \
curl \
python3 \
postgresql-dev \
linux-headers \
gcc \
@ -33,7 +36,6 @@ RUN apk add --no-cache \
musl-dev \
pcre-dev \
pcre \
python3-dev \
libffi-dev \
libxml2-dev \
libxslt-dev
@ -66,7 +68,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.13.5 as extbuild
FROM alpine:3.14.2 as extbuild
# Set src dirs
ENV SRC_DIR=/srv/app/src
@ -79,11 +81,13 @@ 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 \
# Make sure we install python 3.8, cause CKAN is not compatible with 3.9
RUN apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/v3.13/main \
python3=3.8.10-r0 \
python3-dev=3.8.10-r0 && \
apk add --no-cache \
git \
curl \
python3 \
python3-dev
curl
# Link python to python3
RUN ln -s /usr/bin/python3 /usr/bin/python
@ -101,7 +105,7 @@ RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e
############
### MAIN ###
############
FROM alpine:3.13.5
FROM alpine:3.14.2
LABEL maintainer="Keitaro Inc <info@keitaro.com>"
LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan
@ -115,12 +119,14 @@ 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 git \
# Make sure we install python 3.8, cause CKAN is not compatible with 3.9
RUN apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/v3.13/main \
python3=3.8.10-r0 && \
apk add --no-cache git \
bash \
gettext \
curl \
postgresql-client \
python3 \
libmagic \
pcre \
libxslt \

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

@ -1,14 +1,14 @@
##################
### Build CKAN ###
##################
FROM ubuntu:focal-20210416 as ckanbuild
FROM ubuntu:focal-20210827 as ckanbuild
# Used by Github Actions to tag the image with
ENV IMAGE_TAG=2.9.3-focal
ENV IMAGE_TAG=2.9.4-focal
# Set CKAN version to build
ENV GIT_URL=https://github.com/ckan/ckan.git
ENV GIT_BRANCH=ckan-2.9.3
ENV GIT_BRANCH=ckan-2.9.4
# Set timezone
ENV TZ=UTC
@ -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-20210416 as extbuild
FROM ubuntu:focal-20210827 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-20210416
FROM ubuntu:focal-20210827
LABEL maintainer="Keitaro Inc <info@keitaro.com>"
LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan

4
images/datapusher/Dockerfile
View File

@ -1,7 +1,7 @@
#############
### Build ###
#############
FROM alpine:3.13.5 as build
FROM alpine:3.14.2 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.5
FROM alpine:3.14.2
LABEL maintainer="Keitaro Inc <info@keitaro.com>"
LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan