Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit f6e679f

Browse files
amercaderamercader
authored
Merge pull request #108 from ckan/patch-releases-feb-2025
Patch releases 2.10.7 and 2.11.8
2 parents 2b3d885 + 3c33041 commit f6e679f

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

‎.github/workflows/reusable-build-and-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: Read version from VERSION file
4646
run: |
4747
VERSION_VALUE=$(cat "ckan-${{ inputs.ckan-major-version }}/VERSION.txt")
48-
if [[ $VERSION_VALUE != "master" ]]; then VERSION_VALUE="ckan-$VERSION_VALUE"; fi
48+
if [[ $VERSION_VALUE != "master" && $VERSION_VALUE != dev* ]]; then VERSION_VALUE="ckan-$VERSION_VALUE"; fi
4949
echo "Using ref $VERSION_VALUE in next steps"
5050
echo "CKAN_REF=$VERSION_VALUE" >> $GITHUB_ENV
5151

‎README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ The following CKAN versions are available in base or dev forms. They are disting
1010

1111
| CKAN Version | Type | Base image | Docker tag | Notes |
1212
| --- | --- | --- | --- | --- |
13-
| **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` | |
14-
| **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` | |
15-
| 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` | |
16-
| 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` | |
17-
| 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 |
18-
| 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 |
13+
| **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` | |
14+
| **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` | |
15+
| 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` | |
16+
| 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` | |
17+
| 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 |
18+
| 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 |
1919
| 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` | |
2020
| 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` | |
2121
| 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:
3838
```
3939
ckan-X.XX
4040
├── Dockerfile # Dockerfile for the image (in older versions there might be one for alpine and one for python)
41-
├── VERSION.txt # Full CKAN version built (eg. 2.11.1, 2.10.6)
41+
├── VERSION.txt # Full CKAN version built (eg. 2.11.2, 2.10.7)
4242
├── PYTHON_VERSION.txt # Python version used (eg. 3.10)
4343
└── setup # Setup scripts used by the images
4444
   ├── prerun.py

‎build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set_vars() {
1212
python_dockerfile=Dockerfile.py$python_version
1313
tag_name="ckan/ckan-$env:$ckan_version"
1414
python_tag_name="ckan/ckan-$env:$ckan_version-py$python_version"
15-
if [ "$ckan_version" = "master" ]; then
15+
if [[ "$ckan_version" == "master" || "$ckan_version" == dev* ]]; then
1616
ckan_tag=$ckan_version
1717
alt_tag_name=$tag_name
1818
python_alt_tag_name=$python_tag_name

‎ckan-2.10/VERSION.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.10.6
1+
2.10.7

‎ckan-2.11/VERSION.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.11.1
1+
2.11.2

0 commit comments

Comments
 (0)