diff --git a/.github/workflows/release-docker.yml b/.github/workflows/release-docker.yml index a6a7e0d..eedd4a1 100644 --- a/.github/workflows/release-docker.yml +++ b/.github/workflows/release-docker.yml @@ -30,9 +30,20 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} + - name: Extract ORTHANC_VERSION from Dockerfile + run: | + set -eu + orthanc_version="$(sed -nE 's|^FROM[[:space:]]+jodogne/orthanc:([^[:space:]]+)[[:space:]]+AS[[:space:]]+orthanc$|\1|p' docker/Dockerfile | head -n 1)" + if [ -z "$orthanc_version" ]; then + echo "Failed to parse ORTHANC_VERSION from docker/Dockerfile" >&2 + exit 1 + fi + echo "ORTHANC_VERSION=$orthanc_version" >> "$GITHUB_ENV" + - name: Build and push application images working-directory: docker env: + ORTHANC_VERSION: ${{ env.ORTHANC_VERSION }} DOCKER_IMAGE_TAG: ${{ github.event.release.tag_name || 'latest' }} run: | docker compose build orthanc wlbroker cal2wl diff --git a/docker/env.example b/docker/env.example index 30a47f9..b1b4cdb 100644 --- a/docker/env.example +++ b/docker/env.example @@ -7,9 +7,6 @@ ## docker registry endpoint #DOCKER_REGISTRY=dccn -## ORTHANC version, defining the version of ORTHANC the `dicomdf-orthac` is based on -#ORTHANC_VERSION=1.4.2 - ## volume for Orthanc configurations, read-only bind mounted to /var/lib/orthanc/etc #VOL_ORTHANC_CONFIG=./orthanc/config