From dbcdd5e8130c4679710787c2be0fd265bfe219c8 Mon Sep 17 00:00:00 2001 From: "stojanovskis1@icloud.com" Date: Wed, 13 Mar 2024 13:57:40 +0100 Subject: [PATCH 1/5] new release ckan-2.9.11 & ckan-2.10.4 --- images/ckan/2.10/Dockerfile | 4 ++-- images/ckan/2.10/Dockerfile.focal | 4 ++-- images/ckan/2.9/Dockerfile | 4 ++-- images/ckan/2.9/Dockerfile.focal | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/images/ckan/2.10/Dockerfile b/images/ckan/2.10/Dockerfile index e7140ef..3b78ed6 100644 --- a/images/ckan/2.10/Dockerfile +++ b/images/ckan/2.10/Dockerfile @@ -4,11 +4,11 @@ FROM alpine:3.17.2 as ckanbuild # Used by Github Actions to tag the image with -ENV IMAGE_TAG=2.10.3 +ENV IMAGE_TAG=2.10.4 # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.10.3 +ENV GIT_BRANCH=ckan-2.10.4 # Set src dirs ENV SRC_DIR=/srv/app/src diff --git a/images/ckan/2.10/Dockerfile.focal b/images/ckan/2.10/Dockerfile.focal index 6aa802c..84ec629 100644 --- a/images/ckan/2.10/Dockerfile.focal +++ b/images/ckan/2.10/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.10.3-focal +ENV IMAGE_TAG=2.10.4-focal # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.10.3 +ENV GIT_BRANCH=ckan-2.10.4 # Set timezone ENV TZ=UTC diff --git a/images/ckan/2.9/Dockerfile b/images/ckan/2.9/Dockerfile index c1423d3..7c872d2 100644 --- a/images/ckan/2.9/Dockerfile +++ b/images/ckan/2.9/Dockerfile @@ -4,11 +4,11 @@ FROM alpine:3.13.7 as ckanbuild # Used by Github Actions to tag the image with -ENV IMAGE_TAG=2.9.10 +ENV IMAGE_TAG=2.9.11 # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.9.10 +ENV GIT_BRANCH=ckan-2.9.11 # 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 336d7bc..a3047b8 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.10-focal +ENV IMAGE_TAG=2.9.11-focal # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.9.10 +ENV GIT_BRANCH=ckan-2.9.11 # Set timezone ENV TZ=UTC From e2ab81e7b7340570292f4e6b374bf4921e347838 Mon Sep 17 00:00:00 2001 From: "stojanovskis1@icloud.com" Date: Wed, 13 Mar 2024 14:12:46 +0100 Subject: [PATCH 2/5] change version in compose and in examples --- compose/2.10/docker-compose.yml | 2 +- compose/2.9/.ckan-env | 2 +- compose/2.9/.env | 2 +- compose/2.9/solr8/ckan_init_solr.sh | 2 +- examples/harvest/.ckan-env | 2 +- examples/harvest/.env | 2 +- examples/harvest/Dockerfile | 4 ++-- examples/s3filestore/.ckan-env | 2 +- examples/s3filestore/.env | 2 +- examples/s3filestore/Dockerfile | 4 ++-- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/compose/2.10/docker-compose.yml b/compose/2.10/docker-compose.yml index 00b40d2..b622f98 100644 --- a/compose/2.10/docker-compose.yml +++ b/compose/2.10/docker-compose.yml @@ -9,7 +9,7 @@ volumes: services: ckan: container_name: ckan - image: ghcr.io/keitaroinc/ckan:2.10.2 + image: ghcr.io/keitaroinc/ckan:2.10.4 networks: - frontend - backend diff --git a/compose/2.9/.ckan-env b/compose/2.9/.ckan-env index 98a0198..c264a1c 100644 --- a/compose/2.9/.ckan-env +++ b/compose/2.9/.ckan-env @@ -36,5 +36,5 @@ CKAN__DATAPUSHER__URL=http://datapusher:8000 CKAN__DATAPUSHER__CALLBACK_URL_BASE=http://ckan:5000/ # Solr configuration -CKAN_VERSION=2.9.9 +CKAN_VERSION=2.9.11 CKAN_CORE_NAME=ckan diff --git a/compose/2.9/.env b/compose/2.9/.env index d07bbb5..2eba8d0 100644 --- a/compose/2.9/.env +++ b/compose/2.9/.env @@ -12,7 +12,7 @@ POSTGRES_PORT=5432 DATASTORE_READONLY_PASSWORD=datastore # CKAN -CKAN_VERSION=2.9.9 +CKAN_VERSION=2.9.11 CKAN_SITE_ID=default CKAN_SITE_URL=http://localhost:5000 CKAN_PORT=5000 diff --git a/compose/2.9/solr8/ckan_init_solr.sh b/compose/2.9/solr8/ckan_init_solr.sh index 1e1339e..1f8d0c9 100755 --- a/compose/2.9/solr8/ckan_init_solr.sh +++ b/compose/2.9/solr8/ckan_init_solr.sh @@ -4,7 +4,7 @@ # Arguments are supplied via environment variables: CKAN_CORE_NAME CKAN_VERSION # Example: # CKAN_CORE_NAME=ckan -# CKAN_VERSION=2.9.9 +# CKAN_VERSION=2.9.11 set -e diff --git a/examples/harvest/.ckan-env b/examples/harvest/.ckan-env index e8ae538..5e19ef0 100644 --- a/examples/harvest/.ckan-env +++ b/examples/harvest/.ckan-env @@ -33,5 +33,5 @@ CKAN__HARVEST__MQ__TYPE=redis CKAN__HARVEST__MQ__HOSTNAME=redis # Solr configuration -CKAN_VERSION=2.9.9 +CKAN_VERSION=2.9.11 CKAN_CORE_NAME=ckan diff --git a/examples/harvest/.env b/examples/harvest/.env index d07bbb5..2eba8d0 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.9 +CKAN_VERSION=2.9.11 CKAN_SITE_ID=default CKAN_SITE_URL=http://localhost:5000 CKAN_PORT=5000 diff --git a/examples/harvest/Dockerfile b/examples/harvest/Dockerfile index 2ff4b5d..302bd89 100644 --- a/examples/harvest/Dockerfile +++ b/examples/harvest/Dockerfile @@ -1,7 +1,7 @@ ################### ### Extensions #### ################### -FROM ghcr.io/keitaroinc/ckan:2.9.9 as extbuild +FROM ghcr.io/keitaroinc/ckan:2.9.11 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.9 +FROM ghcr.io/keitaroinc/ckan:2.9.11 LABEL maintainer="Keitaro Inc " diff --git a/examples/s3filestore/.ckan-env b/examples/s3filestore/.ckan-env index 90148d1..b20ccf2 100644 --- a/examples/s3filestore/.ckan-env +++ b/examples/s3filestore/.ckan-env @@ -38,5 +38,5 @@ CKANEXT__S3FILESTORE__REGION_NAME=us-east-1 CKANEXT__S3FILESTORE__SIGNATURE_VERSION=s3v4 # Solr configuration -CKAN_VERSION=2.9.9 +CKAN_VERSION=2.9.11 CKAN_CORE_NAME=ckan diff --git a/examples/s3filestore/.env b/examples/s3filestore/.env index d07bbb5..2eba8d0 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.9 +CKAN_VERSION=2.9.11 CKAN_SITE_ID=default CKAN_SITE_URL=http://localhost:5000 CKAN_PORT=5000 diff --git a/examples/s3filestore/Dockerfile b/examples/s3filestore/Dockerfile index f6487dd..b4f05d0 100644 --- a/examples/s3filestore/Dockerfile +++ b/examples/s3filestore/Dockerfile @@ -1,7 +1,7 @@ ################### ### Extensions #### ################### -FROM ghcr.io/keitaroinc/ckan:2.9.9 as extbuild +FROM ghcr.io/keitaroinc/ckan:2.9.11 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.9 +FROM ghcr.io/keitaroinc/ckan:2.9.11 LABEL maintainer="Keitaro Inc " From f51a4801672c4e756ae4c1aa96bfe44c35b243db Mon Sep 17 00:00:00 2001 From: Kiril-Poposki1998 Date: Wed, 13 Mar 2024 14:25:56 +0100 Subject: [PATCH 3/5] add variable to docker-compose --- compose/2.10/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/2.10/docker-compose.yml b/compose/2.10/docker-compose.yml index b622f98..091a3e4 100644 --- a/compose/2.10/docker-compose.yml +++ b/compose/2.10/docker-compose.yml @@ -9,7 +9,7 @@ volumes: services: ckan: container_name: ckan - image: ghcr.io/keitaroinc/ckan:2.10.4 + image: ghcr.io/keitaroinc/ckan:${CKAN_VERSION} networks: - frontend - backend From 260c77752b82304288693ccdee5b2bdfb35ff7ca Mon Sep 17 00:00:00 2001 From: "stojanovskis1@icloud.com" Date: Wed, 13 Mar 2024 14:27:45 +0100 Subject: [PATCH 4/5] changed version in .env --- compose/2.10/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/2.10/.env b/compose/2.10/.env index b9e1c2d..d8f5ef1 100644 --- a/compose/2.10/.env +++ b/compose/2.10/.env @@ -12,7 +12,7 @@ POSTGRES_PORT=5432 DATASTORE_READONLY_PASSWORD=datastore # CKAN -CKAN_VERSION=2.10 +CKAN_VERSION=2.10.4 CKAN_SITE_ID=default CKAN_SITE_URL=http://localhost:5000 CKAN_PORT=5000 From f696c00a047a5561f8d72e354ceacc7cf1f180a5 Mon Sep 17 00:00:00 2001 From: Kiril-Poposki1998 Date: Wed, 13 Mar 2024 15:03:57 +0100 Subject: [PATCH 5/5] fix solr schema download --- compose/2.10/solr8/ckan_init_solr.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/compose/2.10/solr8/ckan_init_solr.sh b/compose/2.10/solr8/ckan_init_solr.sh index 296d52b..091450f 100755 --- a/compose/2.10/solr8/ckan_init_solr.sh +++ b/compose/2.10/solr8/ckan_init_solr.sh @@ -8,7 +8,10 @@ set -e -CKAN_SOLR_SCHEMA_URL=https://raw.githubusercontent.com/ckan/ckan/$CKAN_VERSION/ckan/config/solr/schema.xml +MAJOR_VERSION=`echo $CKAN_VERSION | cut -d "." -f 1` +MINOR_VERSION=`echo $CKAN_VERSION | cut -d "." -f 2` + +CKAN_SOLR_SCHEMA_URL=https://raw.githubusercontent.com/ckan/ckan/`echo $MAJOR_VERSION.$MINOR_VERSION`/ckan/config/solr/schema.xml echo "Check whether managed schema exists for CKAN $CKAN_VERSION" if ! curl --output /dev/null --silent --head --fail "$CKAN_SOLR_SCHEMA_URL"; then