Skip to content

Commit

Permalink
Merge pull request #19 from tum-gis/release/1.0.0
Browse files Browse the repository at this point in the history
Release 1.0.0
  • Loading branch information
BWibo authored Apr 28, 2023
2 parents be62299 + f036b0e commit f5ab72b
Show file tree
Hide file tree
Showing 9 changed files with 259 additions and 33 deletions.
79 changes: 79 additions & 0 deletions .github/workflows/devel.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
name: Build/push devel image

on:
push:
branches: [devel]

env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}

jobs:
build-and-push-images:
runs-on: ubuntu-latest
strategy:
matrix:
context: ['sddi-base', 'sddi', 'sddi-social']
fail-fast: true
max-parallel: 1
permissions:
contents: read
packages: write

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

- name: Log in to the Github Container Registry
uses: docker/login-action@v2
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
with:
images: |
${{ env.REGISTRY }}/tum-gis/ckan-${{ matrix.context }}
tags: |
type=ref,enable=true,event=branch
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
- name: Build and publish ${{ env.REGISTRY }}/tum-gis/ckan-${{ matrix.context }}:devel
uses: docker/build-push-action@v4
with:
context: ${{ matrix.context }}
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
BASEIMAGE_VERSION=devel
- name: Extract metadata (tags, labels) for devel-debug docker image
id: meta-debug
uses: docker/metadata-action@v4
with:
images: |
${{ env.REGISTRY }}/tum-gis/ckan-${{ matrix.context }}
tags: |
type=ref,enable=true,event=branch,suffix=-debug
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
- name: Build and publish ${{ env.REGISTRY }}/tum-gis/ckan-${{ matrix.context }}:devel-debug
uses: docker/build-push-action@v4
with:
context: ${{ matrix.context }}
file: ${{ matrix.context }}/Dockerfile.debug
push: true
tags: ${{ steps.meta-debug.outputs.tags }}
labels: ${{ steps.meta-debug.outputs.labels }}
build-args: |
BASEIMAGE_VERSION=devel
33 changes: 25 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
For releases `< 1.0.0` minor version steps may indicate breaking changes too.

## [Unreleased] - YYYY-MM-DD
## [1.0.0] - 2023-04-28

### Added

