diff --git a/Readme.md b/Readme.md index 1cea446..ff95437 100644 --- a/Readme.md +++ b/Readme.md @@ -40,7 +40,7 @@ We recommend to use a multi-stage approach to extend the docker images that we p ################### ### Extensions #### ################### -FROM keitaro/ckan:2.9.0 as extbuild +FROM keitaro/ckan:2.9.1 as extbuild # Switch to the root user USER root @@ -54,7 +54,7 @@ RUN pip wheel --wheel-dir=/wheels git+https://github.com/acmecorp/ckanext-acme@0 ############ ### MAIN ### ############ -FROM keitaro/ckan:2.9.0 +FROM keitaro/ckan:2.9.1 # Add the custom extensions to the plugins list ENV CKAN__PLUGINS envvars image_view text_view recline_view datastore datapusher acme @@ -84,9 +84,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 keitaro/ckan:2.9.0 images/ckan/2.9 +docker build --tag keitaro/ckan:2.9.1 images/ckan/2.9 ``` -The –-tag keitaro/ckan:2.9.0 flag sets the image name to ketiaro/ckan:2.9.0 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 keitaro/ckan:2.9.1 flag sets the image name to ketiaro/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. ## Upload to DockerHub >*It's recommended to upload built images to DockerHub* diff --git a/compose/.env b/compose/.env index a8a815e..514724c 100644 --- a/compose/.env +++ b/compose/.env @@ -12,7 +12,7 @@ POSTGRES_PORT=5432 DATASTORE_READONLY_PASSWORD=datastore # CKAN -CKAN_VERSION=2.9.0 +CKAN_VERSION=2.9.1 CKAN_SITE_ID=default CKAN_SITE_URL=http://localhost:5000 CKAN_PORT=5000 diff --git a/examples/harvest/.env b/examples/harvest/.env index a8a815e..514724c 100644 --- a/examples/harvest/.env +++ b/examples/harvest/.env @@ -12,7 +12,7 @@ POSTGRES_PORT=5432 DATASTORE_READONLY_PASSWORD=datastore # CKAN -CKAN_VERSION=2.9.0 +CKAN_VERSION=2.9.1 CKAN_SITE_ID=default CKAN_SITE_URL=http://localhost:5000 CKAN_PORT=5000 diff --git a/examples/harvest/Dockerfile b/examples/harvest/Dockerfile index 47aaa55..098508b 100644 --- a/examples/harvest/Dockerfile +++ b/examples/harvest/Dockerfile @@ -1,7 +1,7 @@ ################### ### Extensions #### ################### -FROM keitaro/ckan:2.9.0 as extbuild +FROM keitaro/ckan:2.9.1 as extbuild MAINTAINER Keitaro Inc @@ -28,7 +28,7 @@ RUN curl -o /wheels/harvest.txt https://raw.githubusercontent.com/ckan/ckanext-h ############ ### MAIN ### ############ -FROM keitaro/ckan:2.9.0 +FROM keitaro/ckan:2.9.1 ENV CKAN__PLUGINS envvars image_view text_view recline_view datastore datapusher harvest ckan_harvester diff --git a/examples/s3filestore/.env b/examples/s3filestore/.env index 542a31a..d66972b 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.5 +CKAN_VERSION=2.8.6 CKAN_SITE_ID=default CKAN_SITE_URL=http://localhost:5000 CKAN_PORT=5000 diff --git a/examples/s3filestore/Dockerfile b/examples/s3filestore/Dockerfile index 1d566cf..49994a2 100644 --- a/examples/s3filestore/Dockerfile +++ b/examples/s3filestore/Dockerfile @@ -1,7 +1,7 @@ ################### ### Extensions #### ################### -FROM keitaro/ckan:2.8.5 as extbuild +FROM keitaro/ckan:2.8.6 as extbuild MAINTAINER Keitaro Inc @@ -20,7 +20,7 @@ RUN curl -o /wheels/s3filestore.txt https://raw.githubusercontent.com/keitaroinc ############ ### MAIN ### ############ -FROM keitaro/ckan:2.8.5 +FROM keitaro/ckan:2.8.6 MAINTAINER Keitaro Inc diff --git a/images/ckan/2.7/Dockerfile b/images/ckan/2.7/Dockerfile index f33aa94..ec72633 100644 --- a/images/ckan/2.7/Dockerfile +++ b/images/ckan/2.7/Dockerfile @@ -5,7 +5,7 @@ FROM alpine:3.12 as ckanbuild # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.7.8 +ENV GIT_BRANCH=ckan-2.7.9 # Set src dirs ENV SRC_DIR=/srv/app/src diff --git a/images/ckan/2.9/patches/.keep b/images/ckan/2.7/patches/.gitkeep similarity index 100% rename from images/ckan/2.9/patches/.keep rename to images/ckan/2.7/patches/.gitkeep diff --git a/images/ckan/2.7/patches/00_datapusher_fix_callback_url.patch b/images/ckan/2.7/patches/00_datapusher_fix_callback_url.patch deleted file mode 100644 index 83d03d5..0000000 --- a/images/ckan/2.7/patches/00_datapusher_fix_callback_url.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- ckan/ckanext/datapusher/logic/action.py 2020-09-19 21:25:06.525350202 +0200 -+++ action_fix_callback_url.py 2020-09-19 21:27:43.596501963 +0200 -@@ -61,13 +61,13 @@ - - datapusher_url = config.get('ckan.datapusher.url') - -- site_url = h.url_for('/', qualified=True) -- - callback_url_base = config.get('ckan.datapusher.callback_url_base') - if callback_url_base: -+ site_url = callback_url_base - callback_url = urlparse.urljoin( - callback_url_base.rstrip('/'), '/api/3/action/datapusher_hook') - else: -+ site_url = h.url_for('/', qualified=True) - callback_url = h.url_for( - '/api/3/action/datapusher_hook', qualified=True) - diff --git a/images/ckan/2.7/patches/01_dictization_functions_unflatten.patch b/images/ckan/2.7/patches/01_dictization_functions_unflatten.patch deleted file mode 100644 index 51258cd..0000000 --- a/images/ckan/2.7/patches/01_dictization_functions_unflatten.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- ckan/ckan/lib/navl/dictization_functions.py 2020-10-14 10:48:40.146291362 +0200 -+++ dictization_functions_unflatten_patch.py 2020-10-14 10:48:29.979771608 +0200 -@@ -440,19 +440,24 @@ - for flattend_key in sorted(data.keys(), key=flattened_order_key): - current_pos = unflattened - -+ if (len(flattend_key) > 1 -+ and not flattend_key[0] in convert_to_list -+ and not flattend_key[0] in unflattened): -+ convert_to_list.append(flattend_key[0]) -+ - for key in flattend_key[:-1]: - try: - current_pos = current_pos[key] -- except IndexError: -- new_pos = {} -- current_pos.append(new_pos) -- current_pos = new_pos - except KeyError: -- new_pos = [] -+ new_pos = {} - current_pos[key] = new_pos - current_pos = new_pos - current_pos[flattend_key[-1]] = data[flattend_key] - -+ for key in convert_to_list: -+ unflattened[key] = [unflattened[key][s] -+ for s in sorted(unflattened[key])] -+ - return unflattened - - diff --git a/images/ckan/2.8/Dockerfile b/images/ckan/2.8/Dockerfile index 3688b5b..a7d9e24 100644 --- a/images/ckan/2.8/Dockerfile +++ b/images/ckan/2.8/Dockerfile @@ -5,7 +5,7 @@ FROM alpine:3.12 as ckanbuild # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.8.5 +ENV GIT_BRANCH=ckan-2.8.6 # Set src dirs ENV SRC_DIR=/srv/app/src diff --git a/images/ckan/2.8/patches/.gitkeep b/images/ckan/2.8/patches/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/images/ckan/2.8/patches/00_datapusher_fix_callback_url.patch b/images/ckan/2.8/patches/00_datapusher_fix_callback_url.patch deleted file mode 100644 index 83d03d5..0000000 --- a/images/ckan/2.8/patches/00_datapusher_fix_callback_url.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- ckan/ckanext/datapusher/logic/action.py 2020-09-19 21:25:06.525350202 +0200 -+++ action_fix_callback_url.py 2020-09-19 21:27:43.596501963 +0200 -@@ -61,13 +61,13 @@ - - datapusher_url = config.get('ckan.datapusher.url') - -- site_url = h.url_for('/', qualified=True) -- - callback_url_base = config.get('ckan.datapusher.callback_url_base') - if callback_url_base: -+ site_url = callback_url_base - callback_url = urlparse.urljoin( - callback_url_base.rstrip('/'), '/api/3/action/datapusher_hook') - else: -+ site_url = h.url_for('/', qualified=True) - callback_url = h.url_for( - '/api/3/action/datapusher_hook', qualified=True) - diff --git a/images/ckan/2.8/patches/01_dictization_functions_unflatten.patch b/images/ckan/2.8/patches/01_dictization_functions_unflatten.patch deleted file mode 100644 index 573cffd..0000000 --- a/images/ckan/2.8/patches/01_dictization_functions_unflatten.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- ckan/ckan/lib/navl/dictization_functions.py 2020-10-14 10:39:46.319132692 +0200 -+++ dictization_functions_unflatten_patch.py 2020-10-14 10:40:38.204657981 +0200 -@@ -442,19 +442,24 @@ - for flattend_key in sorted(data.keys(), key=flattened_order_key): - current_pos = unflattened - -+ if (len(flattend_key) > 1 -+ and not flattend_key[0] in convert_to_list -+ and not flattend_key[0] in unflattened): -+ convert_to_list.append(flattend_key[0]) -+ - for key in flattend_key[:-1]: - try: - current_pos = current_pos[key] -- except IndexError: -- new_pos = {} -- current_pos.append(new_pos) -- current_pos = new_pos - except KeyError: -- new_pos = [] -+ new_pos = {} - current_pos[key] = new_pos - current_pos = new_pos - current_pos[flattend_key[-1]] = data[flattend_key] - -+ for key in convert_to_list: -+ unflattened[key] = [unflattened[key][s] -+ for s in sorted(unflattened[key])] -+ - return unflattened - - diff --git a/images/ckan/2.9/Dockerfile b/images/ckan/2.9/Dockerfile index 0ea323c..de69247 100644 --- a/images/ckan/2.9/Dockerfile +++ b/images/ckan/2.9/Dockerfile @@ -5,7 +5,7 @@ FROM alpine:3.12 as ckanbuild # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.9.0 +ENV GIT_BRANCH=ckan-2.9.1 # Set src dirs ENV SRC_DIR=/srv/app/src diff --git a/images/ckan/2.9/patches/.gitkeep b/images/ckan/2.9/patches/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/images/ckan/2.9/patches/01_dictization_functions_unflatten.patch b/images/ckan/2.9/patches/01_dictization_functions_unflatten.patch deleted file mode 100644 index c4acfc3..0000000 --- a/images/ckan/2.9/patches/01_dictization_functions_unflatten.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- ckan/ckan/lib/navl/dictization_functions.py 2020-10-14 10:45:07.519582188 +0200 -+++ dictization_functions_unflatten_patch.py 2020-10-14 10:46:26.258305671 +0200 -@@ -410,19 +410,24 @@ - for flattend_key in sorted(data.keys(), key=flattened_order_key): - current_pos = unflattened - -+ if (len(flattend_key) > 1 -+ and not flattend_key[0] in convert_to_list -+ and not flattend_key[0] in unflattened): -+ convert_to_list.append(flattend_key[0]) -+ - for key in flattend_key[:-1]: - try: - current_pos = current_pos[key] -- except IndexError: -- new_pos = {} -- current_pos.append(new_pos) -- current_pos = new_pos - except KeyError: -- new_pos = [] -+ new_pos = {} - current_pos[key] = new_pos - current_pos = new_pos - current_pos[flattend_key[-1]] = data[flattend_key] - -+ for key in convert_to_list: -+ unflattened[key] = [unflattened[key][s] -+ for s in sorted(unflattened[key])] -+ - return unflattened - -