Skip to content

Commit cc3cf42

Browse files
BWiboBWibo
authored
Merge pull request #77 from tum-gis/feature/dockerfile-updates
CKAN 2.11.2
2 parents 53c4f3e + e1dbb61 commit cc3cf42

10 files changed

Lines changed: 33 additions & 33 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77
For releases `< 1.0.0` minor version steps may indicate breaking changes too.
88

9+
## [3.1.0] - 2025-04-08
10+
11+
### Changed
12+
13+
- Bump CKAN version `2.11.1` -> `2.11.2`
14+
- Bump `ckanext-relation` `1.1.0` -> `1.1.1`
15+
16+
### Remove
17+
18+
- Removed `ckanext-envvars` as it is shipped with base image
19+
920
## [3.0.1] - 2025-04-04
1021

1122
### Changed
@@ -259,7 +270,8 @@ for production environments.**
259270

260271
### Known issues
261272

262-
[Unreleased]: https://github.com/tum-gis/ckan-docker/compare/3.0.1...HEAD
273+
[Unreleased]: https://github.com/tum-gis/ckan-docker/compare/3.1.0...HEAD
274+
[3.1.0]: https://github.com/tum-gis/ckan-docker/compare/3.0.1...3.1.0
263275
[3.0.1]: https://github.com/tum-gis/ckan-docker/compare/3.0.0...3.0.1
264276
[3.0.0]: https://github.com/tum-gis/ckan-docker/compare/2.1.2...3.0.0
265277
[2.1.2]: https://github.com/tum-gis/ckan-docker/compare/2.1.1...2.1.2

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ This registry will be cleared periodically.
146146

147147
### CKAN and CKAN extension versions
148148

149-
CKAN version: `2.11.1`
150-
CKAN base image: `ckan/ckan-base:2.11.1`
149+
CKAN version: `2.11.2`
150+
CKAN base image: `ckan/ckan-base:2.11.2`
151151

