Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
9f11777
feat: Upgrade to CKAN 2.11.0 official Docker image
aleksandralazoroska Nov 14, 2024
6330f99
Temporary removed locale installation
aleksandralazoroska Nov 15, 2024
7a66113
Changing permissions for apt install
aleksandralazoroska Nov 18, 2024
8dab8af
Fix ckan group name
aleksandralazoroska Nov 18, 2024
d4f80df
Update version for spatial extension
aleksandralazoroska Nov 22, 2024
49bfe7f
Upgrade to CKAN 2.11.1 official Docker image
aleksandralazoroska Dec 12, 2024
a99ce51
Added activity plugin
aleksandralazoroska Dec 16, 2024
7d9deb2
Updated ckanext-harvest extension to use update-manifest branch
aleksandralazoroska Jan 9, 2025
d9a9670
Updated sddi themes version
aleksandralazoroska Jan 13, 2025
c10ce58
Removed fortify extension from Dockerfile
aleksandralazoroska Jan 13, 2025
2541f45
Updated CKAN auth configurations
aleksandralazoroska Jan 14, 2025
57f6014
Removed user creation configuration settings and updated harvest exte…
aleksandralazoroska Jan 14, 2025
7bd958c
Temporarily disabled harvest plugin and updated datesearch version
aleksandralazoroska Jan 15, 2025
475c681
Temporarily disabled dcat harvesters
aleksandralazoroska Jan 15, 2025
efcca39
Updated sddi-theme extension version
aleksandralazoroska Jan 21, 2025
816dc9a
Revert sddi-theme extension changes to previous version
aleksandralazoroska Jan 21, 2025
8fc8e26
Add theme-sddi build trigger
aleksandralazoroska Jan 21, 2025
3a78c46
Updated extensions version and enable TOTP security
aleksandralazoroska Jan 23, 2025
da57130
Enable dcat and revert totp to false
ilchebedelovski Jan 25, 2025
014aa0f
CKAN security from a feature branch
ilchebedelovski Jan 25, 2025
96d3c58
Move 'security' before 'theme_sddi' in CKAN_PLUGINS
aleksandralazoroska Jan 29, 2025
2d07deb
Move security plugin after activity
aleksandralazoroska Jan 29, 2025
2023c35
Update theme extension to main version
aleksandralazoroska Jan 30, 2025
94da720
Remove comment for build trigger
aleksandralazoroska Jan 30, 2025
d8197dd
Add sddi build trigger
aleksandralazoroska Jan 31, 2025
8d9e1eb
Upgrade and versions
aleksandralazoroska Feb 4, 2025
27e660c
Upgrade ckanext-theme-sddi and ckanext-security versions
aleksandralazoroska Feb 4, 2025
6e6e6a2
Update README.md and version pinning
MarijaKnezevic Feb 4, 2025
3d7ce53
Update CHANGELOG.md
MarijaKnezevic Feb 4, 2025
c227be0
Delete sddi-social directory
MarijaKnezevic Feb 4, 2025
f502693
Update Dockerfile - Migration of functions from SDDI-Base to SDDI
MarijaKnezevic Feb 4, 2025
12009ec
Update Dockerfile – Keep plugins only for sddi-base
MarijaKnezevic Feb 4, 2025
27df545
Adding tracking
MarijaKnezevic Feb 13, 2025
33ea4fd
Update Security
MarijaKnezevic Feb 13, 2025
091feb5
CKAN build version solve
aleksandralazoroska Feb 14, 2025
2c85f3a
Add dev image cleanup workflow
BWibo Feb 12, 2025
3275b2f
fix multiline string issue
BWibo Feb 12, 2025
8206c2a
fix typo
BWibo Feb 12, 2025
0159b74
use env vars for image name
BWibo Feb 12, 2025
fcbcaf5
remove invalid submodule
BWibo Feb 15, 2025
b5ac136
Fix docker build sddi and removed sddi-social build
ilchebedelovski Feb 16, 2025
cd53862
Dockerfile debug version change
ilchebedelovski Feb 16, 2025
c096f11
Docker build debug mkdir docker-entrypoint
ilchebedelovski Feb 16, 2025
ad89d3e
Add base plugins
aleksandralazoroska Feb 17, 2025
c9a9cee
Remove sddi base plugins
aleksandralazoroska Feb 17, 2025
fe0d746
Removed symbolic link between python3 to python
aleksandralazoroska Feb 17, 2025
78bf0b9
Removed scheming config from sddi-base
aleksandralazoroska Feb 17, 2025
898ccdf
Update ckanext-security
MarijaKnezevic Feb 17, 2025
6cc217b
Update Dockerfile
MarijaKnezevic Feb 17, 2025
0e4e1d7
Update Dockerfile
MarijaKnezevic Feb 17, 2025
ba36c05
Update README.md
MarijaKnezevic Feb 17, 2025
796a8e8
Update Dockerfile
MarijaKnezevic Feb 17, 2025
3a3102a
Update Dockerfile
MarijaKnezevic Feb 17, 2025
e81e77e
Remove not used packages
ilchebedelovski Feb 17, 2025
d791bb8
Update Dockerfile
MarijaKnezevic Feb 18, 2025
096cf4d
Update sddi-base Dockerfile
aleksandralazoroska Feb 18, 2025
8200cf4
Update sddi-base Dockerfile
aleksandralazoroska Feb 18, 2025
7f52404
Update sddi Dockerfile
aleksandralazoroska Feb 18, 2025
8734506
Update sddi Dockerfile
aleksandralazoroska Feb 18, 2025
60519c3
minor change
BWibo Mar 19, 2025
43d138b
fix ckanext-hierarchy version
BWibo Mar 19, 2025
e8f0779
fix typo
BWibo Mar 19, 2025
118efcd
fix ckanext-clamav version
BWibo Mar 19, 2025
dd267e2
ckanext-spatial version
BWibo Mar 19, 2025
bd62424
fixed typo
BWibo Mar 19, 2025
02ba264
Configuration ini file path removed
ilchebedelovski Mar 19, 2025
456f06c
Remove commented pip install line
aleksandralazoroska Mar 20, 2025
c24c59a
Revert changes to configuration ini file path
aleksandralazoroska Mar 20, 2025
54d9959
Revert changes to configuration ini file path
aleksandralazoroska Mar 20, 2025
d600e27
ckanext-clamav version
MarijaKnezevic Mar 20, 2025
47fd18c
ckanext-clamav version
MarijaKnezevic Mar 20, 2025
f950c57
Revert changes to configuration ini file path
aleksandralazoroska Mar 20, 2025
f01bfdb
Remove pip install for markupsafe and sqlalchemy
aleksandralazoroska Mar 21, 2025
9d377bc
Update README.md
MarijaKnezevic Mar 21, 2025
de5a41b
Update CHANGELOG.md
MarijaKnezevic Mar 21, 2025
b258533
Merge pull request #71 from tum-gis/feature/ckan-2.11-upgrade-officia…
MarijaKnezevic Mar 21, 2025
84abc08
update workflow actions
BWibo Apr 2, 2025
965e611
fix wrong base image for sddi-debug
BWibo Apr 2, 2025
04f6896
Merge pull request #75 from tum-gis/fix/workflows
BWibo Apr 2, 2025
f686479
allow trigger workflows from Github.com
BWibo Apr 3, 2025
fe77f05
allow trigger workflow from Github.com
BWibo Apr 3, 2025
07952ec
update cleanup workflow
BWibo Apr 3, 2025
673b4d3
remove surplus setting for repo
BWibo Apr 3, 2025
03db597
fix package name
BWibo Apr 3, 2025
0a7be54
Allow manual dispatch with PR number
BWibo Apr 3, 2025
b4b16ba
Update workflow actions
BWibo Apr 3, 2025
f542ecf
build major version image only too
BWibo Apr 3, 2025
c1287f3
update labels
BWibo Apr 3, 2025
e49f4c9
update labels
BWibo Apr 3, 2025
db1e3ba
Merge pull request #76 from tum-gis/feature/workflow-updates
BWibo Apr 4, 2025
53c4f3e
3.0.1
BWibo Apr 4, 2025
17c8548
rename CKAN_VERSION ARG and stages naming
BWibo Apr 4, 2025
aa56ced
rename CKAN_VERSION arg
BWibo Apr 4, 2025
a95165c
ckan 2.11.2
BWibo Apr 6, 2025
26038cb
remove ckanext-envvars, it come with base image
BWibo Apr 7, 2025
5acf418
fix local build scripts
BWibo Apr 7, 2025
61ec269
3.1.0
BWibo Apr 9, 2025
519efca
Merge branch 'feature/dockerfile-updates' into devel
BWibo Apr 9, 2025
6c50920
ckanext-relation -> 1.1.1
BWibo Apr 9, 2025
e1dbb61
Merge branch 'feature/dockerfile-updates' into devel
BWibo Apr 9, 2025
cc3cf42
Merge pull request #77 from tum-gis/feature/dockerfile-updates
BWibo Apr 9, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 28 additions & 50 deletions .github/workflows/cleanup-dev-images.yml
Original file line number Diff line number Diff line change
@@ -1,58 +1,36 @@
name: Cleanup dev images of merged PRs

