From 69ec6e65b6d0d7a39db31b17fe20c4388dc53a3c Mon Sep 17 00:00:00 2001 From: Marko Bocevski Date: Wed, 3 Feb 2021 16:06:23 +0100 Subject: [PATCH] New CKAN patches 2.7.10, 2.8.7 and 2.9.2 --- Readme.md | 8 ++++---- compose/.env | 2 +- compose/solr/solrconfig-2.7.10.xml | 1 + compose/solr/solrconfig-2.7.9.xml | 1 - .../{solrconfig-2.8.6.xml => solrconfig-2.8.7.xml} | 0 .../{solrconfig-2.9.1.xml => solrconfig-2.9.2.xml} | 0 examples/s3filestore/.env | 2 +- examples/s3filestore/Dockerfile | 4 ++-- images/ckan/2.7/Dockerfile | 4 ++-- images/ckan/2.7/Dockerfile.focal | 4 ++-- images/ckan/2.8/Dockerfile | 4 ++-- images/ckan/2.8/Dockerfile.focal | 4 ++-- images/ckan/2.9/Dockerfile | 4 ++-- images/ckan/2.9/Dockerfile.focal | 4 ++-- .../ckan/2.9/patches/00_get_limit_type_check.patch | 13 ------------- 15 files changed, 21 insertions(+), 34 deletions(-) create mode 120000 compose/solr/solrconfig-2.7.10.xml delete mode 120000 compose/solr/solrconfig-2.7.9.xml rename compose/solr/{solrconfig-2.8.6.xml => solrconfig-2.8.7.xml} (100%) rename compose/solr/{solrconfig-2.9.1.xml => solrconfig-2.9.2.xml} (100%) delete mode 100644 images/ckan/2.9/patches/00_get_limit_type_check.patch diff --git a/Readme.md b/Readme.md index 473d807..be7f541 100644 --- a/Readme.md +++ b/Readme.md @@ -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.1 as extbuild +FROM ghcr.io/keitaroinc/ckan:2.9.2 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.1 +FROM ghcr.io/keitaroinc/ckan:2.9.2 # 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.1 images/ckan/2.9 +docker build --tag ghcr.io/keitaroinc/ckan:2.9.2 images/ckan/2.9 ``` -The –-tag ghcr.io/keitaroinc/ckan:2.9.1 flag sets the image name to ghcr.io/keitaroinc/ckan:2.9.1 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.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. ## Upload to DockerHub >*It's recommended to upload built images to DockerHub* diff --git a/compose/.env b/compose/.env index 514724c..89a9c51 100644 --- a/compose/.env +++ b/compose/.env @@ -12,7 +12,7 @@ POSTGRES_PORT=5432 DATASTORE_READONLY_PASSWORD=datastore # CKAN -CKAN_VERSION=2.9.1 +CKAN_VERSION=2.9.2 CKAN_SITE_ID=default CKAN_SITE_URL=http://localhost:5000 CKAN_PORT=5000 diff --git a/compose/solr/solrconfig-2.7.10.xml b/compose/solr/solrconfig-2.7.10.xml new file mode 120000 index 0000000..207d108 --- /dev/null +++ b/compose/solr/solrconfig-2.7.10.xml @@ -0,0 +1 @@ +solrconfig-2.8.7.xml \ No newline at end of file diff --git a/compose/solr/solrconfig-2.7.9.xml b/compose/solr/solrconfig-2.7.9.xml deleted file mode 120000 index 9859b31..0000000 --- a/compose/solr/solrconfig-2.7.9.xml +++ /dev/null @@ -1 +0,0 @@ -solrconfig-2.8.6.xml \ No newline at end of file diff --git a/compose/solr/solrconfig-2.8.6.xml b/compose/solr/solrconfig-2.8.7.xml similarity index 100% rename from compose/solr/solrconfig-2.8.6.xml rename to compose/solr/solrconfig-2.8.7.xml diff --git a/compose/solr/solrconfig-2.9.1.xml b/compose/solr/solrconfig-2.9.2.xml similarity index 100% rename from compose/solr/solrconfig-2.9.1.xml rename to compose/solr/solrconfig-2.9.2.xml diff --git a/examples/s3filestore/.env b/examples/s3filestore/.env index d66972b..d519cb2 100644 --- a/examples/s3filestore/.env +++ b/examples/s3filestore/.env @@ -12,7 +12,7 @@ POSTGRES_PORT=5432 DATASTORE_READONLY_PASSWORD=datastore # CKAN -CKAN_VERSION=2.8.6 +CKAN_VERSION=2.8.7 CKAN_SITE_ID=default CKAN_SITE_URL=http://localhost:5000 CKAN_PORT=5000 diff --git a/examples/s3filestore/Dockerfile b/examples/s3filestore/Dockerfile index 14d3d8d..8f58d14 100644 --- a/examples/s3filestore/Dockerfile +++ b/examples/s3filestore/Dockerfile @@ -1,7 +1,7 @@ ################### ### Extensions #### ################### -FROM ghcr.io/keitaroinc/ckan:2.8.6 as extbuild +FROM ghcr.io/keitaroinc/ckan:2.8.7 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.8.6 +FROM ghcr.io/keitaroinc/ckan:2.8.7 LABEL maintainer="Keitaro Inc " diff --git a/images/ckan/2.7/Dockerfile b/images/ckan/2.7/Dockerfile index fd61b9d..2ed123a 100644 --- a/images/ckan/2.7/Dockerfile +++ b/images/ckan/2.7/Dockerfile @@ -4,11 +4,11 @@ FROM alpine:3.13 as ckanbuild # Used by Github Actions to tag the image with -ENV IMAGE_TAG=2.7.9 +ENV IMAGE_TAG=2.7.10 # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.7.9 +ENV GIT_BRANCH=ckan-2.7.10 # Set src dirs ENV SRC_DIR=/srv/app/src diff --git a/images/ckan/2.7/Dockerfile.focal b/images/ckan/2.7/Dockerfile.focal index af263ae..b496b21 100644 --- a/images/ckan/2.7/Dockerfile.focal +++ b/images/ckan/2.7/Dockerfile.focal @@ -4,11 +4,11 @@ FROM ubuntu:focal-20201106 as ckanbuild # Used by Github Actions to tag the image with -ENV IMAGE_TAG=2.7.9-focal +ENV IMAGE_TAG=2.7.10-focal # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.7.9 +ENV GIT_BRANCH=ckan-2.7.10 # Set timezone ENV TZ=UTC diff --git a/images/ckan/2.8/Dockerfile b/images/ckan/2.8/Dockerfile index ae5dc10..3bdf6e0 100644 --- a/images/ckan/2.8/Dockerfile +++ b/images/ckan/2.8/Dockerfile @@ -4,11 +4,11 @@ FROM alpine:3.13 as ckanbuild # Used by Github Actions to tag the image with -ENV IMAGE_TAG=2.8.6 +ENV IMAGE_TAG=2.8.7 # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.8.6 +ENV GIT_BRANCH=ckan-2.8.7 # Set src dirs ENV SRC_DIR=/srv/app/src diff --git a/images/ckan/2.8/Dockerfile.focal b/images/ckan/2.8/Dockerfile.focal index 27f1ded..ac4a0ba 100644 --- a/images/ckan/2.8/Dockerfile.focal +++ b/images/ckan/2.8/Dockerfile.focal @@ -4,11 +4,11 @@ FROM ubuntu:focal-20201106 as ckanbuild # Used by Github Actions to tag the image with -ENV IMAGE_TAG=2.8.6-focal +ENV IMAGE_TAG=2.8.7-focal # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.8.6 +ENV GIT_BRANCH=ckan-2.8.7 # Set timezone ENV TZ=UTC diff --git a/images/ckan/2.9/Dockerfile b/images/ckan/2.9/Dockerfile index acf4b66..0baa7c5 100644 --- a/images/ckan/2.9/Dockerfile +++ b/images/ckan/2.9/Dockerfile @@ -4,11 +4,11 @@ FROM alpine:3.13 as ckanbuild # Used by Github Actions to tag the image with -ENV IMAGE_TAG=2.9.1 +ENV IMAGE_TAG=2.9.2 # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.9.1 +ENV GIT_BRANCH=ckan-2.9.2 # Set src dirs ENV SRC_DIR=/srv/app/src diff --git a/images/ckan/2.9/Dockerfile.focal b/images/ckan/2.9/Dockerfile.focal index a0fa8f5..2521306 100644 --- a/images/ckan/2.9/Dockerfile.focal +++ b/images/ckan/2.9/Dockerfile.focal @@ -4,11 +4,11 @@ FROM ubuntu:focal-20201106 as ckanbuild # Used by Github Actions to tag the image with -ENV IMAGE_TAG=2.9.1-focal +ENV IMAGE_TAG=2.9.2-focal # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.9.1 +ENV GIT_BRANCH=ckan-2.9.2 # Set timezone ENV TZ=UTC diff --git a/images/ckan/2.9/patches/00_get_limit_type_check.patch b/images/ckan/2.9/patches/00_get_limit_type_check.patch deleted file mode 100644 index 6adc118..0000000 --- a/images/ckan/2.9/patches/00_get_limit_type_check.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ckan/ckan/logic/action/get.py 2020-12-09 12:05:49.800909223 +0100 -+++ get_limit_type_check.py 2020-12-09 12:11:58.404000000 +0100 -@@ -371,8 +371,8 @@ - 'ckan.group_and_organization_list_all_fields_max', 25) - else: - max_limit = config.get('ckan.group_and_organization_list_max', 1000) -- if limit is None or limit > max_limit: -- limit = max_limit -+ if limit is None or int(limit) > max_limit: -+ limit = str(max_limit) - - # order_by deprecated in ckan 1.8 - # if it is supplied and sort isn't use order_by and raise a warning