From ece3e7c0d311e8b760418ffb81ca688e1f98fc53 Mon Sep 17 00:00:00 2001 From: "blagoja.stojkoski" Date: Wed, 26 Oct 2022 15:26:19 +0200 Subject: [PATCH] * updates images to 2.9.7 and 2.8.12 --- Readme.md | 8 ++++---- compose/2.8/.env | 2 +- .../solr/{solrconfig-2.8.11.xml => solrconfig-2.8.12.xml} | 0 .../solr/{solrconfig-2.9.6.xml => solrconfig-2.9.7.xml} | 0 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 ++-- 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 ++-- 17 files changed, 24 insertions(+), 24 deletions(-) rename compose/2.8/solr/{solrconfig-2.8.11.xml => solrconfig-2.8.12.xml} (100%) rename compose/2.8/solr/{solrconfig-2.9.6.xml => solrconfig-2.9.7.xml} (100%) diff --git a/Readme.md b/Readme.md index 1af3cf7..b3da9e0 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.6 as extbuild +FROM ghcr.io/keitaroinc/ckan:2.9.7 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.6 +FROM ghcr.io/keitaroinc/ckan:2.9.7 # 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.6 images/ckan/2.9 +docker build --tag ghcr.io/keitaroinc/ckan:2.9.7 images/ckan/2.9 ``` -The –-tag ghcr.io/keitaroinc/ckan:2.9.6 flag sets the image name to ghcr.io/keitaroinc/ckan:2.9.6 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.7 flag sets the image name to ghcr.io/keitaroinc/ckan:2.9.7 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/2.8/.env b/compose/2.8/.env index 2295d54..83b4c85 100644 --- a/compose/2.8/.env +++ b/compose/2.8/.env @@ -12,7 +12,7 @@ POSTGRES_PORT=5432 DATASTORE_READONLY_PASSWORD=datastore # CKAN -CKAN_VERSION=2.8.11 +CKAN_VERSION=2.8.12 CKAN_SITE_ID=default CKAN_SITE_URL=http://localhost:5000 CKAN_PORT=5000 diff --git a/compose/2.8/solr/solrconfig-2.8.11.xml b/compose/2.8/solr/solrconfig-2.8.12.xml similarity index 100% rename from compose/2.8/solr/solrconfig-2.8.11.xml rename to compose/2.8/solr/solrconfig-2.8.12.xml diff --git a/compose/2.8/solr/solrconfig-2.9.6.xml b/compose/2.8/solr/solrconfig-2.9.7.xml similarity index 100% rename from compose/2.8/solr/solrconfig-2.9.6.xml rename to compose/2.8/solr/solrconfig-2.9.7.xml diff --git a/compose/2.9/.ckan-env b/compose/2.9/.ckan-env index b09867b..d0b29c0 100644 --- a/compose/2.9/.ckan-env +++ b/compose/2.9/.ckan-env @@ -32,5 +32,5 @@ CKAN__DATAPUSHER__URL=http://datapusher:8000 CKAN__DATAPUSHER__CALLBACK_URL_BASE=http://ckan:5000/ # Solr configuration -CKAN_VERSION=2.9.6 +CKAN_VERSION=2.9.7 CKAN_CORE_NAME=ckan diff --git a/compose/2.9/.env b/compose/2.9/.env index 462393d..0780e0c 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.6 +CKAN_VERSION=2.9.7 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 8483fee..8ea06c3 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.6 +# CKAN_VERSION=2.9.7 set -e diff --git a/examples/harvest/.ckan-env b/examples/harvest/.ckan-env index 33bbc66..d8d32dd 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.6 +CKAN_VERSION=2.9.7 CKAN_CORE_NAME=ckan diff --git a/examples/harvest/.env b/examples/harvest/.env index 462393d..0780e0c 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.6 +CKAN_VERSION=2.9.7 CKAN_SITE_ID=default CKAN_SITE_URL=http://localhost:5000 CKAN_PORT=5000 diff --git a/examples/harvest/Dockerfile b/examples/harvest/Dockerfile index bcafd12..0071ba3 100644 --- a/examples/harvest/Dockerfile +++ b/examples/harvest/Dockerfile @@ -1,7 +1,7 @@ ################### ### Extensions #### ################### -FROM ghcr.io/keitaroinc/ckan:2.9.6 as extbuild +FROM ghcr.io/keitaroinc/ckan:2.9.7 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.6 +FROM ghcr.io/keitaroinc/ckan:2.9.7 LABEL maintainer="Keitaro Inc " diff --git a/examples/s3filestore/.ckan-env b/examples/s3filestore/.ckan-env index 918248a..24c883a 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.6 +CKAN_VERSION=2.9.7 CKAN_CORE_NAME=ckan diff --git a/examples/s3filestore/.env b/examples/s3filestore/.env index 462393d..0780e0c 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.6 +CKAN_VERSION=2.9.7 CKAN_SITE_ID=default CKAN_SITE_URL=http://localhost:5000 CKAN_PORT=5000 diff --git a/examples/s3filestore/Dockerfile b/examples/s3filestore/Dockerfile index 18798ef..dd030b5 100644 --- a/examples/s3filestore/Dockerfile +++ b/examples/s3filestore/Dockerfile @@ -1,7 +1,7 @@ ################### ### Extensions #### ################### -FROM ghcr.io/keitaroinc/ckan:2.9.6 as extbuild +FROM ghcr.io/keitaroinc/ckan:2.9.7 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.6 +FROM ghcr.io/keitaroinc/ckan:2.9.7 LABEL maintainer="Keitaro Inc " diff --git a/images/ckan/2.8/Dockerfile b/images/ckan/2.8/Dockerfile index c6d341a..4b66580 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.11 +ENV IMAGE_TAG=2.8.12 # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.8.11 +ENV GIT_BRANCH=ckan-2.8.12 # 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 02ee63e..2e1790f 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.11-focal +ENV IMAGE_TAG=2.8.12-focal # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.8.11 +ENV GIT_BRANCH=ckan-2.8.12 # Set timezone ENV TZ=UTC diff --git a/images/ckan/2.9/Dockerfile b/images/ckan/2.9/Dockerfile index c0ef0c2..ac23420 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.6 +ENV IMAGE_TAG=2.9.7 # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.9.6 +ENV GIT_BRANCH=ckan-2.9.7 # 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 3b5028c..369d7fd 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.6-focal +ENV IMAGE_TAG=2.9.7-focal # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.9.6 +ENV GIT_BRANCH=ckan-2.9.7 # Set timezone ENV TZ=UTC