feat(images/cnpg)!: update to postgres 17

.github/CODEOWNERS

@@ -1 +1 @@
-* @teutonet/oci-images
+* @teutonet/developer

.github/release-please/config.json

@@ -26,6 +26,24 @@
     },
     "images/solr-ckan": {
       "package-name": "solr-ckan"
+    },
+    "images/spilo": {
+      "package-name": "spilo"
+    },
+    "images/qgis-server": {
+      "package-name": "qgis-server"
+    },
+    "images/masterportal-v2": {
+      "package-name": "masterportal-v2"
+    },
+    "images/masterportal-v3": {
+      "package-name": "masterportal-v3"
+    },
+    "images/teuto-course": {
+      "package-name": "teuto-course"
+    },
+    "images/cnpg": {
+      "package-name": "cnpg"
     }
   }
-}
+}

.github/release-please/manifest.json

@@ -1 +1,11 @@
-{"images/ckan":"0.1.0","images/ckan-dcatapde":"0.1.0","images/solr-ckan":"0.1.0"}
+{
+  "images/ckan": "1.0.16",
+  "images/ckan-dcatapde": "1.0.15",
+  "images/solr-ckan": "1.0.29",
+  "images/spilo": "16.0.1",
+  "images/qgis-server": "3.22.21",
+  "images/masterportal-v2": "2.51.3",
+  "images/masterportal-v3": "3.4.19",
+  "images/teuto-course": "2.49.1",
+  "images/cnpg": "16.1.0"
+}

.github/release-please/platform.json

@@ -0,0 +1 @@
+{"images/ckan":"linux/amd64","images/ckan-dcatapde":"linux/amd64","images/solr-ckan":"linux/amd64,linux/arm64","images/spilo":"linux/amd64","images/qgis-server":"linux/amd64,linux/arm64","images/masterportal-v2":"linux/amd64,linux/arm64","images/masterportal-v3":"linux/amd64,linux/arm64","images/teuto-course":"linux/amd64","images/cnpg":"linux/amd64"}

.github/renovate.json

