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

CKAN patch releases 2.7.11 2.8.8 2.9.3 (#50) 

* CKAN patch releases 2.7.11 2.8.8 2.9.3

* Update solrconfig filenames

* Update harvest example default CKAN version to 2.9.3

* Fix symbolic link
This commit is contained in:
Marko Bocevski 2021-05-19 13:01:46 +02:00 committed by GitHub
parent 7a40f4ad8b
commit a9090c9793
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 33 additions and 33 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 #### ### Extensions ####
################### ###################
FROM ghcr.io/keitaroinc/ckan:2.9.2 as extbuild FROM ghcr.io/keitaroinc/ckan:2.9.3 as extbuild
# Switch to the root user # Switch to the root user
USER root USER root
@ -62,7 +62,7 @@ RUN pip wheel --wheel-dir=/wheels git+https://github.com/acmecorp/ckanext-acme@0
############ ############
### MAIN ### ### MAIN ###
############ ############
FROM ghcr.io/keitaroinc/ckan:2.9.2 FROM ghcr.io/keitaroinc/ckan:2.9.3
# Add the custom extensions to the plugins list # Add the custom extensions to the plugins list
ENV CKAN__PLUGINS envvars image_view text_view recline_view datastore datapusher acme 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 ## Build
To build a CKAN image run: To build a CKAN image run:
```sh ```sh
docker build --tag ghcr.io/keitaroinc/ckan:2.9.2 images/ckan/2.9 docker build --tag ghcr.io/keitaroinc/ckan:2.9.3 images/ckan/2.9
``` ```
The –-tag ghcr.io/keitaroinc/ckan:2.9.2 flag sets the image name to ghcr.io/keitaroinc/ckan:2.9.2 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.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.
## Upload to DockerHub ## Upload to DockerHub
>*It's recommended to upload built images 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 DATASTORE_READONLY_PASSWORD=datastore
# CKAN # CKAN
CKAN_VERSION=2.9.2 CKAN_VERSION=2.9.3
CKAN_SITE_ID=default CKAN_SITE_ID=default
CKAN_SITE_URL=http://localhost:5000 CKAN_SITE_URL=http://localhost:5000
CKAN_PORT=5000 CKAN_PORT=5000

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

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

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

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

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

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

2
examples/harvest/.env
View File

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

4
examples/harvest/Dockerfile
View File

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

2
examples/s3filestore/.env
View File

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

4
examples/s3filestore/Dockerfile
View File

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

4
images/ckan/2.7/Dockerfile
View File

@ -4,11 +4,11 @@
FROM alpine:3.13 as ckanbuild FROM alpine:3.13 as ckanbuild
# Used by Github Actions to tag the image with # Used by Github Actions to tag the image with
ENV IMAGE_TAG=2.7.10 ENV IMAGE_TAG=2.7.11
# Set CKAN version to build # Set CKAN version to build
ENV GIT_URL=https://github.com/ckan/ckan.git ENV GIT_URL=https://github.com/ckan/ckan.git
ENV GIT_BRANCH=ckan-2.7.10 ENV GIT_BRANCH=ckan-2.7.11
# Set src dirs # Set src dirs
ENV SRC_DIR=/srv/app/src ENV SRC_DIR=/srv/app/src

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

@ -1,14 +1,14 @@
################## ##################
### Build CKAN ### ### Build CKAN ###
################## ##################
FROM ubuntu:focal-20210217 as ckanbuild FROM ubuntu:focal-20210416 as ckanbuild
# Used by Github Actions to tag the image with # Used by Github Actions to tag the image with
ENV IMAGE_TAG=2.7.10-focal ENV IMAGE_TAG=2.7.11-focal
# Set CKAN version to build # Set CKAN version to build
ENV GIT_URL=https://github.com/ckan/ckan.git ENV GIT_URL=https://github.com/ckan/ckan.git
ENV GIT_BRANCH=ckan-2.7.10 ENV GIT_BRANCH=ckan-2.7.11
# Set timezone # Set timezone
ENV TZ=UTC ENV TZ=UTC
@ -89,7 +89,7 @@ RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==20.6.2 greenlet==0.4.1
########################### ###########################
### Default-Extensions #### ### Default-Extensions ####
########################### ###########################
FROM ubuntu:focal-20210217 as extbuild FROM ubuntu:focal-20210416 as extbuild
# Set src dirs # Set src dirs
ENV SRC_DIR=/srv/app/src 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 ### ### MAIN ###
############ ############
FROM ubuntu:focal-20210217 FROM ubuntu:focal-20210416
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

4
images/ckan/2.8/Dockerfile
View File

@ -4,11 +4,11 @@
FROM alpine:3.13 as ckanbuild FROM alpine:3.13 as ckanbuild
# Used by Github Actions to tag the image with # Used by Github Actions to tag the image with
ENV IMAGE_TAG=2.8.7 ENV IMAGE_TAG=2.8.8
# Set CKAN version to build # Set CKAN version to build
ENV GIT_URL=https://github.com/ckan/ckan.git ENV GIT_URL=https://github.com/ckan/ckan.git
ENV GIT_BRANCH=ckan-2.8.7 ENV GIT_BRANCH=ckan-2.8.8
# Set src dirs # Set src dirs
ENV SRC_DIR=/srv/app/src ENV SRC_DIR=/srv/app/src

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

@ -1,14 +1,14 @@
################## ##################
### Build CKAN ### ### Build CKAN ###
################## ##################
FROM ubuntu:focal-20210217 as ckanbuild FROM ubuntu:focal-20210416 as ckanbuild
# Used by Github Actions to tag the image with # Used by Github Actions to tag the image with
ENV IMAGE_TAG=2.8.7-focal ENV IMAGE_TAG=2.8.8-focal
# Set CKAN version to build # Set CKAN version to build
ENV GIT_URL=https://github.com/ckan/ckan.git ENV GIT_URL=https://github.com/ckan/ckan.git
ENV GIT_BRANCH=ckan-2.8.7 ENV GIT_BRANCH=ckan-2.8.8
# Set timezone # Set timezone
ENV TZ=UTC ENV TZ=UTC
@ -81,7 +81,7 @@ RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==20.6.2 greenlet==0.4.1
########################### ###########################
### Default-Extensions #### ### Default-Extensions ####
########################### ###########################
FROM ubuntu:focal-20210217 as extbuild FROM ubuntu:focal-20210416 as extbuild
# Set src dirs # Set src dirs
ENV SRC_DIR=/srv/app/src 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 ### ### MAIN ###
############ ############
FROM ubuntu:focal-20210217 FROM ubuntu:focal-20210416
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

4
images/ckan/2.9/Dockerfile
View File

@ -4,11 +4,11 @@
FROM alpine:3.13 as ckanbuild FROM alpine:3.13 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.2 ENV IMAGE_TAG=2.9.3
# Set CKAN version to build # Set CKAN version to build
ENV GIT_URL=https://github.com/ckan/ckan.git ENV GIT_URL=https://github.com/ckan/ckan.git
ENV GIT_BRANCH=ckan-2.9.2 ENV GIT_BRANCH=ckan-2.9.3
# Set src dirs # Set src dirs
ENV SRC_DIR=/srv/app/src ENV SRC_DIR=/srv/app/src

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

@ -1,14 +1,14 @@
################## ##################
### Build CKAN ### ### Build CKAN ###
################## ##################
FROM ubuntu:focal-20210217 as ckanbuild FROM ubuntu:focal-20210416 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.2-focal ENV IMAGE_TAG=2.9.3-focal
# Set CKAN version to build # Set CKAN version to build
ENV GIT_URL=https://github.com/ckan/ckan.git ENV GIT_URL=https://github.com/ckan/ckan.git
ENV GIT_BRANCH=ckan-2.9.2 ENV GIT_BRANCH=ckan-2.9.3
# Set timezone # Set timezone
ENV TZ=UTC ENV TZ=UTC
@ -87,7 +87,7 @@ RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==20.6.2 greenlet==0.4.1
########################### ###########################
### Default-Extensions #### ### Default-Extensions ####
########################### ###########################
FROM ubuntu:focal-20210217 as extbuild FROM ubuntu:focal-20210416 as extbuild
# Set src dirs # Set src dirs
ENV SRC_DIR=/srv/app/src 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 ### ### MAIN ###
############ ############
FROM ubuntu:focal-20210217 FROM ubuntu:focal-20210416
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