From bf3a02993735b29b65b5b84751a69803af2fd9db Mon Sep 17 00:00:00 2001 From: "blagoja.stojkoski" Date: Mon, 17 Jan 2022 19:31:00 +0100 Subject: [PATCH] CKAN patch releases 2.8.10 2.9.5 --- Readme.md | 8 ++++---- compose/.env | 2 +- .../solr/{solrconfig-2.8.9.xml => solrconfig-2.8.10.xml} | 0 .../solr/{solrconfig-2.9.4.xml => solrconfig-2.9.5.xml} | 0 examples/harvest/.env | 2 +- examples/harvest/Dockerfile | 4 ++-- examples/s3filestore/.env | 2 +- examples/s3filestore/Dockerfile | 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 ++-- 12 files changed, 19 insertions(+), 19 deletions(-) rename compose/solr/{solrconfig-2.8.9.xml => solrconfig-2.8.10.xml} (100%) rename compose/solr/{solrconfig-2.9.4.xml => solrconfig-2.9.5.xml} (100%) diff --git a/Readme.md b/Readme.md index 3c2fddb..7c5887d 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.4 as extbuild +FROM ghcr.io/keitaroinc/ckan:2.9.5 as extbuild # Switch to the root user USER root @@ -64,7 +64,7 @@ RUN pip wheel --wheel-dir=/wheels git+https://github.com/acmecorp/ckanext-acme@0 ############ ### MAIN ### ############ -FROM ghcr.io/keitaroinc/ckan:2.9.4 +FROM ghcr.io/keitaroinc/ckan:2.9.5 # Add the custom extensions to the plugins list ENV CKAN__PLUGINS envvars image_view text_view recline_view datastore datapusher acme @@ -94,9 +94,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.4 images/ckan/2.9 +docker build --tag ghcr.io/keitaroinc/ckan:2.9.5 images/ckan/2.9 ``` -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. +The –-tag ghcr.io/keitaroinc/ckan:2.9.5 flag sets the image name to ghcr.io/keitaroinc/ckan:2.9.5 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 57ae85f..8eb7389 100644 --- a/compose/.env +++ b/compose/.env @@ -12,7 +12,7 @@ POSTGRES_PORT=5432 DATASTORE_READONLY_PASSWORD=datastore # CKAN -CKAN_VERSION=2.9.4 +CKAN_VERSION=2.9.5 CKAN_SITE_ID=default CKAN_SITE_URL=http://localhost:5000 CKAN_PORT=5000 diff --git a/compose/solr/solrconfig-2.8.9.xml b/compose/solr/solrconfig-2.8.10.xml similarity index 100% rename from compose/solr/solrconfig-2.8.9.xml rename to compose/solr/solrconfig-2.8.10.xml diff --git a/compose/solr/solrconfig-2.9.4.xml b/compose/solr/solrconfig-2.9.5.xml similarity index 100% rename from compose/solr/solrconfig-2.9.4.xml rename to compose/solr/solrconfig-2.9.5.xml diff --git a/examples/harvest/.env b/examples/harvest/.env index 57ae85f..8eb7389 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.4 +CKAN_VERSION=2.9.5 CKAN_SITE_ID=default CKAN_SITE_URL=http://localhost:5000 CKAN_PORT=5000 diff --git a/examples/harvest/Dockerfile b/examples/harvest/Dockerfile index edc747a..0975804 100644 --- a/examples/harvest/Dockerfile +++ b/examples/harvest/Dockerfile @@ -1,7 +1,7 @@ ################### ### Extensions #### ################### -FROM ghcr.io/keitaroinc/ckan:2.9.4 as extbuild +FROM ghcr.io/keitaroinc/ckan:2.9.5 as extbuild # Locations and tags, please use specific tags or revisions ENV HARVEST_GIT_URL=https://github.com/ckan/ckanext-harvest @@ -32,7 +32,7 @@ USER ckan ############ ### MAIN ### ############ -FROM ghcr.io/keitaroinc/ckan:2.9.4 +FROM ghcr.io/keitaroinc/ckan:2.9.5 LABEL maintainer="Keitaro Inc " diff --git a/examples/s3filestore/.env b/examples/s3filestore/.env index 57ae85f..8eb7389 100644 --- a/examples/s3filestore/.env +++ b/examples/s3filestore/.env @@ -12,7 +12,7 @@ POSTGRES_PORT=5432 DATASTORE_READONLY_PASSWORD=datastore # CKAN -CKAN_VERSION=2.9.4 +CKAN_VERSION=2.9.5 CKAN_SITE_ID=default CKAN_SITE_URL=http://localhost:5000 CKAN_PORT=5000 diff --git a/examples/s3filestore/Dockerfile b/examples/s3filestore/Dockerfile index 0d55cee..c8e6a7e 100644 --- a/examples/s3filestore/Dockerfile +++ b/examples/s3filestore/Dockerfile @@ -1,7 +1,7 @@ ################### ### Extensions #### ################### -FROM ghcr.io/keitaroinc/ckan:2.9.4 as extbuild +FROM ghcr.io/keitaroinc/ckan:2.9.5 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.4 +FROM ghcr.io/keitaroinc/ckan:2.9.5 LABEL maintainer="Keitaro Inc " diff --git a/images/ckan/2.8/Dockerfile b/images/ckan/2.8/Dockerfile index 354e8d2..fc47399 100644 --- a/images/ckan/2.8/Dockerfile +++ b/images/ckan/2.8/Dockerfile @@ -4,11 +4,11 @@ FROM alpine:3.14.2 as ckanbuild # Used by Github Actions to tag the image with -ENV IMAGE_TAG=2.8.9 +ENV IMAGE_TAG=2.8.10 # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.8.9 +ENV GIT_BRANCH=ckan-2.8.10 # 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 199f28b..6ff0a95 100644 --- a/images/ckan/2.8/Dockerfile.focal +++ b/images/ckan/2.8/Dockerfile.focal @@ -4,11 +4,11 @@ FROM ubuntu:focal-20210827 as ckanbuild # Used by Github Actions to tag the image with -ENV IMAGE_TAG=2.8.9-focal +ENV IMAGE_TAG=2.8.10-focal # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.8.9 +ENV GIT_BRANCH=ckan-2.8.10 # Set timezone ENV TZ=UTC diff --git a/images/ckan/2.9/Dockerfile b/images/ckan/2.9/Dockerfile index 2d71771..cf14a8f 100644 --- a/images/ckan/2.9/Dockerfile +++ b/images/ckan/2.9/Dockerfile @@ -4,11 +4,11 @@ FROM alpine:3.14.2 as ckanbuild # Used by Github Actions to tag the image with -ENV IMAGE_TAG=2.9.4 +ENV IMAGE_TAG=2.9.5 # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.9.4 +ENV GIT_BRANCH=ckan-2.9.5 # 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 f38dd17..87cd417 100644 --- a/images/ckan/2.9/Dockerfile.focal +++ b/images/ckan/2.9/Dockerfile.focal @@ -4,11 +4,11 @@ FROM ubuntu:focal-20210827 as ckanbuild # Used by Github Actions to tag the image with -ENV IMAGE_TAG=2.9.4-focal +ENV IMAGE_TAG=2.9.5-focal # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.9.4 +ENV GIT_BRANCH=ckan-2.9.5 # Set timezone ENV TZ=UTC