From 060a72d190daf5295f8f9ec9fc877bd059b95798 Mon Sep 17 00:00:00 2001 From: Kiril-Poposki1998 Date: Wed, 11 Dec 2024 13:35:57 +0100 Subject: [PATCH 1/2] Add 2.11.1 and 2.10.6 versions --- compose/2.10/.env | 2 +- images/ckan/2.10/Dockerfile | 4 ++-- images/ckan/2.10/Dockerfile.focal | 4 ++-- images/ckan/2.10/Dockerfile.xloader | 4 ++-- images/ckan/2.11/Dockerfile | 4 ++-- images/ckan/2.11/Dockerfile.focal | 4 ++-- images/ckan/2.11/Dockerfile.xloader | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/compose/2.10/.env b/compose/2.10/.env index 742df69..4e72728 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.5 +CKAN_VERSION=2.10.6 CKAN_SITE_ID=default CKAN_SITE_URL=http://localhost:5000 CKAN_PORT=5000 diff --git a/images/ckan/2.10/Dockerfile b/images/ckan/2.10/Dockerfile index 484ce62..bd18b04 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.5 +ENV IMAGE_TAG=2.10.6 # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.10.5 +ENV GIT_BRANCH=ckan-2.10.6 # 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 5d618ee..a293a9a 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.5-focal +ENV IMAGE_TAG=2.10.6-focal # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.10.5 +ENV GIT_BRANCH=ckan-2.10.6 # Set timezone ENV TZ=UTC diff --git a/images/ckan/2.10/Dockerfile.xloader b/images/ckan/2.10/Dockerfile.xloader index 3c9f1ee..1651387 100644 --- a/images/ckan/2.10/Dockerfile.xloader +++ b/images/ckan/2.10/Dockerfile.xloader @@ -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.5-xloader +ENV IMAGE_TAG=2.10.6-xloader # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.10.5 +ENV GIT_BRANCH=ckan-2.10.6 # Set src dirs ENV SRC_DIR=/srv/app/src diff --git a/images/ckan/2.11/Dockerfile b/images/ckan/2.11/Dockerfile index 0b0142c..012a0ac 100644 --- a/images/ckan/2.11/Dockerfile +++ b/images/ckan/2.11/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.11.0 +ENV IMAGE_TAG=2.11.1 # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.11.0 +ENV GIT_BRANCH=ckan-2.11.1 # Set src dirs ENV SRC_DIR=/srv/app/src diff --git a/images/ckan/2.11/Dockerfile.focal b/images/ckan/2.11/Dockerfile.focal index fdd3cca..7db3800 100644 --- a/images/ckan/2.11/Dockerfile.focal +++ b/images/ckan/2.11/Dockerfile.focal @@ -4,11 +4,11 @@ FROM ubuntu:focal-20240530 as ckanbuild # Used by Github Actions to tag the image with -ENV IMAGE_TAG=2.11.0-focal +ENV IMAGE_TAG=2.11.1-focal # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.11.0 +ENV GIT_BRANCH=ckan-2.11.1 # Set timezone ENV TZ=UTC diff --git a/images/ckan/2.11/Dockerfile.xloader b/images/ckan/2.11/Dockerfile.xloader index 07e18d4..f751a5d 100644 --- a/images/ckan/2.11/Dockerfile.xloader +++ b/images/ckan/2.11/Dockerfile.xloader @@ -4,11 +4,11 @@ FROM alpine:3.17.2 AS ckanbuild # Used by Github Actions to tag the image with -ENV IMAGE_TAG=2.11.0-xloader +ENV IMAGE_TAG=2.11.1-xloader # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.11.0 +ENV GIT_BRANCH=ckan-2.11.1 # Set src dirs ENV SRC_DIR=/srv/app/src From b161caef42b4905d8a1ec274497e92c2f9f0cc1b Mon Sep 17 00:00:00 2001 From: Kiril-Poposki1998 Date: Wed, 11 Dec 2024 13:41:52 +0100 Subject: [PATCH 2/2] Change version in .env --- compose/2.11/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/2.11/.env b/compose/2.11/.env index a0c157d..663663f 100644 --- a/compose/2.11/.env +++ b/compose/2.11/.env @@ -12,7 +12,7 @@ POSTGRES_PORT=5432 DATASTORE_READONLY_PASSWORD=datastore # CKAN -CKAN_VERSION=2.11.0 +CKAN_VERSION=2.11.1 CKAN_SITE_ID=default CKAN_SITE_URL=http://localhost:5000 CKAN_PORT=5000