Merge pull request #108 from ckan/patch-releases-feb-2025

Patch releases 2.10.7 and 2.11.8
ckan · Feb 5, 2025 · f6e679f · f6e679f
2 parents 2b3d885 + 3c33041
commit f6e679f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/reusable-build-and-test.yml b/.github/workflows/reusable-build-and-test.yml
@@ -45,7 +45,7 @@ jobs:
       - name: Read version from VERSION file
         run: |
           VERSION_VALUE=$(cat "ckan-${{ inputs.ckan-major-version }}/VERSION.txt")
-          if [[ $VERSION_VALUE != "master" ]]; then VERSION_VALUE="ckan-$VERSION_VALUE"; fi
+          if [[ $VERSION_VALUE != "master" && $VERSION_VALUE != dev* ]]; then VERSION_VALUE="ckan-$VERSION_VALUE"; fi
           echo "Using ref $VERSION_VALUE in next steps"
           echo "CKAN_REF=$VERSION_VALUE" >> $GITHUB_ENV
 

diff --git a/README.md b/README.md
@@ -10,12 +10,12 @@ The following CKAN versions are available in base or dev forms. They are disting
 
 | CKAN Version | Type |  Base image | Docker tag | Notes |
 | --- | --- | --- | --- | --- |
-| **2.11.x** | **base image** | `python:3.10-slim-bookworm` | `ckan/ckan-base:2.11`, `ckan/ckan-base:2.11.1`, `ckan/ckan-base:2.11-py3.10`, `ckan/ckan-base:2.11.1-py3.10`          |  |
-| **2.11.x** | **dev image**  | `python:3.10-slim-bookworm` | `ckan/ckan-dev:2.11`, `ckan/ckan-dev:2.11.1`, `ckan/ckan-dev:2.11-py3.10`, `ckan/ckan-dev:2.11.1-py3.10`            |  |
-| 2.10.x | base image | `python:3.10-slim-bookworm` | `ckan/ckan-base:2.10-py3.10`, `ckan/ckan-base:2.10.6-py3.10` |  |
-| 2.10.x | dev image  | `python:3.10-slim-bookworm` | `ckan/ckan-dev:2.10-py3.10`, `ckan/ckan-dev:2.10.6-py3.10`   |  |
-| 2.10.x | base image | `alpine:3.17`               | `ckan/ckan-base:2.10.6`, `ckan/ckan-base:2.10`               | :warning: Deprecated. Please use a Python/Debian based image |
-| 2.10.x | dev image  | `alpine:3.17`               | `ckan/ckan-dev:2.10.6`, `ckan/ckan-dev:2.10`                 | :warning: Deprecated. Please use a Python/Debian based image |
+| **2.11.x** | **base image** | `python:3.10-slim-bookworm` | `ckan/ckan-base:2.11`, `ckan/ckan-base:2.11.2`, `ckan/ckan-base:2.11-py3.10`, `ckan/ckan-base:2.11.2-py3.10`          |  |
+| **2.11.x** | **dev image**  | `python:3.10-slim-bookworm` | `ckan/ckan-dev:2.11`, `ckan/ckan-dev:2.11.2`, `ckan/ckan-dev:2.11-py3.10`, `ckan/ckan-dev:2.11.2-py3.10`            |  |
+| 2.10.x | base image | `python:3.10-slim-bookworm` | `ckan/ckan-base:2.10-py3.10`, `ckan/ckan-base:2.10.7-py3.10` |  |
+| 2.10.x | dev image  | `python:3.10-slim-bookworm` | `ckan/ckan-dev:2.10-py3.10`, `ckan/ckan-dev:2.10.7-py3.10`   |  |
+| 2.10.x | base image | `alpine:3.17`               | `ckan/ckan-base:2.10.7`, `ckan/ckan-base:2.10`               | :warning: Deprecated. Please use a Python/Debian based image |
+| 2.10.x | dev image  | `alpine:3.17`               | `ckan/ckan-dev:2.10.7`, `ckan/ckan-dev:2.10`                 | :warning: Deprecated. Please use a Python/Debian based image |
 | 2.9.x  | base image | `python:3.9-slim-bookworm`  | `ckan/ckan-base:2.9-py3.9`, `ckan/ckan-base:2.9.11-py3.9`    |  |
 | 2.9.x  | dev image  | `python:3.9-slim-bookworm`  | `ckan/ckan-dev:2.9-py3.9`, `ckan/ckan-dev:2.9.11-py3.9`      |  |
 | 2.9.x  | base image | `alpine:3.15`               | `ckan/ckan-base:2.9.11`, `ckan/ckan-base:2.9`                | :warning: Deprecated. Please use a Python/Debian based image |
@@ -38,7 +38,7 @@ Each CKAN version is located in separate repo containing:
 ```
 ckan-X.XX
 ├── Dockerfile          # Dockerfile for the image (in older versions there might be one for alpine and one for python)
-├── VERSION.txt         # Full CKAN version built (eg. 2.11.1, 2.10.6)
+├── VERSION.txt         # Full CKAN version built (eg. 2.11.2, 2.10.7)
 ├── PYTHON_VERSION.txt  # Python version used (eg. 3.10)
 └── setup               # Setup scripts used by the images
     ├── prerun.py

diff --git a/build.sh b/build.sh
@@ -12,7 +12,7 @@ set_vars() {
     python_dockerfile=Dockerfile.py$python_version
     tag_name="ckan/ckan-$env:$ckan_version"
     python_tag_name="ckan/ckan-$env:$ckan_version-py$python_version"
-    if [ "$ckan_version" = "master" ]; then
+    if [[ "$ckan_version" == "master" || "$ckan_version" == dev* ]]; then
         ckan_tag=$ckan_version
         alt_tag_name=$tag_name
         python_alt_tag_name=$python_tag_name

diff --git a/ckan-2.10/VERSION.txt b/ckan-2.10/VERSION.txt
@@ -1 +1 @@
-2.10.6
+2.10.7
diff --git a/ckan-2.11/VERSION.txt b/ckan-2.11/VERSION.txt
@@ -1 +1 @@
-2.11.1
+2.11.2