From 7737dde2edbc11ac7e62bc79e7f9d2c7a2ea5e05 Mon Sep 17 00:00:00 2001 From: Stein Helge Riise Date: Tue, 18 Nov 2025 12:13:42 +0000 Subject: [PATCH 1/2] Update .gitea/workflows/build.yml --- .gitea/workflows/build.yml | 45 +++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index d59e622..cc2d48c 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -4,60 +4,75 @@ on: push: branches: - main - - develop - dev +env: + REGISTRY: gitea.theriise.net/steinhelge + jobs: build-and-push: runs-on: self-hosted - env: - # Denne gir f.eks: - # main → latest - # develop → dev - # dev → dev - TAG: ${{ github.ref_name == 'main' && 'latest' || 'dev' }} - steps: - name: Checkout uses: actions/checkout@v4 + # Finn ut hvilken tag vi skal bruke + - name: Set image tag + run: | + # Gitea prøver å være kompatibel med GitHub Actions + # Noen ganger er GITHUB_REF_NAME bare 'main', andre ganger 'refs/heads/main' + REF="${GITHUB_REF_NAME:-$GITHUB_REF}" + REF="${REF#refs/heads/}" + + if [ "$REF" = "main" ]; then + TAG="latest" + elif [ "$REF" = "dev" ]; then + TAG="dev" + else + # fallback: bruk branchnavnet som tag, men uten skråstreker + TAG="$(echo "$REF" | tr '/' '-')" + fi + + echo "Bygger med TAG=$TAG" + echo "TAG=$TAG" >> $GITHUB_ENV + - name: Log in to Gitea Container Registry run: | - echo "${{ secrets.REGISTRY_TOKEN }}" | docker login gitea.theriise.net -u steinhelge --password-stdin + echo "${{ secrets.REGISTRY_TOKEN }}" | docker login $REGISTRY -u steinhelge --password-stdin # ---------- Frontend ---------- - name: Build Frontend (${{ env.TAG }}) run: | docker build \ - -t gitea.theriise.net/steinhelge/minattest-frontend:${TAG} \ + -t $REGISTRY/minattest-frontend:${TAG} \ -f frontend/minattest-app/Dockerfile \ frontend/minattest-app - name: Push Frontend (${{ env.TAG }}) run: | - docker push gitea.theriise.net/steinhelge/minattest-frontend:${TAG} + docker push $REGISTRY/minattest-frontend:${TAG} # ---------- Backend API ---------- - name: Build API (${{ env.TAG }}) run: | docker build \ - -t gitea.theriise.net/steinhelge/minattest-api:${TAG} \ + -t $REGISTRY/minattest-api:${TAG} \ -f backend/Dockerfile \ backend - name: Push API (${{ env.TAG }}) run: | - docker push gitea.theriise.net/steinhelge/minattest-api:${TAG} + docker push $REGISTRY/minattest-api:${TAG} # ---------- App Host / BFF ---------- - name: Build App Host (${{ env.TAG }}) run: | docker build \ - -t gitea.theriise.net/steinhelge/minattest-app-host:${TAG} \ + -t $REGISTRY/minattest-app-host:${TAG} \ -f frontend/minattest-app-host/Dockerfile \ frontend/minattest-app-host - name: Push App Host (${{ env.TAG }}) run: | - docker push gitea.theriise.net/steinhelge/minattest-app-host:${TAG} + docker push $REGISTRY/minattest-app-host:${TAG} From 2fef8bf25591aebea10f665f41034c9a96c49974 Mon Sep 17 00:00:00 2001 From: Stein Helge Riise Date: Tue, 18 Nov 2025 20:09:15 +0000 Subject: [PATCH 2/2] Update .gitea/workflows/build.yml --- .gitea/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index cc2d48c..f68081a 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -76,3 +76,4 @@ jobs: - name: Push App Host (${{ env.TAG }}) run: | docker push $REGISTRY/minattest-app-host:${TAG} +