name: Cleanup Pull Request Images
on:
schedule:
- cron: "0 2 * * *" # Runs daily at 2 AM UTC
workflow_dispatch: # Allows manual triggering
pull_request:
types: [closed]
workflow_dispatch:
inputs:
pr-number:
description: 'Pull Request Number'
required: true
default: '0'

env:
IMAGE_NAME: ckan-sddi-dev
IMAGE_OWNER: ${{ github.repository_owner }}
PACKAGE_NAME: ckan-sddi-dev

jobs:
cleanup-ghcr:
ghcr-cleanup-image:
if: github.event_name == 'pull_request'
name: ghcr cleanup action
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Get Image Tags from GHCR
run: |
GHCR_API="https://ghcr.io/v2/$IMAGE_OWNER/$IMAGE_NAME/tags/list"
TAGS=$(curl -s -H "Authorization: Bearer $(echo ${{ secrets.GITHUB_TOKEN }} | base64)" "$GHCR_API" | jq -r '.tags[]')
echo "$TAGS" > tags_list.txt

- name: Identify Merged PRs
run: |
MAPPED_TAGS=()
while read -r TAG; do
if [[ $TAG =~ ^[a-zA-Z0-9]+-pr-(\d+)(?:-[a-f0-9]+)?$ ]]; then
PR_NUMBER=${BASH_REMATCH[1]}
RESPONSE=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
"https://api.github.com/repos/${{ github.repository }}/pulls/$PR_NUMBER")
MERGED=$(echo "$RESPONSE" | jq -r '.merged')
if [[ "$MERGED" == "true" ]]; then
MAPPED_TAGS+=("$TAG")
fi
fi
done < tags_list.txt
printf "%s\n" "${MAPPED_TAGS[@]}" > delete_tags.txt
echo "Images to be deleted:" && cat delete_tags.txt
- name: Delete image
uses: dataaxiom/ghcr-cleanup-action@v1
with:
delete-tags: "*pr-${{github.event.pull_request.number}}*"
package: ${{ env.PACKAGE_NAME }}

- name: Delete Merged PR Images
if: ${{ always() }}
run: |
if [ -s delete_tags.txt ]; then
echo "Deleting the following images:" && cat delete_tags.txt
while read -r TAG; do
DIGEST=$(curl -s -H "Authorization: Bearer $(echo ${{ secrets.GITHUB_TOKEN }} | base64)" \
-H "Accept: application/vnd.oci.image.manifest.v1+json" \
"https://ghcr.io/v2/$IMAGE_OWNER/$IMAGE_NAME/manifests/$TAG" | jq -r '.config.digest')
if [ "$DIGEST" != "null" ]; then
GHCR_DELETE_URL="https://ghcr.io/v2/$IMAGE_OWNER/$IMAGE_NAME/manifests/$DIGEST"
curl -X DELETE -H "Authorization: Bearer $(echo ${{ secrets.GITHUB_TOKEN }} | base64)" "$GHCR_DELETE_URL"
fi
done < delete_tags.txt
else
echo "No images to delete."
fi
ghcr-cleanup-image-manual:
if: github.event_name == 'workflow_dispatch'
name: ghcr cleanup action
runs-on: ubuntu-latest
steps:
- name: Delete image
uses: dataaxiom/ghcr-cleanup-action@v1
with:
delete-tags: "*pr-${{ inputs.pr-number }}*"
package: ${{ env.PACKAGE_NAME }}
21 changes: 11 additions & 10 deletions .github/workflows/devel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
paths:
- sddi-base/**
- sddi/**
- sddi-social/**
workflow_dispatch:

env:
REGISTRY: ghcr.io
Expand All @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
context: ['sddi-base', 'sddi', 'sddi-social']
context: ['sddi-base', 'sddi']
fail-fast: true
max-parallel: 1
permissions:
Expand All @@ -26,18 +26,18 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Log in to the Github Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for devel docker image
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: |
${{ env.REGISTRY }}/tum-gis/ckan-${{ matrix.context }}
Expand All @@ -46,10 +46,11 @@ jobs:
labels: |
maintainer=Chair of Geoinformatics, Technical University of Munich (TUM)
org.opencontainers.image.vendor=Chair of Geoinformatics, Technical University of Munich (TUM)
org.opencontainers.image.title=ckan-sddi-docker
org.opencontainers.image.title=ckan-sddi-base-docker-devel
org.opencontainers.image.documentation=https://github.com/tum-gis/ckan-docker

- name: Build and publish ${{ env.REGISTRY }}/tum-gis/ckan-${{ matrix.context }}:devel
uses: docker/build-push-action@v4
uses: docker/build-push-action@v6
with:
context: ${{ matrix.context }}
push: true
Expand All @@ -60,7 +61,7 @@ jobs:

- name: Extract metadata (tags, labels) for devel-debug docker image
id: meta-debug
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: |
${{ env.REGISTRY }}/tum-gis/ckan-${{ matrix.context }}
Expand All @@ -69,10 +70,10 @@ jobs:
labels: |
maintainer=Chair of Geoinformatics, Technical University of Munich (TUM)
org.opencontainers.image.vendor=Chair of Geoinformatics, Technical University of Munich (TUM)
org.opencontainers.image.title=ckan-sddi-docker
org.opencontainers.image.title=ckan-sddi-base-docker-devel-debug

- name: Build and publish ${{ env.REGISTRY }}/tum-gis/ckan-${{ matrix.context }}:devel-debug
uses: docker/build-push-action@v4
uses: docker/build-push-action@v6
with:
context: ${{ matrix.context }}
file: ${{ matrix.context }}/Dockerfile.debug
Expand Down
22 changes: 12 additions & 10 deletions .github/workflows/edge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
paths:
- sddi-base/**
- sddi/**
- sddi-social/**
workflow_dispatch:

env:
REGISTRY: ghcr.io
Expand All @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
context: ['sddi-base', 'sddi', 'sddi-social']
context: ['sddi-base', 'sddi']
fail-fast: true
max-parallel: 1
permissions:
Expand All @@ -26,18 +26,18 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Log in to the Github Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for docker image
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: |
${{ env.REGISTRY }}/tum-gis/ckan-${{ matrix.context }}
Expand All @@ -46,10 +46,11 @@ jobs:
labels: |
maintainer=Chair of Geoinformatics, Technical University of Munich (TUM)
org.opencontainers.image.vendor=Chair of Geoinformatics, Technical University of Munich (TUM)
org.opencontainers.image.title=ckan-sddi-docker
org.opencontainers.image.title=ckan-sddi-base-docker-edge
org.opencontainers.image.documentation=https://github.com/tum-gis/ckan-docker

- name: Build and publish ${{ env.REGISTRY }}/tum-gis/ckan-${{ matrix.context }}
uses: docker/build-push-action@v4
uses: docker/build-push-action@v6
with:
context: ${{ matrix.context }}
push: true
Expand All @@ -60,7 +61,7 @@ jobs:

- name: Extract metadata (tags, labels) for debug docker image
id: meta-debug
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: |
${{ env.REGISTRY }}/tum-gis/ckan-${{ matrix.context }}
Expand All @@ -69,10 +70,11 @@ jobs:
labels: |
maintainer=Chair of Geoinformatics, Technical University of Munich (TUM)
org.opencontainers.image.vendor=Chair of Geoinformatics, Technical University of Munich (TUM)
org.opencontainers.image.title=ckan-sddi-docker
org.opencontainers.image.title=ckan-sddi-base-docker-edge-debug
org.opencontainers.image.documentation=https://github.com/tum-gis/ckan-docker

- name: Build and publish ${{ env.REGISTRY }}/tum-gis/ckan-${{ matrix.context }}
uses: docker/build-push-action@v4
uses: docker/build-push-action@v6
with:
context: ${{ matrix.context }}
file: ${{ matrix.context }}/Dockerfile.debug
Expand Down
Loading
Loading