From 1b829e85f0043a9ca913fad7809abee0f7a8d94f Mon Sep 17 00:00:00 2001 From: Patrick Date: Fri, 7 Nov 2025 10:47:28 +0100 Subject: [PATCH 1/5] extend deploy step --- .gitea/workflows/be-img-build-and-push.yaml | 2 ++ .gitea/workflows/scripts/deploy-backend.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/be-img-build-and-push.yaml b/.gitea/workflows/be-img-build-and-push.yaml index 133953e..1e15c8f 100644 --- a/.gitea/workflows/be-img-build-and-push.yaml +++ b/.gitea/workflows/be-img-build-and-push.yaml @@ -89,6 +89,8 @@ jobs: - name: Prepare deploy script run: | + mkdir -p docker/ + echo "echo Compose Copying..." > docker/docker-compose-dev.yml mkdir -p .gitea/scripts echo "echo Deploying..." > .gitea/scripts/deploy-backend.sh chmod +x .gitea/scripts/deploy-backend.sh diff --git a/.gitea/workflows/scripts/deploy-backend.sh b/.gitea/workflows/scripts/deploy-backend.sh index 1708f13..d8e812b 100644 --- a/.gitea/workflows/scripts/deploy-backend.sh +++ b/.gitea/workflows/scripts/deploy-backend.sh @@ -2,7 +2,7 @@ set -e # Exit immediately if a command exits with a non-zero status -docker compose -f docker-compose-dev.yml down --remove-orphans --volumes +docker compose -f ../../../docker/docker-compose-dev.yml down --remove-orphans --volumes docker system prune -f -- 2.49.0 From 532dc6d68417544eef773a6fc92b63815dcdf4e2 Mon Sep 17 00:00:00 2001 From: Patrick Date: Fri, 7 Nov 2025 11:00:36 +0100 Subject: [PATCH 2/5] extend deploy step --- .gitea/workflows/be-img-build-and-push.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/be-img-build-and-push.yaml b/.gitea/workflows/be-img-build-and-push.yaml index 1e15c8f..2a5d961 100644 --- a/.gitea/workflows/be-img-build-and-push.yaml +++ b/.gitea/workflows/be-img-build-and-push.yaml @@ -91,6 +91,7 @@ jobs: run: | mkdir -p docker/ echo "echo Compose Copying..." > docker/docker-compose-dev.yml + cp -r . docker/docker-compose-dev.yml mkdir -p .gitea/scripts echo "echo Deploying..." > .gitea/scripts/deploy-backend.sh chmod +x .gitea/scripts/deploy-backend.sh @@ -99,6 +100,9 @@ jobs: run: | ls -a ls .gitea/scripts/ + echo "echo Deploying starting..." > .gitea/scripts/deploy-backend.sh chmod +x .gitea/scripts/deploy-backend.sh #.gitea/scripts/deploy-backend.sh ${{ gitea.actor }} ${{ vars.REGISTRY_URL }} my-app-backend v1.0.0 - .gitea/scripts/deploy-backend.sh + #.gitea/scripts/deploy-backend.sh + cd .gitea/scripts && chmod +x ./deploy-backend.sh && ./deploy-backend.sh + echo "echo Deploying... done." -- 2.49.0 From f1c04a68fbcbd12b41ad53db0a0403ffcb79f6d2 Mon Sep 17 00:00:00 2001 From: Patrick Date: Fri, 7 Nov 2025 15:04:22 +0100 Subject: [PATCH 3/5] cp --- .gitea/workflows/be-img-build-and-push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/be-img-build-and-push.yaml b/.gitea/workflows/be-img-build-and-push.yaml index 2a5d961..9a12181 100644 --- a/.gitea/workflows/be-img-build-and-push.yaml +++ b/.gitea/workflows/be-img-build-and-push.yaml @@ -90,7 +90,7 @@ jobs: - name: Prepare deploy script run: | mkdir -p docker/ - echo "echo Compose Copying..." > docker/docker-compose-dev.yml + echo "echo Compose Copying..." cp -r . docker/docker-compose-dev.yml mkdir -p .gitea/scripts echo "echo Deploying..." > .gitea/scripts/deploy-backend.sh -- 2.49.0 From c30302b924196807ad55c7f8aaadcf661dd6366d Mon Sep 17 00:00:00 2001 From: Patrick Date: Fri, 7 Nov 2025 15:19:14 +0100 Subject: [PATCH 4/5] cp --- .gitea/workflows/be-img-build-and-push.yaml | 30 ++++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/be-img-build-and-push.yaml b/.gitea/workflows/be-img-build-and-push.yaml index 9a12181..d6752fc 100644 --- a/.gitea/workflows/be-img-build-and-push.yaml +++ b/.gitea/workflows/be-img-build-and-push.yaml @@ -89,20 +89,30 @@ jobs: - name: Prepare deploy script run: | + echo "Preparing deploy artifacts..." mkdir -p docker/ - echo "echo Compose Copying..." - cp -r . docker/docker-compose-dev.yml + cp docker-compose-dev.yml docker/ + mkdir -p .gitea/scripts - echo "echo Deploying..." > .gitea/scripts/deploy-backend.sh + cat << 'EOF' > .gitea/scripts/deploy-backend.sh + #!/usr/bin/env bash + set -e + echo "Starting deployment..." + # Example: docker-compose -f docker/docker-compose-dev.yml up -d --build + echo "Deploying backend..." + echo "Deployment completed successfully." + EOF + chmod +x .gitea/scripts/deploy-backend.sh - name: Deploy to server via deploy script run: | + echo "Listing files..." ls -a - ls .gitea/scripts/ - echo "echo Deploying starting..." > .gitea/scripts/deploy-backend.sh - chmod +x .gitea/scripts/deploy-backend.sh - #.gitea/scripts/deploy-backend.sh ${{ gitea.actor }} ${{ vars.REGISTRY_URL }} my-app-backend v1.0.0 - #.gitea/scripts/deploy-backend.sh - cd .gitea/scripts && chmod +x ./deploy-backend.sh && ./deploy-backend.sh - echo "echo Deploying... done." + ls .gitea/scripts/ + + echo "Executing deploy script..." + cd .gitea/scripts + chmod +x deploy-backend.sh + ./deploy-backend.sh + echo "Deployment done." -- 2.49.0 From 8f5c56b689a447f768e3a0b0326c8234a8f03307 Mon Sep 17 00:00:00 2001 From: chimeudeonwop Date: Thu, 8 Jan 2026 16:28:50 +0000 Subject: [PATCH 5/5] Update .gitea/workflows/be-img-build-and-push.yaml --- .gitea/workflows/be-img-build-and-push.yaml | 207 +++++++++----------- 1 file changed, 89 insertions(+), 118 deletions(-) diff --git a/.gitea/workflows/be-img-build-and-push.yaml b/.gitea/workflows/be-img-build-and-push.yaml index d6752fc..014b317 100644 --- a/.gitea/workflows/be-img-build-and-push.yaml +++ b/.gitea/workflows/be-img-build-and-push.yaml @@ -1,118 +1,89 @@ -name: Full Build and Docker Push Workflow -run-name: ${{ gitea.actor }} is running a full build and Docker push workflow - -on: - push: - branches: - - main - pull_request: - branches: - - main - -jobs: - Builder: - runs-on: catthacker-ubuntu-latest - steps: - - name: Info - run: | - echo "Triggered by ${{ gitea.event_name }} event" - echo "Branch: ${{ gitea.ref }}" - echo "Repository: ${{ gitea.repository }}" - - - name: Update apt-get and install Maven - run: | - apt-get update -y - apt-get install -y maven - - - name: Clone the repository - uses: actions/checkout@v4 - - - name: Set up Java - uses: actions/setup-java@v5 - with: - distribution: 'temurin' - java-version: '21' - cache: 'maven' - - - name: Build with Maven - run: | - java -version - mvn -version - mvn -B clean test -Dspring.profiles.active=test - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - #Build Docker image - Images must follow this naming convention: - {registry}/{owner}/{image} - - name: Build Docker image - env: - GITEA_REGISTRY_URL: ${{ vars.REGISTRY_URL }} - OWNER: ${{ gitea.actor }} - IMAGE_NAME: my-app - run: | - #docker build -t $GITEA_REGISTRY_URL/$OWNER/my-app:latest . - # registry.domain.com//my-app:latest e.g. git.bepastem.com/eberen/my-app:latest - docker build -t $GITEA_REGISTRY_URL/$OWNER/$IMAGE_NAME:latest . - - - name: Build and push Docker image using Buildx - env: - GITEA_REGISTRY_URL: ${{ vars.REGISTRY_URL }} - IMAGE_NAME: my-app-backend - APP_VERSION: v1.0.0 - OWNER: ${{ gitea.actor }} - LOGIN_TOKEN: ${{ secrets.LOGIN_TOKEN }} - run: | - docker buildx build --platform linux/amd64 -t $GITEA_REGISTRY_URL/$OWNER/$IMAGE_NAME:$APP_VERSION . - #docker buildx build \ - # --platform linux/amd64 \ - # #-t $GITEA_REGISTRY_URL/$OWNER/$IMAGE_NAME:latest \ - # #--push \ - # . - - - name: Push Docker image to Gitea Registry - env: - GITEA_USERNAME: ${{ gitea.actor }} - LOGIN_TOKEN: ${{ secrets.LOGIN_TOKEN }} - GITEA_REGISTRY_URL: ${{ vars.REGISTRY_URL }} - run: | - # Login securely - echo "$LOGIN_TOKEN" | docker login $GITEA_REGISTRY_URL --username $GITEA_USERNAME --password-stdin - docker push $GITEA_REGISTRY_URL/$GITEA_USERNAME/my-app:latest - docker logout $GITEA_REGISTRY_URL - - - name: Cleanup - run: | - docker images -a - docker system prune -f - docker images - echo "Cleanup done." - - - name: Prepare deploy script - run: | - echo "Preparing deploy artifacts..." - mkdir -p docker/ - cp docker-compose-dev.yml docker/ - - mkdir -p .gitea/scripts - cat << 'EOF' > .gitea/scripts/deploy-backend.sh - #!/usr/bin/env bash - set -e - echo "Starting deployment..." - # Example: docker-compose -f docker/docker-compose-dev.yml up -d --build - echo "Deploying backend..." - echo "Deployment completed successfully." - EOF - - chmod +x .gitea/scripts/deploy-backend.sh - - - name: Deploy to server via deploy script - run: | - echo "Listing files..." - ls -a - ls .gitea/scripts/ - - echo "Executing deploy script..." - cd .gitea/scripts - chmod +x deploy-backend.sh - ./deploy-backend.sh - echo "Deployment done." +name: Full Build and Docker Push Workflow +run-name: ${{ gitea.actor }} is running a full build and Docker push workflow + +on: + push: + branches: + - main + pull_request: + branches: + - main + +jobs: + Builder: + runs-on: catthacker-ubuntu-latest + steps: + - name: Info + run: | + echo "Triggered by ${{ gitea.event_name }} event" + echo "Branch: ${{ gitea.ref }}" + echo "Repository: ${{ gitea.repository }}" + + - name: Update apt-get and install Maven + run: | + apt-get update -y + apt-get install -y maven + + - name: Clone the repository + uses: actions/checkout@v4 + + - name: Set up Java + uses: actions/setup-java@v5 + with: + distribution: 'temurin' + java-version: '21' + cache: 'maven' + + - name: Build with Maven + run: | + java -version + mvn -version + mvn -B clean test -Dspring.profiles.active=test + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + #Build Docker image - Images must follow this naming convention: - {registry}/{owner}/{image} + - name: Build Docker image + env: + GITEA_REGISTRY_URL: ${{ vars.REGISTRY_URL }} + OWNER: ${{ gitea.actor }} + IMAGE_NAME: my-app + run: | + #docker build -t $GITEA_REGISTRY_URL/$OWNER/my-app:latest . + # registry.domain.com//my-app:latest e.g. git.bepastem.com/eberen/my-app:latest + docker build -t $GITEA_REGISTRY_URL/$OWNER/$IMAGE_NAME:latest . + + - name: Build and push Docker image using Buildx + env: + GITEA_REGISTRY_URL: ${{ vars.REGISTRY_URL }} + IMAGE_NAME: my-app-backend + APP_VERSION: v1.0.0 + OWNER: ${{ gitea.actor }} + LOGIN_TOKEN: ${{ secrets.LOGIN_TOKEN }} + run: | + docker buildx build --platform linux/amd64 -t $GITEA_REGISTRY_URL/$OWNER/$IMAGE_NAME:$APP_VERSION . + #docker buildx build \ + # --platform linux/amd64 \ + # #-t $GITEA_REGISTRY_URL/$OWNER/$IMAGE_NAME:latest \ + # #--push \ + # . + + - name: Push Docker image to Gitea Registry + env: + GITEA_USERNAME: ${{ gitea.actor }} + LOGIN_TOKEN: ${{ secrets.LOGIN_TOKEN }} + GITEA_REGISTRY_URL: ${{ vars.REGISTRY_URL }} + run: | + # Login securely + echo "$LOGIN_TOKEN" | docker login $GITEA_REGISTRY_URL --username $GITEA_USERNAME --password-stdin + docker push $GITEA_REGISTRY_URL/$GITEA_USERNAME/my-app:latest + docker logout $GITEA_REGISTRY_URL + + - name: Cleanup + run: | + docker images -a + docker system prune -f + docker images + echo "Cleanup done." + -- 2.49.0