.github/workflows/api-container.yml

@@ -68,8 +68,10 @@ jobs:
       DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
       TEST: ${{ secrets.TEST }}
-      COOLIFY_WEBHOOK_API: ${{ secrets.COOLIFY_WEBHOOK_API }}
+      TEAMCITY_API_ID: ${{ secrets.TEAMCITY_API_ID }}
-      COOLIFY_TOKEN: ${{ secrets.COOLIFY_TOKEN }}
+      TEAMCITY_URL: ${{ secrets.TEAMCITY_URL }}
+      TEAMCITY_USERNAME: ${{ secrets.TEAMCITY_USERNAME }}
+      TEAMCITY_PASSWORD: ${{ secrets.TEAMCITY_PASSWORD }}
     permissions:
       contents: read
       packages: write
@@ -90,8 +92,10 @@ jobs:
       DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
       TEST: ${{ secrets.TEST }}
-      COOLIFY_WEBHOOK_API: ${{ secrets.COOLIFY_WEBHOOK_API }}
+      TEAMCITY_API_ID: ${{ secrets.TEAMCITY_API_ID }}
-      COOLIFY_TOKEN: ${{ secrets.COOLIFY_TOKEN }}
+      TEAMCITY_URL: ${{ secrets.TEAMCITY_URL }}
+      TEAMCITY_USERNAME: ${{ secrets.TEAMCITY_USERNAME }}
+      TEAMCITY_PASSWORD: ${{ secrets.TEAMCITY_PASSWORD }}
     permissions:
       contents: read
       packages: write

.github/workflows/api-deploy-nonprod.yml

@@ -22,8 +22,10 @@ on:
       DOCKERHUB_USER: {}
       DOCKERHUB_TOKEN: {}
       TEST: {}
-      COOLIFY_WEBHOOK_API: {}
+      TEAMCITY_API_ID: {}
-      COOLIFY_TOKEN: {}
+      TEAMCITY_URL: {}
+      TEAMCITY_USERNAME: {}
+      TEAMCITY_PASSWORD: {}
 jobs:
   check-inputs:
     runs-on: 'ubuntu-latest'
@@ -31,17 +33,29 @@ jobs:
     steps:
       - name: Check secrets present
         run: |
-          if [[ -z "${{ secrets.COOLIFY_WEBHOOK_API }}" ]]; then
+          if [[ -z "${{ secrets.TEAMCITY_API_ID }}" ]]; then
-            echo "COOLIFY_WEBHOOK_API secret is empty or missing"
+            echo "TEAMCITY_API_ID secret is empty or missing"
             exit 1
           else
-            echo "COOLIFY_WEBHOOK_API secret is set"
+            echo "TEAMCITY_API_ID secret is set"
           fi
-          if [[ -z "${{ secrets.COOLIFY_TOKEN }}" ]]; then
+          if [[ -z "${{ secrets.TEAMCITY_URL }}" ]]; then
-            echo "COOLIFY_TOKEN secret is empty or missing"
+            echo "TEAMCITY_URL secret is empty or missing"
             exit 1
           else
-            echo "COOLIFY_TOKEN secret is set"
+            echo "TEAMCITY_URL secret is set"
+          fi
+          if [[ -z "${{ secrets.TEAMCITY_USERNAME }}" ]]; then
+            echo "TEAMCITY_USERNAME secret is empty or missing"
+            exit 1
+          else
+            echo "TEAMCITY_USERNAME secret is set"
+          fi
+          if [[ -z "${{ secrets.TEAMCITY_PASSWORD }}" ]]; then
+            echo "TEAMCITY_PASSWORD secret is empty or missing"
+            exit 1
+          else
+            echo "TEAMCITY_PASSWORD secret is set"
           fi
           if [[ -z "${{ secrets.DOCKERHUB_USER }}" ]]; then
             echo "DOCKERHUB_USER secret is empty or missing"
@@ -90,4 +104,7 @@ jobs:
     steps:
       - name: Deploy to Coolify
         run: |
-          curl -X GET '${{ secrets.COOLIFY_WEBHOOK_API }}' --header 'Authorization: Bearer ${{ secrets.COOLIFY_TOKEN }}'
+          curl -u ${{ secrets.TEAMCITY_USERNAME }}:${{ secrets.TEAMCITY_PASSWORD }} \
+               -X POST \
+               -d "buildType=id:${{ secrets.TEAMCITY_API_ID }}" \
+               "${{ secrets.TEAMCITY_URL }}/httpAuth/app/rest/buildQueue"

.github/workflows/api-deploy-prod.yml

@@ -22,8 +22,10 @@ on:
       DOCKERHUB_USER: {}
       DOCKERHUB_TOKEN: {}
       TEST: {}
-      COOLIFY_WEBHOOK_API: {}
+      TEAMCITY_API_ID: {}
-      COOLIFY_TOKEN: {}
+      TEAMCITY_URL: {}
+      TEAMCITY_USERNAME: {}
+      TEAMCITY_PASSWORD: {}
 jobs:
   check-inputs:
     runs-on: 'ubuntu-latest'
