Merge pull request #128 from keitaroinc/new-release

new release ckan-2.9.11 & ckan-2.10.4
keitaroinc · Mar 13, 2024 · 674b127 · 674b127
2 parents e04af27 + f696c00
commit 674b127
Show file tree

Hide file tree

Showing 16 changed files with 25 additions and 22 deletions.
diff --git 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

diff --git 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:${CKAN_VERSION}
     networks:
       - frontend
       - backend

diff --git 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

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 <[email protected]>"
 

diff --git 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
@@ -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
@@ -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 <[email protected]>"
 

diff --git 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
@@ -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
@@ -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
@@ -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