152152
The CKAN catalog platform uses several extensions to provide the functionality
153153
needed for the SDDI concept. The table below lists the included extensions with
@@ -168,7 +168,7 @@ are alway pinned to a stable release number or commit hash.
168168
| [`ckanext-geoview` ](https://github.com/ckan/ckanext-geoview) | `v0.2.2` |:heavy_check_mark: |:heavy_check_mark: | Configure and share CKAN dataset metadata forms. |
169169
| [`ckanext-clamav` ](https://github.com/mutantsan/ckanext-clamav) | `a1d23ac` |:heavy_check_mark: | :heavy_check_mark: |CKAN extension that integrates ClamAV antivirus scanning to ensure the security of uploaded files by automatically checking them for malware.|
170170
| [`ckanext-dcat` ](https://github.com/ckan/ckanext-dcat ) | `v1.5.1` |:heavy_check_mark: | :heavy_check_mark: |Allow CKAN to expose and consume metadata from other catalogs using RDF documents serialized using DCAT.|
171-
| [`ckanext-relation-sddi`](https://github.com/tum-gis/ckanext-relation-sddi ) | `1.1.0` | | :heavy_check_mark: | Enables to create and visualize different types of relations (*realated_to*, *depends_on*, *part_of*) between catalog entries. |
171+
| [`ckanext-relation-sddi`](https://github.com/tum-gis/ckanext-relation-sddi ) | `1.1.1` | | :heavy_check_mark: | Enables to create and visualize different types of relations (*realated_to*, *depends_on*, *part_of*) between catalog entries. |
172172
| [`ckanext-datesearch`](https://github.com/MarijaKnezevic/ckanext-datesearch) | `1.1.0`|| :heavy_check_mark: | Provides the ability to search for datasets according to a given time frame. The search includes all datasets, in which the time of validity overlaps in at least one second with the search time frame. |
173173
| [`ckanext-spatial`](https://github.com/ckan/ckanext-spatial) | `v2.3.0` | |:heavy_check_mark: | Enables geospatial capabilities to CKAN instance. |
174174
| [`ckanext-scheme-sddi`](https://github.com/MarijaKnezevic/ckanext-scheme-sddi) | `0.0.1` || :heavy_check_mark: | This plugin is extending CKAN schema definition, validation, and custom field support accordingly to SDDI needs. |

‎build-noCache.sh‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,8 @@ docker build . \
3535
# sddi:TAG-debug
3636
docker build . \
3737
--no-cache \
38-
--build-arg "BASEIMAGE_REPOSITORY=$IMAGE_REPOSITORY/ckan-sddi-base" \
39-
--build-arg BASEIMAGE_VERSION=${IMAGE_TAG}-debug \
38+
--build-arg "BASEIMAGE_REPOSITORY=$IMAGE_REPOSITORY/ckan-sddi" \
39+
--build-arg BASEIMAGE_VERSION=${IMAGE_TAG} \
4040
-t "$IMAGE_REPOSITORY/ckan-sddi:${IMAGE_TAG}-debug"
4141

4242
printf "\n\n"
43-

‎build-push-noCache.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ docker push "$IMAGE_REPOSITORY/ckan-sddi:${IMAGE_TAG}"
4040
# sddi:TAG-debug
4141
docker build . \
4242
--no-cache \
43-
--build-arg "BASEIMAGE_REPOSITORY=$IMAGE_REPOSITORY/ckan-sddi-base" \
44-
--build-arg BASEIMAGE_VERSION=${IMAGE_TAG}-debug \
43+
--build-arg "BASEIMAGE_REPOSITORY=$IMAGE_REPOSITORY/ckan-sddi" \
44+
--build-arg BASEIMAGE_VERSION=${IMAGE_TAG} \
4545
-t "$IMAGE_REPOSITORY/ckan-sddi:${IMAGE_TAG}-debug"
4646

4747
docker push "$IMAGE_REPOSITORY/ckan-sddi:${IMAGE_TAG}-debug"

‎build-push.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ docker push "$IMAGE_REPOSITORY/ckan-sddi:${IMAGE_TAG}"
3636

3737
# sddi:TAG-debug
3838
docker build . \
39-
--build-arg "BASEIMAGE_REPOSITORY=$IMAGE_REPOSITORY/ckan-sddi-base" \
40-
--build-arg BASEIMAGE_VERSION=${IMAGE_TAG}-debug \
39+
--build-arg "BASEIMAGE_REPOSITORY=$IMAGE_REPOSITORY/ckan-sddi" \
40+
--build-arg BASEIMAGE_VERSION=${IMAGE_TAG} \
4141
-t "$IMAGE_REPOSITORY/ckan-sddi:${IMAGE_TAG}-debug"
4242

4343
docker push "$IMAGE_REPOSITORY/ckan-sddi:${IMAGE_TAG}-debug"

‎build.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ docker build . \
3131

3232
# sddi:TAG-debug
3333
docker build . \
34-
--build-arg "BASEIMAGE_REPOSITORY=$IMAGE_REPOSITORY/ckan-sddi-base" \
35-
--build-arg BASEIMAGE_VERSION=${IMAGE_TAG}-debug \
34+
--build-arg "BASEIMAGE_REPOSITORY=$IMAGE_REPOSITORY/ckan-sddi" \
35+
--build-arg BASEIMAGE_VERSION=${IMAGE_TAG} \
3636
-t "$IMAGE_REPOSITORY/ckan-sddi:${IMAGE_TAG}-debug"
3737

3838
printf "\n\n"

‎sddi-base/Dockerfile‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
###############################################################################
22
# Extbuild stage
33
###############################################################################
4-
ARG CKAN_VERSION_BUILD_STAGE=2.11.1
4+
ARG CKAN_VERSION=2.11.2
55

6-
FROM ckan/ckan-base:${CKAN_VERSION_BUILD_STAGE} as extbuild
6+
FROM ckan/ckan-base:${CKAN_VERSION} AS extbuild
77

88
USER root
99

@@ -35,13 +35,6 @@ RUN set -ex && \
3535
curl -o /wheels/ckanext-hierarchy.txt https://raw.githubusercontent.com/ckan/ckanext-hierarchy/${CKANEXT_HIERARCHY_VERSION}/requirements.txt && \
3636
ls -lah /wheels
3737

38-
# ckanext-envvars #############################################################
39-
ARG CKANEXT_ENVVARS_VERSION="v0.0.6"
40-
ENV CKANEXT_ENVVARS_VERSION=${CKANEXT_ENVVARS_VERSION}
41-
42-
RUN set -ex && \
43-
pip wheel --wheel-dir=/wheels git+https://github.com/ckan/ckanext-envvars.git@${CKANEXT_ENVVARS_VERSION}#egg=ckanext-envvars
44-
4538
# ckanext-scheming ############################################################
4639
ARG CKANEXT_SCHEMING_VERSION="27035f4"
4740
ENV CKANEXT_SCHEMING_VERSION=${CKANEXT_SCHEMING_VERSION}
@@ -90,7 +83,7 @@ RUN set -ex && \
9083
###############################################################################
9184
# Runtime stage
9285
###############################################################################
93-
FROM ckan/ckan-base:${CKAN_VERSION_BUILD_STAGE} as runtime
86+
FROM ckan/ckan-base:${CKAN_VERSION} AS runtime
9487

9588
ENV CKAN_DIR=${SRC_DIR}/ckan
9689
ENV DATA_DIR=/srv/app/data
@@ -142,10 +135,6 @@ RUN set -ex && \
142135
pip install --find-links=${APP_DIR}/ext_wheels -r ${APP_DIR}/ext_wheels/ckanext-hierarchy.txt && \
143136
pip install --no-index --find-links=${APP_DIR}/ext_wheels ckanext-hierarchy
144137

145-
# ckanext-envvars ############################################################
146-
RUN set -ex && \
147-
pip install --no-index --find-links=${APP_DIR}/ext_wheels ckanext-envvars
148-
149138
# ckanext-scheming ############################################################
150139
RUN set -ex && \
151140
pip install --no-index --find-links=${APP_DIR}/ext_wheels ckanext-scheming

‎sddi-base/Dockerfile.debug‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG BASEIMAGE_VERSION=edge
33

44
FROM ${BASEIMAGE_REPOSITORY}:${BASEIMAGE_VERSION}
55

6-
ARG CKAN_VERSION=2.11.1
6+
ARG CKAN_VERSION=2.11.2
77
ENV CKAN_VERSION=${CKAN_VERSION}
88

99
USER root

‎sddi/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
###############################################################################
44
ARG BASEIMAGE_REPOSITORY=ghcr.io/tum-gis/ckan-sddi-base
55
ARG BASEIMAGE_VERSION=latest
6-
ARG CKAN_VERSION_BUILD_STAGE=2.11.1
6+
ARG CKAN_VERSION=2.11.2
77

8-
FROM ckan/ckan-base:${CKAN_VERSION_BUILD_STAGE} as extbuild
8+
FROM ckan/ckan-base:${CKAN_VERSION} AS extbuild
99

1010
USER root
1111

@@ -26,7 +26,7 @@ RUN apt-get update && apt-get install -y \
2626
RUN pip install -U markupsafe==2.0.1 sqlalchemy==1.4.41
2727

2828
# ckanext-relation ############################################################
29-
ARG CKANEXT_RELATION_VERSION="1.1.0"
29+
ARG CKANEXT_RELATION_VERSION="1.1.1"
3030
ENV CKANEXT_RELATION_VERSION=${CKANEXT_RELATION_VERSION}
3131

3232
RUN set -ex && \
@@ -84,7 +84,7 @@ RUN set -ex && \
8484
###############################################################################
8585
# Runtime stage
8686
###############################################################################
87-
FROM ${BASEIMAGE_REPOSITORY}:${BASEIMAGE_VERSION}
87+
FROM ${BASEIMAGE_REPOSITORY}:${BASEIMAGE_VERSION} AS runtime
8888

8989
ENV CKAN_DIR=${SRC_DIR}/ckan
9090
ENV DATA_DIR=/srv/app/data

‎sddi/Dockerfile.debug‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG BASEIMAGE_VERSION=edge
33

44
FROM ${BASEIMAGE_REPOSITORY}:${BASEIMAGE_VERSION}
55

6-
ARG CKAN_VERSION=2.11.1
6+
ARG CKAN_VERSION=2.11.2
77
ENV CKAN_VERSION=${CKAN_VERSION}
88

99
USER root

0 commit comments

Comments
 (0)