From 7557faec86c2385457b98badb4b5d972232e82aa Mon Sep 17 00:00:00 2001 From: b-a0 <25707742+b-a0@users.noreply.github.com> Date: Tue, 13 Jun 2023 13:20:01 +0200 Subject: [PATCH] Change version reference in examples and .env files. --- 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 | 18 +++++++++--------- examples/s3filestore/.ckan-env | 2 +- examples/s3filestore/.env | 2 +- examples/s3filestore/Dockerfile | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/compose/2.9/.ckan-env b/compose/2.9/.ckan-env index 250b161..98a0198 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.8 +CKAN_VERSION=2.9.9 CKAN_CORE_NAME=ckan diff --git a/compose/2.9/.env b/compose/2.9/.env index 1765a6b..d07bbb5 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.8 +CKAN_VERSION=2.9.9 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 680a1fa..1e1339e 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.8 +# CKAN_VERSION=2.9.9 set -e diff --git a/examples/harvest/.ckan-env b/examples/harvest/.ckan-env index b745b6f..e8ae538 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.8 +CKAN_VERSION=2.9.9 CKAN_CORE_NAME=ckan diff --git a/examples/harvest/.env b/examples/harvest/.env index 1765a6b..d07bbb5 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.8 +CKAN_VERSION=2.9.9 CKAN_SITE_ID=default CKAN_SITE_URL=http://localhost:5000 CKAN_PORT=5000 diff --git a/examples/harvest/Dockerfile b/examples/harvest/Dockerfile index 3a2c008..2ff4b5d 100644 --- a/examples/harvest/Dockerfile +++ b/examples/harvest/Dockerfile @@ -1,7 +1,7 @@ ################### ### Extensions #### ################### -FROM ghcr.io/keitaroinc/ckan:2.9.8 as extbuild +FROM ghcr.io/keitaroinc/ckan:2.9.9 as extbuild # Locations and tags, please use specific tags or revisions ENV HARVEST_GIT_URL=https://github.com/ckan/ckanext-harvest @@ -12,13 +12,13 @@ USER root # Install necessary packages to build extensions RUN apk add --no-cache \ - python3-dev \ - gcc \ - g++ \ - libffi-dev \ - openssl-dev \ - rust \ - cargo + python3-dev \ + gcc \ + g++ \ + libffi-dev \ + openssl-dev \ + rust \ + cargo # Fetch and build the custom CKAN extensions RUN pip wheel --wheel-dir=/wheels git+${HARVEST_GIT_URL}@${HARVEST_GIT_BRANCH}#egg=ckanext-harvest @@ -30,7 +30,7 @@ USER ckan ############ ### MAIN ### ############ -FROM ghcr.io/keitaroinc/ckan:2.9.8 +FROM ghcr.io/keitaroinc/ckan:2.9.9 LABEL maintainer="Keitaro Inc " diff --git a/examples/s3filestore/.ckan-env b/examples/s3filestore/.ckan-env index 2800308..90148d1 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.8 +CKAN_VERSION=2.9.9 CKAN_CORE_NAME=ckan diff --git a/examples/s3filestore/.env b/examples/s3filestore/.env index 1765a6b..d07bbb5 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.8 +CKAN_VERSION=2.9.9 CKAN_SITE_ID=default CKAN_SITE_URL=http://localhost:5000 CKAN_PORT=5000 diff --git a/examples/s3filestore/Dockerfile b/examples/s3filestore/Dockerfile index 166952d..f6487dd 100644 --- a/examples/s3filestore/Dockerfile +++ b/examples/s3filestore/Dockerfile @@ -1,7 +1,7 @@ ################### ### Extensions #### ################### -FROM ghcr.io/keitaroinc/ckan:2.9.8 as extbuild +FROM ghcr.io/keitaroinc/ckan:2.9.9 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.8 +FROM ghcr.io/keitaroinc/ckan:2.9.9 LABEL maintainer="Keitaro Inc "