@@ -1,8 +1,10 @@
 {
   "extends": [
-    "config:best-practices"
+    "config:best-practices",
+    "github>teutonet/renovate-config:regex-managers"
   ],
   "addLabels": ["dependencies"],
+  "rebaseWhen": "conflicted",
   "packageRules": [
     {
       "matchUpdateTypes": ["minor", "patch", "pin", "digest"],

.github/scripts/sync-codeowners.sh

@@ -3,4 +3,5 @@
 [[ "$RUNNER_DEBUG" == 1 ]] && set -x
 [[ -o xtrace ]] && export RUNNER_DEBUG=1
 
-echo "* @teutonet/oci-images"
+echo "* @teutonet/developer"
+

.github/workflows/actionlint.yaml

@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     name: lint github workflows
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
       - name: Add problem matchers
         run: |
           # https://github.com/rhysd/actionlint/blob/3a2f2c7/docs/usage.md#problem-matchers
           curl -LO https://raw.githubusercontent.com/rhysd/actionlint/main/.github/actionlint-matcher.json
           echo "::add-matcher::actionlint-matcher.json"
-      - uses: docker://rhysd/actionlint:latest
+      - uses: docker://rhysd/actionlint:latest@sha256:b1934ee5f1c509618f2508e6eb47ee0d3520686341fec936f3b79331f9315667

.github/workflows/auto-assign-pr.yaml

@@ -9,4 +9,4 @@ jobs:
   auto-assign:
     runs-on: ubuntu-latest
     steps:
-      - uses: kentaro-m/auto-assign-action@v2.0.0
+      - uses: kentaro-m/auto-assign-action@a6d59add3a817df08cafa9b166367768d2c337f8 # v2.0.1

.github/workflows/conventional-commits.yaml

@@ -8,9 +8,11 @@ jobs:
     runs-on: ubuntu-latest
     name: check conventional commit compliance
     steps:
-      - uses: actions/checkout@main
+      - uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # main
         with:
           fetch-depth: 0
 
       - name: Conventional commits check
-        uses: oknozor/cocogitto-action@v3
+        uses: oknozor/cocogitto-action@390bda87a19bf627e03ad075c67a11e9ddbb7547 # v4
+        with:
+          command: check

.github/workflows/create-release-prs.yaml

@@ -12,14 +12,14 @@ jobs:
   createReleasePR:
     runs-on: ubuntu-latest
     steps:
-      - uses: googleapis/release-please-action@v4
+      - uses: googleapis/release-please-action@16a9c90856f42705d54a6fda1823352bdc62cf38 # v4
         with:
           skip-github-release: true
           token: ${{ secrets.ACTIONS_BOT_TOKEN }}
           config-file: .github/release-please/config.json
           manifest-file: .github/release-please/manifest.json
         id: release-please
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         if: ${{ steps.release-please.outputs.prs_created == 'true' }}
       - name: Set PRs to auto-merge
         if: ${{ steps.release-please.outputs.prs_created == 'true' }}

.github/workflows/release-image.yaml

@@ -18,7 +18,7 @@ jobs:
       releases_created: ${{ steps.release.outputs.releases_created }}
       paths_released: ${{ steps.release.outputs.paths_released }}
     steps:
-      - uses: googleapis/release-please-action@v4
+      - uses: googleapis/release-please-action@16a9c90856f42705d54a6fda1823352bdc62cf38 # v4
         id: release
         with:
           skip-github-pull-request: true
@@ -31,20 +31,12 @@ jobs:
     if: ${{ needs.release_please.outputs.releases_created }}
     strategy:
       matrix:
-        platform:
-          - linux/amd64
-          - linux/arm64
         image: ${{ fromJson(needs.release_please.outputs.paths_released) }}
-        exclude:
-          - image: images/ckan
-            platform: linux/arm64
-          - image: images/ckan-dcatapde
-            platform: linux/arm64
     steps:
       - name: Checkout
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Detect changes
-        uses: dorny/paths-filter@v3.0.2
+        uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
         id: filter
         with:
           filters: |
@@ -58,8 +50,11 @@ jobs:
       - name: Get image version
         id: get-image-version
         run: echo "version=$(jq -r '."${{ matrix.image }}"' < .github/release-please/manifest.json)" >> "$GITHUB_OUTPUT"
+      - name: Get image platform
+        id: get-image-platform
+        run: echo "platform=$(jq -r '."${{ matrix.image }}"' < .github/release-please/platform.json)" >> "$GITHUB_OUTPUT"
       - name: Docker Metadata
-        uses: docker/metadata-action@v5.5.1
+        uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
         id: meta
         with:
           images: ${{ format('{0}/{1}/{2}', env.REGISTRY ,'teutonet/oci-images', steps.get-image-name.outputs.fragment ) }}
@@ -71,21 +66,21 @@ jobs:
             type=semver,pattern={{version}},value=${{ steps.get-image-version.outputs.version }}
             type=sha,prefix=
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.0.0
+        uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
       - name: Set up Docker BuildX
-        uses: docker/setup-buildx-action@v3.3.0
+        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
         id: push
-        uses: docker/build-push-action@v5.3.0
+        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
         with:
           context: ${{ matrix.image }}
-          platforms: ${{ matrix.platform }}
+          platforms: ${{ steps.get-image-platform.outputs.platform }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           push: ${{ github.event_name != 'pull_request' }}

.github/workflows/update-codeowners.yaml

@@ -10,16 +10,16 @@ on:
 
 jobs:
   generateCodeowners:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: generate CODEOWNERS
         run: ./.github/scripts/sync-codeowners.sh > .github/CODEOWNERS
 
       - name: Create PR
         id: create-pr
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8
         with:
           add-paths: |
             .github/CODEOWNERS

README.md

@@ -1,20 +1,21 @@
 # teuto.net OCI Images
 
-![Build](https://github.com/teutonet/oci-images/actions/workflows/build.yml/badge.svg)
+![Build](https://github.com/teutonet/oci-images/actions/workflows/release-image.yaml/badge.svg)
 
 ## Overview
 
 teuto.net OCI images.
 
 ## Description
 
-You can find published versions of these images on [Docker Hub](https://hub.docker.com/r/teutonet):
+You can find published versions of these images on [GitHub](https://github.com/orgs/teutonet/packages?repo_name=oci-images):
 
-| Image                                                                     | Stars                                                                       | Size                                                                                                  | Pulls                                                                       |
-|---------------------------------------------------------------------------|-----------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------|
-| [teutonet/ckan](https://hub.docker.com/r/teutonet/ckan)                   | ![Docker Stars](https://img.shields.io/docker/stars/teutonet/ckan)          | ![Docker Image Size (latest semver)](https://img.shields.io/docker/image-size/teutonet/ckan)          | ![Docker Pulls](https://img.shields.io/docker/pulls/teutonet/ckan)          |
-| [teutonet/ckan-dcatapde](https://hub.docker.com/r/teutonet/ckan-dcatapde) | ![Docker Stars](https://img.shields.io/docker/stars/teutonet/ckan-dcatapde) | ![Docker Image Size (latest semver)](https://img.shields.io/docker/image-size/teutonet/ckan-dcatapde) | ![Docker Pulls](https://img.shields.io/docker/pulls/teutonet/ckan-dcatapde) |
-| [teutonet/solr-ckan](https://hub.docker.com/r/teutonet/solr-ckan)         | ![Docker Stars](https://img.shields.io/docker/stars/teutonet/solr-ckan)     | ![Docker Image Size (latest semver)](https://img.shields.io/docker/image-size/teutonet/solr-ckan)     | ![Docker Pulls](https://img.shields.io/docker/pulls/teutonet/solr-ckan)     |
+| Image                                                                     |Pulls                                                                       |
+|---------------------------------------------------------------------------|-----------------------------------------------------------------------------|
+| [teutonet/ckan](https://github.com/teutonet/oci-images/pkgs/container/oci-images%2Fckan)                  |   ![Docker Pulls](https://img.shields.io/github/downloads/teutonet/oci-images/ckan?logo=github)          |
+| [teutonet/ckan-dcatapde](https://github.com/teutonet/oci-images/pkgs/container/oci-images%2Fckan-dcatapde) |   ![Docker Pulls](https://img.shields.io/github/downloads/teutonet/oci-images/ckan-dcatapde?logo=github) |
+| [teutonet/solr-ckan](https://github.com/teutonet/oci-images/pkgs/container/oci-images%2Fsolr-ckan)        | ![Docker Pulls](https://img.shields.io/github/downloads/teutonet/oci-images/solr-ckan?logo=github)     |
+| [teutonet/spilo](https://github.com/teutonet/oci-images/pkgs/container/oci-images%2Fspilo )        | ![Docker Pulls](https://img.shields.io/github/downloads/teutonet/oci-images/spilo?logo=github)     |
 
 
 ## Changelog & Releases

images/ckan-dcatapde/CHANGELOG.md

@@ -0,0 +1,101 @@
+# Changelog
+
+## [1.0.15](https://github.com/teutonet/oci-images/compare/ckan-dcatapde-v1.0.14...ckan-dcatapde-v1.0.15) (2025-04-22)
+
+
+### Miscellaneous Chores
+
+* **deps:** update ckan/ckan-base:2.11.2 docker digest to c823a90 ([#254](https://github.com/teutonet/oci-images/issues/254)) ([4232cc1](https://github.com/teutonet/oci-images/commit/4232cc1ed94883902c5cc051772eb4d8fa237416))
+
+## [1.0.14](https://github.com/teutonet/oci-images/compare/ckan-dcatapde-v1.0.13...ckan-dcatapde-v1.0.14) (2025-02-10)
+
+
+### Miscellaneous Chores
+
+* **deps:** update ckan/ckan-base docker tag to v2.11.2 ([#209](https://github.com/teutonet/oci-images/issues/209)) ([4c02d2d](https://github.com/teutonet/oci-images/commit/4c02d2d3a25836e1d9f4af350f8a91f3b6198034))
+
+## [1.0.13](https://github.com/teutonet/oci-images/compare/ckan-dcatapde-v1.0.12...ckan-dcatapde-v1.0.13) (2025-01-03)
+
+
+### Miscellaneous Chores
+
+* **deps:** update ckan/ckan-base docker tag to v2.11.1 ([#179](https://github.com/teutonet/oci-images/issues/179)) ([a8c9515](https://github.com/teutonet/oci-images/commit/a8c951510882c3a3a2fc8f60b467bfe2e439aef8))
+
+## [1.0.12](https://github.com/teutonet/oci-images/compare/ckan-dcatapde-v1.0.11...ckan-dcatapde-v1.0.12) (2024-12-04)
+
+
+### Miscellaneous Chores
+
+* **ckan:** change methode to remove datapusher if api key is missing ([#175](https://github.com/teutonet/oci-images/issues/175)) ([d03967f](https://github.com/teutonet/oci-images/commit/d03967f1297be56bd750021140de2a40f3849a44))
+
+## [1.0.11](https://github.com/teutonet/oci-images/compare/ckan-dcatapde-v1.0.10...ckan-dcatapde-v1.0.11) (2024-12-03)
+
+
+### Miscellaneous Chores
+
+* **ckan:** auto deactivate datapusher if key is missing ([#172](https://github.com/teutonet/oci-images/issues/172)) ([a33fbae](https://github.com/teutonet/oci-images/commit/a33fbaef25e1dbaf4611400e5cf7468c4ea15d94))
+* **deps:** update ckan/ckan-base:2.11.0 docker digest to bae3f94 ([#164](https://github.com/teutonet/oci-images/issues/164)) ([a76b589](https://github.com/teutonet/oci-images/commit/a76b589c4d67d8a8f7fc693365080ac74f9a6d55))
+
+## [1.0.10](https://github.com/teutonet/oci-images/compare/ckan-dcatapde-v1.0.9...ckan-dcatapde-v1.0.10) (2024-11-20)
+
+
+### Miscellaneous Chores
+
+* **ckan:** update permissions and building ([#162](https://github.com/teutonet/oci-images/issues/162)) ([3dcd6af](https://github.com/teutonet/oci-images/commit/3dcd6af0396162018cdb648add2294026085ecb9))
+
+## [1.0.9](https://github.com/teutonet/oci-images/compare/ckan-dcatapde-v1.0.5...ckan-dcatapde-v1.0.6) (2024-11-13)
+
+
+### Miscellaneous Chores
+
+* **ckan:** update docker build to ckan 2.11 ([#137](https://github.com/teutonet/oci-images/issues/137)) ([5d86b97](https://github.com/teutonet/oci-images/commit/5d86b97363f84324fcd8314dc6a11758f82375d0))
+* **deps:** update ckan/ckan-base:2.11.0 docker digest to dc32715 ([#134](https://github.com/teutonet/oci-images/issues/134)) ([d9c7e26](https://github.com/teutonet/oci-images/commit/d9c7e2685ad0ff65a45ebe8675a035def747806d))
+
+## [1.0.5](https://github.com/teutonet/oci-images/compare/ckan-dcatapde-v1.0.4...ckan-dcatapde-v2.48.0) (2024-10-09)
+
+
+### Miscellaneous Chores
+
+* **deps:** update ckan/ckan-base:2.11.0 docker digest to 25f6291 ([#88](https://github.com/teutonet/oci-images/issues/88)) ([be0f617](https://github.com/teutonet/oci-images/commit/be0f61712935e390dee66ba4ac59d82d59d05cc5))
+* **main:** Set relese version ([#82](https://github.com/teutonet/oci-images/issues/82)) ([507ad38](https://github.com/teutonet/oci-images/commit/507ad38b081e0d8b5c0e4e2206c9b751cc141001))
+
+## [1.0.4](https://github.com/teutonet/oci-images/compare/ckan-dcatapde-v1.0.3...ckan-dcatapde-v1.0.4) (2024-08-29)
+
+
+### Miscellaneous Chores
+
+* **deps:** update ckan/ckan-base:2.11.0 docker digest to 0641aad ([#66](https://github.com/teutonet/oci-images/issues/66)) ([ceebf12](https://github.com/teutonet/oci-images/commit/ceebf12341f87b706da467e4d5a411ec4c39dec7))
+
+## [1.0.3](https://github.com/teutonet/oci-images/compare/ckan-dcatapde-v1.0.2...ckan-dcatapde-v1.0.3) (2024-08-21)
+
+
+### Miscellaneous Chores
+
+* **deps:** update ckan/ckan-base docker tag to v2.11.0 ([#62](https://github.com/teutonet/oci-images/issues/62)) ([a8c5091](https://github.com/teutonet/oci-images/commit/a8c50915856fb252b9c33384c4c01e2f3b77c9d6))
+
+## [1.0.2](https://github.com/teutonet/oci-images/compare/ckan-dcatapde-v1.0.1...ckan-dcatapde-v1.0.2) (2024-07-03)
+
+
+### Miscellaneous Chores
+
+* **deps:** update ckan/ckan-base:2.10.4 docker digest to 636e0aa ([8f8e5ec](https://github.com/teutonet/oci-images/commit/8f8e5ec75b61c7cc97497743691c7401c5b6953f))
+
+## [1.0.1](https://github.com/teutonet/oci-images/compare/ckan-dcatapde-v1.0.0...ckan-dcatapde-v1.0.1) (2024-06-27)
+
+
+### Miscellaneous Chores
+
+* **deps:** update ckan/ckan-base:2.10.4 docker digest to 83f67f4 ([2607189](https://github.com/teutonet/oci-images/commit/2607189d8350b1e481c24ce152133c5b29d257f7))
+
+## [1.0.0](https://github.com/teutonet/oci-images/compare/ckan-dcatapde-v0.1.0...ckan-dcatapde-v1.0.0) (2024-05-29)
+
+
+### Features
+
+* **ci:** initial repo setup ([8009c05](https://github.com/teutonet/oci-images/commit/8009c050a2ef05c2d1dd5c6406f6499064442b46))
+
+
+### Miscellaneous Chores
+
+* **deps:** pin dependencies ([#1](https://github.com/teutonet/oci-images/issues/1)) ([98fee24](https://github.com/teutonet/oci-images/commit/98fee2463e2464390affc4c52c3dbe95151ff5f6))
+* release 1.0.0 ([6be7255](https://github.com/teutonet/oci-images/commit/6be725545d58cb559c435c759af1f25b69743186))

images/ckan-dcatapde/Dockerfile

@@ -1,22 +1,35 @@
-FROM ckan/ckan-base:2.10.4
+FROM ckan/ckan-base:2.11.4@sha256:22139325158d49473d910d60256a7dc8437795949bf72507a90f3510f9065438
+
+USER root
 
 # Install any extensions needed by your CKAN instance
 # See Dockerfile.dev for more details and examples
-RUN pip3 install -e git+https://github.com/ckan/ckanext-dcat.git@v1.6.0#egg=ckanext-dcat
+
+# renovate: datasource=github-tags depName=ckan/ckanext-dcat extractVersion=^v(?<version>.*)$
+ARG CKANEXT_DCAT_VERSION=1.7.0
+
+RUN pip3 install -e git+https://github.com/ckan/ckanext-dcat.git@v${CKANEXT_DCAT_VERSION}#egg=ckanext-dcat
 RUN pip install -r ${SRC_DIR}/ckanext-dcat/requirements.txt
 
-RUN pip install -e git+https://github.com/ckan/ckanext-harvest.git@v1.5.6#egg=ckanext-harvest
+# renovate: datasource=github-tags depName=ckan/ckanext-harvest extractVersion=^v(?<version>.*)$
+ARG CKANEXT_HARVEST_VERSION=1.6.2
+
+RUN pip install -e git+https://github.com/ckan/ckanext-harvest.git@v${CKANEXT_HARVEST_VERSION}#egg=ckanext-harvest
 RUN pip install -r ${SRC_DIR}/ckanext-harvest/requirements.txt
 
-RUN pip3 install -e git+https://github.com/GovDataOfficial/ckanext-dcatde.git@6.7.0#egg=ckanext-dcatde
+# renovate: datasource=github-tags depName=GovDataOfficial/ckanext-dcatde
+ARG CKANEXT_DCATDE_VERSION=6.10.0
+
+RUN pip3 install -e git+https://github.com/GovDataOfficial/ckanext-dcatde.git@${CKANEXT_DCATDE_VERSION}#egg=ckanext-dcatde
 RUN cd ${SRC_DIR}/ckanext-dcatde \
     pip install -r base-requirements.txt -f requirements \
     python setup.py develop
 
 # Copy custom initialization scripts
-COPY docker-entrypoint.d/* /docker-entrypoint.d/
+COPY --chown=ckan:ckan-sys docker-entrypoint.d/02_setup_dcat.sh /docker-entrypoint.d/02_setup_dcat.sh
 
-COPY setup/prerun.py.override ${APP_DIR}/prerun.py
+COPY --chown=ckan:ckan-sys setup/prerun.py.override ${APP_DIR}/prerun.py
+COPY --chown=ckan:ckan-sys setup/start_ckan.sh.override ${APP_DIR}/start_ckan.sh
 
 RUN chown -R ckan /srv/app/