@@ -31,17 +33,29 @@ jobs:
     steps:
       - name: Check secrets present
         run: |
-          if [[ -z "${{ secrets.COOLIFY_WEBHOOK_API }}" ]]; then
+          if [[ -z "${{ secrets.TEAMCITY_API_ID }}" ]]; then
-            echo "COOLIFY_WEBHOOK_API secret is empty or missing"
+            echo "TEAMCITY_API_ID secret is empty or missing"
             exit 1
           else
-            echo "COOLIFY_WEBHOOK_API secret is set"
+            echo "TEAMCITY_API_ID secret is set"
           fi
-          if [[ -z "${{ secrets.COOLIFY_TOKEN }}" ]]; then
+          if [[ -z "${{ secrets.TEAMCITY_URL }}" ]]; then
-            echo "COOLIFY_TOKEN secret is empty or missing"
+            echo "TEAMCITY_URL secret is empty or missing"
             exit 1
           else
-            echo "COOLIFY_TOKEN secret is set"
+            echo "TEAMCITY_URL secret is set"
+          fi
+          if [[ -z "${{ secrets.TEAMCITY_USERNAME }}" ]]; then
+            echo "TEAMCITY_USERNAME secret is empty or missing"
+            exit 1
+          else
+            echo "TEAMCITY_USERNAME secret is set"
+          fi
+          if [[ -z "${{ secrets.TEAMCITY_PASSWORD }}" ]]; then
+            echo "TEAMCITY_PASSWORD secret is empty or missing"
+            exit 1
+          else
+            echo "TEAMCITY_PASSWORD secret is set"
           fi
           if [[ -z "${{ secrets.DOCKERHUB_USER }}" ]]; then
             echo "DOCKERHUB_USER secret is empty or missing"
@@ -90,4 +104,7 @@ jobs:
     steps:
       - name: Deploy to Coolify
         run: |
-          curl -X GET '${{ secrets.COOLIFY_WEBHOOK_API }}' --header 'Authorization: Bearer ${{ secrets.COOLIFY_TOKEN }}'
+          curl -u ${{ secrets.TEAMCITY_USERNAME }}:${{ secrets.TEAMCITY_PASSWORD }} \
+               -X POST \
+               -d "buildType=id:${{ secrets.TEAMCITY_API_ID }}" \
+               "${{ secrets.TEAMCITY_URL }}/httpAuth/app/rest/buildQueue"

.github/workflows/web-container.yml

@@ -68,8 +68,10 @@ jobs:
       DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
       TEST: ${{ secrets.TEST }}
-      COOLIFY_WEBHOOK_WEB: ${{ secrets.COOLIFY_WEBHOOK_WEB }}
+      TEAMCITY_WEB_ID: ${{ secrets.TEAMCITY_WEB_ID }}
-      COOLIFY_TOKEN: ${{ secrets.COOLIFY_TOKEN }}
+      TEAMCITY_URL: ${{ secrets.TEAMCITY_URL }}
+      TEAMCITY_USERNAME: ${{ secrets.TEAMCITY_USERNAME }}
+      TEAMCITY_PASSWORD: ${{ secrets.TEAMCITY_PASSWORD }}
     permissions:
       contents: read
       packages: write
@@ -90,8 +92,10 @@ jobs:
       DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
       TEST: ${{ secrets.TEST }}
-      COOLIFY_WEBHOOK_WEB: ${{ secrets.COOLIFY_WEBHOOK_WEB }}
+      TEAMCITY_WEB_ID: ${{ secrets.TEAMCITY_WEB_ID }}
-      COOLIFY_TOKEN: ${{ secrets.COOLIFY_TOKEN }}
+      TEAMCITY_URL: ${{ secrets.TEAMCITY_URL }}
+      TEAMCITY_USERNAME: ${{ secrets.TEAMCITY_USERNAME }}
+      TEAMCITY_PASSWORD: ${{ secrets.TEAMCITY_PASSWORD }}
     permissions:
       contents: read
       packages: write

.github/workflows/web-deploy-nonprod.yml

@@ -22,8 +22,10 @@ on:
       DOCKERHUB_USER: {}
       DOCKERHUB_TOKEN: {}
       TEST: {}
-      COOLIFY_WEBHOOK_WEB: {}
+      TEAMCITY_WEB_ID: {}
-      COOLIFY_TOKEN: {}
+      TEAMCITY_URL: {}
+      TEAMCITY_USERNAME: {}
+      TEAMCITY_PASSWORD: {}
 jobs:
   check-inputs:
     runs-on: 'ubuntu-latest'
@@ -31,17 +33,29 @@ jobs:
     steps:
       - name: Check secrets present
         run: |
-          if [[ -z "${{ secrets.COOLIFY_WEBHOOK_WEB }}" ]]; then
+          if [[ -z "${{ secrets.TEAMCITY_WEB_ID }}" ]]; then
-            echo "COOLIFY_WEBHOOK_WEB secret is empty or missing"
+            echo "TEAMCITY_WEB_ID secret is empty or missing"
             exit 1
           else
