From d26a9bffc5d18f2c3497e745057607f0128226e2 Mon Sep 17 00:00:00 2001 From: Cedric Date: Sun, 12 Jan 2025 11:23:17 +0100 Subject: [PATCH 1/4] tag --- .gitea/workflows/tag_release.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/tag_release.yml b/.gitea/workflows/tag_release.yml index 7a4092c..65d053c 100644 --- a/.gitea/workflows/tag_release.yml +++ b/.gitea/workflows/tag_release.yml @@ -2,8 +2,8 @@ name: Build and Deploy Versioned Spring Boot Server on: push: - tags: # Match all tags - - "*" + tags: + - "*" # Match all tags jobs: build: @@ -43,7 +43,11 @@ jobs: - name: Extract Tag Version id: extract_version run: | - TAG_VERSION=${GITEA_REF#refs/tags/} + TAG_VERSION=$(echo "${GITEA_REF}" | sed 's#refs/tags/##') + if [ -z "$TAG_VERSION" ]; then + echo "Error: TAG_VERSION is empty." + exit 1 + fi echo "TAG_VERSION=$TAG_VERSION" >> $GITHUB_ENV # 7. Build the Docker image with the tag -- 2.49.1 From 3db2806a047b4e342faed1daa2db2f9237940bf7 Mon Sep 17 00:00:00 2001 From: Cedric Date: Sun, 12 Jan 2025 11:46:29 +0100 Subject: [PATCH 2/4] fix gitea tag --- .gitea/workflows/tag_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/tag_release.yml b/.gitea/workflows/tag_release.yml index 65d053c..2886ea9 100644 --- a/.gitea/workflows/tag_release.yml +++ b/.gitea/workflows/tag_release.yml @@ -43,7 +43,7 @@ jobs: - name: Extract Tag Version id: extract_version run: | - TAG_VERSION=$(echo "${GITEA_REF}" | sed 's#refs/tags/##') + TAG_VERSION=$(echo "${GITHUB_REF}" | sed 's#refs/tags/##') if [ -z "$TAG_VERSION" ]; then echo "Error: TAG_VERSION is empty." exit 1 -- 2.49.1 From 383044937718962a5e6c9eb3b0da0dfaf1ffbd2c Mon Sep 17 00:00:00 2001 From: Cedric Date: Sun, 12 Jan 2025 12:36:43 +0100 Subject: [PATCH 3/4] major minor version tagging --- .gitea/workflows/tag_release.yml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/tag_release.yml b/.gitea/workflows/tag_release.yml index 2886ea9..b2244a4 100644 --- a/.gitea/workflows/tag_release.yml +++ b/.gitea/workflows/tag_release.yml @@ -50,17 +50,35 @@ jobs: fi echo "TAG_VERSION=$TAG_VERSION" >> $GITHUB_ENV + # Extract major and minor versions + MAJOR_VERSION=$(echo "${TAG_VERSION}" | cut -d. -f1) + MINOR_VERSION=$(echo "${TAG_VERSION}" | cut -d. -f1,2) + echo "MAJOR_VERSION=$MAJOR_VERSION" >> $GITHUB_ENV + echo "MINOR_VERSION=$MINOR_VERSION" >> $GITHUB_ENV + # 7. Build the Docker image with the tag - name: Build and Package Docker Image run: | docker build -t tea.zendric.de/cedric/xpensely-server:${{ env.TAG_VERSION }} . - # 8. Docker login + # 8. Tag the image with Major Version (e.g., 0) + - name: Tag with Major Version + run: | + docker tag tea.zendric.de/cedric/xpensely-server:${{ env.TAG_VERSION }} tea.zendric.de/cedric/xpensely-server:${{ env.MAJOR_VERSION }} + + # 9. Tag the image with Minor Version (e.g., 0.1) + - name: Tag with Minor Version + run: | + docker tag tea.zendric.de/cedric/xpensely-server:${{ env.TAG_VERSION }} tea.zendric.de/cedric/xpensely-server:${{ env.MINOR_VERSION }} + + # 10. Docker login - name: Login to Docker Registry run: | echo "${{ secrets.TEAPASSWORD }}" | docker login tea.zendric.de -u ${{ secrets.TEAUSER }} --password-stdin - # 9. Push the Docker image with the tag + # 11. Push the Docker images with the tags - name: Push the Docker Image to registry run: | docker push tea.zendric.de/cedric/xpensely-server:${{ env.TAG_VERSION }} + docker push tea.zendric.de/cedric/xpensely-server:${{ env.MAJOR_VERSION }} + docker push tea.zendric.de/cedric/xpensely-server:${{ env.MINOR_VERSION }} -- 2.49.1 From 31566d1bd8974a909f40761ff56a148aa6400f4b Mon Sep 17 00:00:00 2001 From: Cedric Date: Sun, 12 Jan 2025 14:14:13 +0100 Subject: [PATCH 4/4] adjusted compose --- docker-compose.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 886656c..7d64546 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,15 +1,17 @@ version: "3.8" services: xpensely-server: - image: tea.zendric.de/cedric/xpensely-server:latest + image: tea.zendric.de/cedric/xpensely-server:0 + labels: + net.unraid.docker.icon: https://tea.zendric.de/Cedric/XpenselyServer/raw/branch/main/src/main/resources/static/xpensely_icon_white.png container_name: xpensely-server ports: - 3636:8080 environment: GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID} GOOGLE_CLIENT_SECRET: ${GOOGLE_CLIENT_SECRET} - DB_PORT: 5434 - DB_NAME: ${DB_P_NAME} + DB_PORT: 5432 + DB_P_NAME: xpensely DB_USERNAME: ${DB_USERNAME} DB_PASSWORD: ${DB_PASSWORD} depends_on: @@ -18,12 +20,14 @@ services: networks: - xpensely-network postgresdb: + labels: + net.unraid.docker.icon: https://raw.githubusercontent.com/docker-library/docs/01c12653951b2fe592c1f93a13b4e289ada0e3a1/postgres/logo.png image: postgres:14 container_name: postgresdb ports: - - 5434:5432 + - 5432:5432 environment: - POSTGRES_DB: ${DB_P_NAME} + POSTGRES_DB: xpensely POSTGRES_USER: ${DB_USERNAME} POSTGRES_PASSWORD: ${DB_PASSWORD} networks: @@ -32,7 +36,9 @@ services: - db_data:/var/lib/postgresql/data restart: unless-stopped healthcheck: - test: ["CMD-SHELL", "pg_isready -U ${DB_USERNAME}"] + test: + - CMD-SHELL + - pg_isready -U ${DB_USERNAME} -d xpensely interval: 10s timeout: 5s retries: 5 -- 2.49.1