Merge remote-tracking branch 'origin/main' into security-fixes
Some checks failed
Build (and tag) Images / build (push) Has been cancelled

This commit is contained in:
Stefan Bethke 2026-11-15 11:45:52 +01:00
commit 3211e0f355

View file

@ -16,13 +16,13 @@ env:
jobs:
build:
runs-on: docker
runs-on: windows-2022
steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v7
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4
- name: Set image tags
id: vars
@ -42,14 +42,14 @@ jobs:
env:
TAG: ${{ steps.vars.outputs.tag }}
run: |
docker build -f ./Containerfile -t "$IMAGE_PREFIX/web:$TAG" .
docker buildx build -f ./Containerfile -t "$IMAGE_PREFIX/web:$TAG" --load .
working-directory: ./web
- name: Build data_handler image
env:
TAG: ${{ steps.vars.outputs.tag }}
run: |
docker build -f ./Containerfile -t "$IMAGE_PREFIX/data_handler:$TAG" .
docker buildx build -f ./Containerfile -t "$IMAGE_PREFIX/data_handler:$TAG" --load .
working-directory: ./data_handler
- name: Update docker-compose.yml image tags
@ -65,7 +65,7 @@ jobs:
- name: Login to Container Registry
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
registry: git.hamburg.ccc.de
username: ${{ secrets.REGISTRY_USERNAME }}