Skip to content

Consolidate Docker publishing into build-and-test workflow #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
t0mdavid-m merged 1 commit into from
May 29, 2026
Merged

Consolidate Docker publishing into build-and-test workflow #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 11 additions & 6 deletions .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches: [develop]
push:
branches: [develop]
tags: ['v*']
workflow_call:
workflow_dispatch:

env:
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
type=ref,event=branch,suffix=-${{ matrix.variant }}-amd64
type=ref,event=tag,suffix=-${{ matrix.variant }}-amd64
type=sha,prefix=,suffix=-${{ matrix.variant }}-amd64
type=raw,value=latest-amd64,enable=${{ matrix.variant == 'full' && github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
type=raw,value=latest-amd64,enable=${{ matrix.variant == 'full' && (github.event_name == 'release' || (github.event_name == 'push' && github.ref == 'refs/heads/develop')) }}

- name: Build and conditionally push
uses: docker/build-push-action@v5
Expand All @@ -118,6 +118,7 @@ jobs:
cache-to: ${{ github.event_name != 'pull_request' && format('type=registry,ref={0}/{1}/cache:{2}-amd64,mode=max', env.REGISTRY, env.IMAGE_NAME_LC, matrix.variant) || '' }}
build-args: |
GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
RELEASE_TAG=${{ github.event_name == 'release' && github.ref_name || '' }}

- name: Retag for kind (image name the kustomize overlay points at)
run: |
Expand Down Expand Up @@ -201,7 +202,7 @@ jobs:
type=ref,event=branch,suffix=-${{ matrix.variant }}-arm64
type=ref,event=tag,suffix=-${{ matrix.variant }}-arm64
type=sha,prefix=,suffix=-${{ matrix.variant }}-arm64
type=raw,value=latest-arm64,enable=${{ matrix.variant == 'full' && github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
type=raw,value=latest-arm64,enable=${{ matrix.variant == 'full' && (github.event_name == 'release' || (github.event_name == 'push' && github.ref == 'refs/heads/develop')) }}

- name: Build and conditionally push
uses: docker/build-push-action@v5
Expand All @@ -218,6 +219,7 @@ jobs:
provenance: false
build-args: |
GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
RELEASE_TAG=${{ github.event_name == 'release' && github.ref_name || '' }}

- name: Retag for kind (image name the kustomize overlay points at)
run: |
Expand All @@ -244,7 +246,10 @@ jobs:
# consumers (k8s overlays, docker-compose users, `docker pull` callers)
# keep working transparently — docker now auto-selects the right arch
# on pull. PRs don't push per-arch tags, so there's nothing to merge.
needs: [build-amd64, build-arm64]
# Also gate on the integration tests (apptainer/nginx/traefik): the
# multi-arch `:latest` + versioned manifest that prod pulls must only be
# promoted after the freshly built image passes its tests.
needs: [build-amd64, build-arm64, test-apptainer, test-nginx, test-traefik]
if: github.event_name != 'pull_request'
runs-on: ubuntu-latest
permissions:
Expand Down Expand Up @@ -277,7 +282,7 @@ jobs:
type=ref,event=branch,suffix=-${{ matrix.variant }}
type=ref,event=tag,suffix=-${{ matrix.variant }}
type=sha,prefix=,suffix=-${{ matrix.variant }}
type=raw,value=latest,enable=${{ matrix.variant == 'full' && github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
type=raw,value=latest,enable=${{ matrix.variant == 'full' && (github.event_name == 'release' || (github.event_name == 'push' && github.ref == 'refs/heads/develop')) }}

- name: Create and push multi-arch manifests
# Iterate over manifest tags (newline-separated from metadata-action)
Expand Down Expand Up @@ -522,7 +527,7 @@ jobs:
type=ref,event=branch,suffix=-${{ matrix.variant }}
type=ref,event=tag,suffix=-${{ matrix.variant }}
type=sha,prefix=,suffix=-${{ matrix.variant }}
type=raw,value=latest,enable=${{ matrix.variant == 'full' && github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
type=raw,value=latest,enable=${{ matrix.variant == 'full' && (github.event_name == 'release' || (github.event_name == 'push' && github.ref == 'refs/heads/develop')) }}

- name: Log in to GHCR for ORAS push
env:
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/build-windows-executable-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,3 +490,18 @@ jobs:
asset_content_type: application/zip
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

publish-web-image:
# On a published Release, run the full Build-and-Test pipeline AFTER the
# Windows installer (OpenMS-App.zip) has been uploaded as a release asset,
# so the Docker build's `gh release download` bundles the matching
# installer. build-and-test.yml builds the image, runs the apptainer +
# nginx + traefik integration tests, and only then stitches and pushes the
# multi-arch `:latest` (and versioned) tags that the k8s prod overlay pulls.
needs: build-executable
if: github.event_name == 'release'
permissions:
contents: read
packages: write
uses: ./.github/workflows/build-and-test.yml
secrets: inherit
173 changes: 0 additions & 173 deletions .github/workflows/publish-docker-images.yml
View file
Open in desktop

This file was deleted.

10 changes: 9 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,17 @@ RUN jq '.online_deployment = true' settings.json > tmp.json && mv tmp.json setti
ARG GITHUB_TOKEN
ARG GITHUB_USER=OpenMS
ARG GITHUB_REPO=FLASHApp
# RELEASE_TAG pins the download to the release being published (set by the
# build-and-test workflow on release events). When empty we fall back to the
# latest release, preserving the previous behavior for develop/manual builds.
ARG RELEASE_TAG
RUN if [ -n "$GITHUB_TOKEN" ]; then \
echo "Downloading release asset..."; \
GH_TOKEN="$GITHUB_TOKEN" gh release download -R ${GITHUB_USER}/${GITHUB_REPO} -p "OpenMS-App.zip" -D /app; \
if [ -n "$RELEASE_TAG" ]; then \
GH_TOKEN="$GITHUB_TOKEN" gh release download "$RELEASE_TAG" -R ${GITHUB_USER}/${GITHUB_REPO} -p "OpenMS-App.zip" -D /app; \
else \
GH_TOKEN="$GITHUB_TOKEN" gh release download -R ${GITHUB_USER}/${GITHUB_REPO} -p "OpenMS-App.zip" -D /app; \
fi; \
else \
echo "No token, skipping download."; \
fi
Expand Down
10 changes: 9 additions & 1 deletion Dockerfile.arm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,9 +256,17 @@ RUN jq '.online_deployment = true' settings.json > tmp.json && mv tmp.json setti
ARG GITHUB_TOKEN
ARG GITHUB_USER=OpenMS
ARG GITHUB_REPO=FLASHApp
# RELEASE_TAG pins the download to the release being published (set by the
# build-and-test workflow on release events). When empty we fall back to the
# latest release, preserving the previous behavior for develop/manual builds.
ARG RELEASE_TAG
RUN if [ -n "$GITHUB_TOKEN" ]; then \
echo "Downloading release asset..."; \
GH_TOKEN="$GITHUB_TOKEN" gh release download -R ${GITHUB_USER}/${GITHUB_REPO} -p "OpenMS-App.zip" -D /app; \
if [ -n "$RELEASE_TAG" ]; then \
GH_TOKEN="$GITHUB_TOKEN" gh release download "$RELEASE_TAG" -R ${GITHUB_USER}/${GITHUB_REPO} -p "OpenMS-App.zip" -D /app; \
else \
GH_TOKEN="$GITHUB_TOKEN" gh release download -R ${GITHUB_USER}/${GITHUB_REPO} -p "OpenMS-App.zip" -D /app; \
fi; \
else \
echo "No token, skipping download."; \
fi
Expand Down
Loading