-            echo "COOLIFY_WEBHOOK_WEB secret is set"
+            echo "TEAMCITY_WEB_ID secret is set"
           fi
-          if [[ -z "${{ secrets.COOLIFY_TOKEN }}" ]]; then
+          if [[ -z "${{ secrets.TEAMCITY_URL }}" ]]; then
-            echo "COOLIFY_TOKEN secret is empty or missing"
+            echo "TEAMCITY_URL secret is empty or missing"
             exit 1
           else
-            echo "COOLIFY_TOKEN secret is set"
+            echo "TEAMCITY_URL secret is set"
+          fi
+          if [[ -z "${{ secrets.TEAMCITY_USERNAME }}" ]]; then
+            echo "TEAMCITY_USERNAME secret is empty or missing"
+            exit 1
+          else
+            echo "TEAMCITY_USERNAME secret is set"
+          fi
+          if [[ -z "${{ secrets.TEAMCITY_PASSWORD }}" ]]; then
+            echo "TEAMCITY_PASSWORD secret is empty or missing"
+            exit 1
+          else
+            echo "TEAMCITY_PASSWORD secret is set"
           fi
           if [[ -z "${{ secrets.DOCKERHUB_USER }}" ]]; then
             echo "DOCKERHUB_USER secret is empty or missing"
@@ -90,4 +104,7 @@ jobs:
     steps:
       - name: Deploy to Coolify
         run: |
-          curl -X GET '${{ secrets.COOLIFY_WEBHOOK_WEB }}' --header 'Authorization: Bearer ${{ secrets.COOLIFY_TOKEN }}'
+          curl -u ${{ secrets.TEAMCITY_USERNAME }}:${{ secrets.TEAMCITY_PASSWORD }} \
+               -X POST \
+               -d "buildType=id:${{ secrets.TEAMCITY_WEB_ID }}" \
+               "${{ secrets.TEAMCITY_URL }}/httpAuth/app/rest/buildQueue"

.github/workflows/web-deploy-prod.yml

@@ -22,8 +22,10 @@ on:
       DOCKERHUB_USER: {}
       DOCKERHUB_TOKEN: {}
       TEST: {}
-      COOLIFY_WEBHOOK_WEB: {}
+      TEAMCITY_WEB_ID: {}
-      COOLIFY_TOKEN: {}
+      TEAMCITY_URL: {}
+      TEAMCITY_USERNAME: {}
+      TEAMCITY_PASSWORD: {}
 jobs:
   check-inputs:
     runs-on: 'ubuntu-latest'
@@ -31,17 +33,29 @@ jobs:
     steps:
       - name: Check secrets present
         run: |
-          if [[ -z "${{ secrets.COOLIFY_WEBHOOK_WEB }}" ]]; then
+          if [[ -z "${{ secrets.TEAMCITY_WEB_ID }}" ]]; then
-            echo "COOLIFY_WEBHOOK_WEB secret is empty or missing"
+            echo "TEAMCITY_WEB_ID secret is empty or missing"
             exit 1
           else
-            echo "COOLIFY_WEBHOOK_WEB secret is set"
+            echo "TEAMCITY_WEB_ID secret is set"
           fi
-          if [[ -z "${{ secrets.COOLIFY_TOKEN }}" ]]; then
+          if [[ -z "${{ secrets.TEAMCITY_URL }}" ]]; then
-            echo "COOLIFY_TOKEN secret is empty or missing"
+            echo "TEAMCITY_URL secret is empty or missing"
             exit 1
           else
-            echo "COOLIFY_TOKEN secret is set"
+            echo "TEAMCITY_URL secret is set"
+          fi
+          if [[ -z "${{ secrets.TEAMCITY_USERNAME }}" ]]; then
+            echo "TEAMCITY_USERNAME secret is empty or missing"
+            exit 1
+          else
+            echo "TEAMCITY_USERNAME secret is set"
+          fi
+          if [[ -z "${{ secrets.TEAMCITY_PASSWORD }}" ]]; then
+            echo "TEAMCITY_PASSWORD secret is empty or missing"
+            exit 1
+          else
+            echo "TEAMCITY_PASSWORD secret is set"
           fi
           if [[ -z "${{ secrets.DOCKERHUB_USER }}" ]]; then
             echo "DOCKERHUB_USER secret is empty or missing"
@@ -90,4 +104,7 @@ jobs:
     steps:
       - name: Deploy to Coolify
         run: |
-          curl -X GET '${{ secrets.COOLIFY_WEBHOOK_WEB }}' --header 'Authorization: Bearer ${{ secrets.COOLIFY_TOKEN }}'
+          curl -u ${{ secrets.TEAMCITY_USERNAME }}:${{ secrets.TEAMCITY_PASSWORD }} \
+               -X POST \
+               -d "buildType=id:${{ secrets.TEAMCITY_WEB_ID }}" \
+               "${{ secrets.TEAMCITY_URL }}/httpAuth/app/rest/buildQueue"