Skip to content

Commit

Permalink
Merge pull request #103 from ckan/patch-releases-20241211
Browse files Browse the repository at this point in the history
Patch releases 2.11.1 and 2.10.6
  • Loading branch information
amercader authored Dec 11, 2024
2 parents 9c1b721 + aa75e51 commit 2b3d885
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.0`, `ckan/ckan-base:2.11-py3.10`, `ckan/ckan-base:2.11.0-py3.10` | |
| **2.11.x** | **dev image** | `python:3.10-slim-bookworm` | `ckan/ckan-dev:2.11`, `ckan/ckan-dev:2.11.0`, `ckan/ckan-dev:2.11-py3.10`, `ckan/ckan-dev:2.11.0-py3.10` | |
| 2.10.x | base image | `python:3.10-slim-bookworm` | `ckan/ckan-base:2.10-py3.10`, `ckan/ckan-base:2.10.5-py3.10` | |
| 2.10.x | dev image | `python:3.10-slim-bookworm` | `ckan/ckan-dev:2.10-py3.10`, `ckan/ckan-dev:2.10.5-py3.10` | |
| 2.10.x | base image | `alpine:3.17` | `ckan/ckan-base:2.10.5`, `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.5`, `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.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.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 |
Expand All @@ -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.0, 2.10.5)
├── VERSION.txt # Full CKAN version built (eg. 2.11.1, 2.10.6)
├── PYTHON_VERSION.txt # Python version used (eg. 3.10)
└── setup # Setup scripts used by the images
   ├── prerun.py
Expand Down
2 changes: 1 addition & 1 deletion ckan-2.10/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.10.5
2.10.6
2 changes: 1 addition & 1 deletion ckan-2.11/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.11.0
2.11.1

0 comments on commit 2b3d885

Please sign in to comment.