- Added *debug* images with CKAN FLASK Debug Toolbar enabled, see
[here](https://github.com/tum-gis/ckan-docker#1234-image-versioning)

### Changed

### Removed
- Added *devel* images built form latest commit to `devel` branch.
- Various docs additions.
- Added Zenodo DOI.

### Fixed

### Security
### Changed

### Deprecated
- Various extension updates.

## [0.0.5] - 2023-03-30

Expand Down Expand Up @@ -99,7 +97,26 @@ for production environments.**

### Deprecated

### Known issues

## [Unreleased] - YYYY-MM-DD

### Added

### Changed

### Removed

### Fixed

### Security

### Deprecated

### Known issues

[Unreleased]: https://github.com/tum-gis/ckan-docker/compare/0.0.5...HEAD
[1.0.0]: https://github.com/tum-gis/ckan-docker/compare/0.0.5...1.0.0
[0.0.5]: https://github.com/tum-gis/ckan-docker/compare/0.0.4...0.0.5
[0.0.4]: https://github.com/tum-gis/ckan-docker/compare/0.0.3...0.0.4
[0.0.3]: https://github.com/tum-gis/ckan-docker/compare/0.0.2...0.0.3
Expand Down
166 changes: 148 additions & 18 deletions README.md

Large diffs are not rendered by default.

Binary file added docs/img/bayernInnovativ_logo_h50.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/img/bsd_logo_h50.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/img/tum_logo_h50.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/img/twinBy_logo_h50.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions sddi-base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN set -ex && \
ls -lah /wheels

# ckanext-grouphierarchy ######################################################
ARG CKANEXT_SDDI_VERSION="2.9-support"
ARG CKANEXT_SDDI_VERSION="1.0.0"
ENV CKANEXT_SDDI_VERSION=${CKANEXT_SDDI_VERSION}

RUN set -ex && \
Expand All @@ -50,7 +50,7 @@ RUN set -ex && \
ls -lah /wheels

# ckanext-scheming ############################################################
ARG CKANEXT_SCHEMING_VERSION="scheming_all_plugins"
ARG CKANEXT_SCHEMING_VERSION="c4f65c6"
ENV CKANEXT_SCHEMING_VERSION=${CKANEXT_SCHEMING_VERSION}
ENV CKANEXT_SCHEMING_GITHUB_URL="https://github.com/MarijaKnezevic/ckanext-scheming"

Expand All @@ -59,7 +59,7 @@ RUN set -ex && \
git+${CKANEXT_SCHEMING_GITHUB_URL}.git@${CKANEXT_SCHEMING_VERSION}#egg=ckanext-scheming

# ckanext datesearch ##########################################################
ARG CKANEXT_DATESEARCH_VERSION="datesearch_and_spatial"
ARG CKANEXT_DATESEARCH_VERSION="1.0.0"
ENV CKANEXT_DATESEARCH_VERSION=${CKANEXT_DATESEARCH_VERSION}
ENV CKANEXT_DATESEARCH_VERSION_GITHUB_URL="https://github.com/MarijaKnezevic/ckanext-datesearch"

Expand All @@ -68,7 +68,7 @@ RUN set -ex && \
git+${CKANEXT_DATESEARCH_VERSION_GITHUB_URL}.git@${CKANEXT_DATESEARCH_VERSION}#egg=ckanext-datesearch

# ckanext-composite ###########################################################
ARG CKANEXT_COMPOSITE_VERSION="master"
ARG CKANEXT_COMPOSITE_VERSION="1e6d7bb"
ENV CKANEXT_COMPOSITE_VERSION=${CKANEXT_COMPOSITE_VERSION}
ENV CKANEXT_COMPOSITE_GITHUB_URL="https://github.com/EnviDat/ckanext-composite"

Expand All @@ -79,7 +79,7 @@ RUN set -ex && \
git+${CKANEXT_COMPOSITE_GITHUB_URL}.git@${CKANEXT_COMPOSITE_VERSION}#egg=ckanext-composite

# ckanext-repeating ###########################################################
ARG CKANEXT_REPEATING_VERSION="master"
ARG CKANEXT_REPEATING_VERSION="1.0.0"
ENV CKANEXT_REPEATING_VERSION=${CKANEXT_REPEATING_VERSION}
ENV CKANEXT_REPEATING_GITHUB_URL="https://github.com/MarijaKnezevic/ckanext-repeating"

Expand All @@ -90,7 +90,7 @@ RUN set -ex && \
# ckanext-spatial #############################################################
FROM ghcr.io/keitaroinc/ckan:${CKAN_VERSION_BUILD_SPATIAL} as extbuild-spatial

ARG CKANEXT_SPATIAL_VERSION="scheming-spatial"
ARG CKANEXT_SPATIAL_VERSION="d74cd14"
ENV CKANEXT_SPATIAL_VERSION=${CKANEXT_SPATIAL_VERSION}

USER root
Expand Down
2 changes: 1 addition & 1 deletion sddi/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN set -ex && \
git+${CKANEXT_DCAT_GITHUB_URL}.git@${CKANEXT_DCAT_VERSION}#egg=ckanext-dcat

# ckanext-restricted ##########################################################
ARG CKANEXT_RESTRICTED_VERSION="02e7e14"
ARG CKANEXT_RESTRICTED_VERSION="1.0.0"
ENV CKANEXT_RESTRICTED_VERSION=${CKANEXT_RESTRICTED_VERSION}
ENV CKANEXT_RESTRICTED_GITHUB_URL="https://github.com/MarijaKnezevic/ckanext-restricted"

Expand Down

0 comments on commit f5ab72b

Please sign in to comment.