From 5eec2d318830f55a2fcb83f3b8c971dd692cf62b Mon Sep 17 00:00:00 2001 From: ViMaSter Date: Mon, 13 Oct 2025 18:54:49 +0200 Subject: [PATCH 1/6] fix: Adds working directory to build steps --- .forgejo/workflows/images.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/images.yml b/.forgejo/workflows/images.yml index 2fd7ee6..6bc1c1a 100644 --- a/.forgejo/workflows/images.yml +++ b/.forgejo/workflows/images.yml @@ -25,13 +25,15 @@ jobs: - name: Build and push web image to Container Registry run: | - docker build -f ./web/Containerfile -t git.hamburg.ccc.de/ccchh/sunders/web:latest . + docker build -f ./Containerfile -t git.hamburg.ccc.de/ccchh/sunders/web:latest . docker push git.hamburg.ccc.de/ccchh/sunders/web:latest + working-directory: ./web - name: Build and push data_handler image to Container Registry run: | - docker build -f ./data_handler/Containerfile -t git.hamburg.ccc.de/ccchh/sunders/data_handler:latest . + docker build -f ./Containerfile -t git.hamburg.ccc.de/ccchh/sunders/data_handler:latest . docker push git.hamburg.ccc.de/ccchh/sunders/data_handler:latest + working-directory: ./data_handler - name: Start Docker Compose services run: | From 6c923de5ac434b28f2a727c067f2e7bd730fb0f3 Mon Sep 17 00:00:00 2001 From: ViMaSter Date: Mon, 13 Oct 2025 18:57:19 +0200 Subject: [PATCH 2/6] fix: Removes deprecated `version` parameter --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 53b7b72..1d60cac 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3.8' services: db: image: mariadb:12.0.2 From f40692b483f82ba3af3e04004cde190f6010456e Mon Sep 17 00:00:00 2001 From: ViMaSter Date: Mon, 13 Oct 2025 19:04:45 +0200 Subject: [PATCH 3/6] feat: Tags built images branch-specific, to prevent production overrides from branches --- .forgejo/workflows/images.yml | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/images.yml b/.forgejo/workflows/images.yml index 6bc1c1a..7c71f84 100644 --- a/.forgejo/workflows/images.yml +++ b/.forgejo/workflows/images.yml @@ -23,18 +23,31 @@ jobs: username: ${{ secrets.REGISTRY_USERNAME }} password: ${{ secrets.REGISTRY_TOKEN }} + - name: Set image tag + id: vars + run: | + if [ "${{ github.ref_name }}" = "main" ]; then + echo "tag=latest" >> $GITHUB_OUTPUT + else + echo "tag=${{ github.ref_name }}" >> $GITHUB_OUTPUT + fi + - name: Build and push web image to Container Registry run: | - docker build -f ./Containerfile -t git.hamburg.ccc.de/ccchh/sunders/web:latest . - docker push git.hamburg.ccc.de/ccchh/sunders/web:latest + docker build -f ./Containerfile -t git.hamburg.ccc.de/ccchh/sunders/web:${{ steps.vars.outputs.tag }} . + docker push git.hamburg.ccc.de/ccchh/sunders/web:${{ steps.vars.outputs.tag }} working-directory: ./web - + - name: Build and push data_handler image to Container Registry run: | - docker build -f ./Containerfile -t git.hamburg.ccc.de/ccchh/sunders/data_handler:latest . - docker push git.hamburg.ccc.de/ccchh/sunders/data_handler:latest + docker build -f ./Containerfile -t git.hamburg.ccc.de/ccchh/sunders/data_handler:${{ steps.vars.outputs.tag }} . + docker push git.hamburg.ccc.de/ccchh/sunders/data_handler:${{ steps.vars.outputs.tag }} working-directory: ./data_handler - + + - name: Update docker-compose.yml image tags + run: | + sed -i "s/:latest/:${{ steps.vars.outputs.tag }}/g" docker-compose.yml + - name: Start Docker Compose services run: | docker compose up -d --wait From 3aeb91101d5d228f0f522c763275916341bc3f50 Mon Sep 17 00:00:00 2001 From: ViMaSter Date: Mon, 13 Oct 2025 19:19:39 +0200 Subject: [PATCH 4/6] refactor: Limits docker image pushing to git pushes to `main` branch --- .forgejo/workflows/images.yml | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/.forgejo/workflows/images.yml b/.forgejo/workflows/images.yml index 7c71f84..a16c626 100644 --- a/.forgejo/workflows/images.yml +++ b/.forgejo/workflows/images.yml @@ -1,4 +1,4 @@ -name: Build Hello World Image +name: Build (and tag) Images on: push: @@ -23,26 +23,29 @@ jobs: username: ${{ secrets.REGISTRY_USERNAME }} password: ${{ secrets.REGISTRY_TOKEN }} - - name: Set image tag + - name: Set image tags id: vars run: | - if [ "${{ github.ref_name }}" = "main" ]; then + if [ "${{ github.ref_name }}" = "main" ] && [ "${{ github.event_name }}" = "push" ]; then echo "tag=latest" >> $GITHUB_OUTPUT else echo "tag=${{ github.ref_name }}" >> $GITHUB_OUTPUT fi - - name: Build and push web image to Container Registry + - name: Build images run: | + pushd ./web docker build -f ./Containerfile -t git.hamburg.ccc.de/ccchh/sunders/web:${{ steps.vars.outputs.tag }} . - docker push git.hamburg.ccc.de/ccchh/sunders/web:${{ steps.vars.outputs.tag }} - working-directory: ./web - - - name: Build and push data_handler image to Container Registry - run: | + popd + pushd ./data_handler docker build -f ./Containerfile -t git.hamburg.ccc.de/ccchh/sunders/data_handler:${{ steps.vars.outputs.tag }} . + popd + + - name: Push images to Container Registry + run: | + docker push git.hamburg.ccc.de/ccchh/sunders/web:${{ steps.vars.outputs.tag }} docker push git.hamburg.ccc.de/ccchh/sunders/data_handler:${{ steps.vars.outputs.tag }} - working-directory: ./data_handler + if: github.event_name == 'push' && github.ref_name == 'main' - name: Update docker-compose.yml image tags run: | @@ -51,4 +54,4 @@ jobs: - name: Start Docker Compose services run: | docker compose up -d --wait - docker compose down \ No newline at end of file + docker compose down \ No newline at end of file From 1e6f858426d63063000c6bd4a291b9f49ca810e5 Mon Sep 17 00:00:00 2001 From: ViMaSter Date: Mon, 13 Oct 2025 19:23:50 +0200 Subject: [PATCH 5/6] fix: Enables image pushing for any git branch push --- .forgejo/workflows/images.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/images.yml b/.forgejo/workflows/images.yml index a16c626..9fa251a 100644 --- a/.forgejo/workflows/images.yml +++ b/.forgejo/workflows/images.yml @@ -32,20 +32,21 @@ jobs: echo "tag=${{ github.ref_name }}" >> $GITHUB_OUTPUT fi - - name: Build images + - name: Build web image run: | - pushd ./web docker build -f ./Containerfile -t git.hamburg.ccc.de/ccchh/sunders/web:${{ steps.vars.outputs.tag }} . - popd - pushd ./data_handler + working-directory: ./web + + - name: Build data_handler image + run: | docker build -f ./Containerfile -t git.hamburg.ccc.de/ccchh/sunders/data_handler:${{ steps.vars.outputs.tag }} . - popd + working-directory: ./data_handler - name: Push images to Container Registry run: | docker push git.hamburg.ccc.de/ccchh/sunders/web:${{ steps.vars.outputs.tag }} docker push git.hamburg.ccc.de/ccchh/sunders/data_handler:${{ steps.vars.outputs.tag }} - if: github.event_name == 'push' && github.ref_name == 'main' + if: github.event_name == 'push' - name: Update docker-compose.yml image tags run: | From ea4063917b81e2b475c91fe749000166d7c6a2a6 Mon Sep 17 00:00:00 2001 From: ViMaSter Date: Mon, 13 Oct 2025 19:26:57 +0200 Subject: [PATCH 6/6] fix: Enables CI/CD for any branch push --- .forgejo/workflows/images.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.forgejo/workflows/images.yml b/.forgejo/workflows/images.yml index 9fa251a..8c8f5a4 100644 --- a/.forgejo/workflows/images.yml +++ b/.forgejo/workflows/images.yml @@ -3,7 +3,6 @@ name: Build (and tag) Images on: push: branches: - - main workflow_dispatch: jobs: