Merge pull request #31 from Doble-Technologies/test-deploy

Test deploy

.github/workflows/api-container.yml

@@ -1,95 +1,101 @@
-name: API Deployment Container
-on:
-  workflow_dispatch: {}
-  pull_request:
-    branches:
-      - main
-    types:
-      - opened
-      - reopened
-      - synchronize
-      - ready_for_review
-  push:
-    branches:
-      - main
-    paths:
-      - api/**
-jobs:
-  determine-workflow:
-    runs-on: 'ubuntu-latest'
-    outputs:
-      workflow_type: ${{ steps.workflow.outputs.workflow_type }}
-      workflow_envs: ${{ steps.workflow.outputs.workflow_envs }}
-      release_type: ${{ steps.workflow.outputs.release_type }}
-      current_version: ${{ steps.version.outputs.current_version }}
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-      - name: Determine Workflow
-        id: workflow
-        shell: bash
-        run: |
-          event=${{ github.event_name }}
-          workflow_type='dev';
-          workflow_envs='["dev"]'
-          if [[ $event == 'workflow_dispatch' && '${{ github.ref_name }}' == 'main' ]];
-          then
-            echo "in if statement"
-            workflow_type='release';
-            workflow_envs='["prod"]'
-          fi
-
-          echo "workflow_type=$workflow_type" >> $GITHUB_OUTPUT
-          echo "workflow_envs=$workflow_envs" >> $GITHUB_OUTPUT
-
-          echo "Running $workflow_type pipeline in environments: $workflow_envs" >> $GITHUB_STEP_SUMMARY
-      - name: Extract Version
-        id: version
-        shell: bash
-        run: |
-          version=$(jq -r '.version' api/package.json)
-          echo "current_version=$version" >> "$GITHUB_OUTPUT"
-  nonprod-deploy:
-    needs: determine-workflow
-    if: needs.determine-workflow.outputs.workflow_type != 'release'
-    strategy:
-      max-parallel: 1
-      matrix:
-        env: ${{ fromJson(needs.determine-workflow.outputs.workflow_envs) }}
-    uses: ./.github/workflows/api-deploy-nonprod.yml
-    with:
-      environments: ${{ matrix.env }}
-      workflow_type: ${{ needs.determine-workflow.outputs.workflow_type }}
-      branch: ${{ github.head_ref || github.ref_name }}
-      current_version: ${{ needs.determine-workflow.outputs.current_version }}
-    secrets:
-      DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
-      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
-      TEST: ${{ secrets.TEST }}
-      COOLIFY_WEBHOOK_API: ${{ secrets.COOLIFY_WEBHOOK_API }}
-      COOLIFY_TOKEN: ${{ secrets.COOLIFY_TOKEN }}
-    permissions:
-      contents: read
-      packages: write
-  prod-deploy:
-    needs: determine-workflow
-    if: needs.determine-workflow.outputs.workflow_type == 'release'
-    strategy:
-      max-parallel: 1
-      matrix:
-        env: ${{ fromJson(needs.determine-workflow.outputs.workflow_envs) }}
-    uses: ./.github/workflows/api-deploy-prod.yml
-    with:
-      environments: ${{ matrix.env }}
-      workflow_type: ${{ needs.determine-workflow.outputs.workflow_type }}
-      branch: ${{ github.head_ref || github.ref_name }}
-      current_version: ${{ needs.determine-workflow.outputs.current_version }}
-    secrets:
-      DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
-      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
-      TEST: ${{ secrets.TEST }}
-      COOLIFY_WEBHOOK_API: ${{ secrets.COOLIFY_WEBHOOK_API }}
-      COOLIFY_TOKEN: ${{ secrets.COOLIFY_TOKEN }}
-    permissions:
-      contents: read
-      packages: write
+name: API Deployment Container
+on:
+  workflow_dispatch: {}
+  pull_request:
+    branches:
+      - main
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - ready_for_review
+    paths:
+      - api/**
+  push:
+    branches:
+      - main
+    paths:
+      - api/**
+jobs:
+  determine-workflow:
+    runs-on: 'ubuntu-latest'
+    outputs:
+      workflow_type: ${{ steps.workflow.outputs.workflow_type }}
+      workflow_envs: ${{ steps.workflow.outputs.workflow_envs }}
+      release_type: ${{ steps.workflow.outputs.release_type }}
+      current_version: ${{ steps.version.outputs.current_version }}
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+      - name: Determine Workflow
+        id: workflow
+        shell: bash
+        run: |
+          event=${{ github.event_name }}
+          workflow_type='dev';
+          workflow_envs='["dev"]'
+          if [[ $event == 'workflow_dispatch' && '${{ github.ref_name }}' == 'main' ]];
+          then
+            echo "in if statement"
+            workflow_type='release';
+            workflow_envs='["prod"]'
+          fi
+
+          echo "workflow_type=$workflow_type" >> $GITHUB_OUTPUT
+          echo "workflow_envs=$workflow_envs" >> $GITHUB_OUTPUT
+
+          echo "Running $workflow_type pipeline in environments: $workflow_envs" >> $GITHUB_STEP_SUMMARY
+      - name: Extract Version
+        id: version
+        shell: bash
+        run: |
+          version=$(jq -r '.version' api/package.json)
+          echo "current_version=$version" >> "$GITHUB_OUTPUT"
+  nonprod-deploy:
+    needs: determine-workflow
+    if: needs.determine-workflow.outputs.workflow_type != 'release'
+    strategy:
+      max-parallel: 1
+      matrix:
+        env: ${{ fromJson(needs.determine-workflow.outputs.workflow_envs) }}
+    uses: ./.github/workflows/api-deploy-nonprod.yml
+    with:
+      environments: ${{ matrix.env }}
+      workflow_type: ${{ needs.determine-workflow.outputs.workflow_type }}
+      branch: ${{ github.head_ref || github.ref_name }}
+      current_version: ${{ needs.determine-workflow.outputs.current_version }}
+    secrets:
+      DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+      TEST: ${{ secrets.TEST }}
+      TEAMCITY_API_ID: ${{ secrets.TEAMCITY_API_ID }}
+      TEAMCITY_URL: ${{ secrets.TEAMCITY_URL }}
+      TEAMCITY_USERNAME: ${{ secrets.TEAMCITY_USERNAME }}
+      TEAMCITY_PASSWORD: ${{ secrets.TEAMCITY_PASSWORD }}
+    permissions:
+      contents: read
+      packages: write
+  prod-deploy:
+    needs: determine-workflow
+    if: needs.determine-workflow.outputs.workflow_type == 'release'
+    strategy:
+      max-parallel: 1
+      matrix:
+        env: ${{ fromJson(needs.determine-workflow.outputs.workflow_envs) }}
+    uses: ./.github/workflows/api-deploy-prod.yml
+    with:
+      environments: ${{ matrix.env }}
+      workflow_type: ${{ needs.determine-workflow.outputs.workflow_type }}
+      branch: ${{ github.head_ref || github.ref_name }}
+      current_version: ${{ needs.determine-workflow.outputs.current_version }}
+    secrets:
+      DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+      TEST: ${{ secrets.TEST }}
+      TEAMCITY_API_ID: ${{ secrets.TEAMCITY_API_ID }}
+      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: {}
-      COOLIFY_TOKEN: {}
+      TEAMCITY_API_ID: {}
+      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
-            echo "COOLIFY_WEBHOOK_API secret is empty or missing"
+          if [[ -z "${{ secrets.TEAMCITY_API_ID }}" ]]; then
+            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
-            echo "COOLIFY_TOKEN secret is empty or missing"
+          if [[ -z "${{ secrets.TEAMCITY_URL }}" ]]; then
+            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"
@@ -88,7 +102,12 @@ jobs:
       contents: read
       packages: write
     steps:
-      - name: Deploy to Coolify
+      - name: Deploy to Team City
         run: |
-          curl '${{ secrets.COOLIFY_WEBHOOK_API }}' --header 'Authorization: Bearer ${{ secrets.COOLIFY_TOKEN }}'
-    
+          curl -u ${{ secrets.TEAMCITY_USERNAME }}:${{ secrets.TEAMCITY_PASSWORD }} \
+               -X POST \
+               -H "Content-Type: application/json" \
+               -d '{"buildType": {"id": "${{ secrets.TEAMCITY_API_ID }}"}}' \
+               "${{ secrets.TEAMCITY_URL }}/httpAuth/app/rest/buildQueue" > /dev/null
+
+

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

@@ -1,94 +1,111 @@
-name: API Deployment Production
-on:
-  workflow_call:
-    inputs:
-      environments:
-        type: string
-        description: An optional list of environments to deploy to.
-        default: 'prod'
-      workflow_type:
-        type: string
-        description: An optional string for workflow types.
-        default: 'prod'
-      branch:
-        type: string
-        description: An optional string to define which branch to checkout.
-        default: 'main'
-      current_version:
-        type: string
-        description: Current Version of the package.json.
-        default: '0.0.0'
-    secrets:
-      DOCKERHUB_USER: {}
-      DOCKERHUB_TOKEN: {}
-      TEST: {}
-      COOLIFY_WEBHOOK_API: {}
-      COOLIFY_TOKEN: {}
-jobs:
-  check-inputs:
-    runs-on: 'ubuntu-latest'
-    environment: ${{ inputs.environments }}
-    steps:
-      - name: Check secrets present
-        run: |
-          if [[ -z "${{ secrets.COOLIFY_WEBHOOK_API }}" ]]; then
-            echo "COOLIFY_WEBHOOK_API secret is empty or missing"
-            exit 1
-          else
-            echo "COOLIFY_WEBHOOK_API secret is set"
-          fi
-          if [[ -z "${{ secrets.COOLIFY_TOKEN }}" ]]; then
-            echo "COOLIFY_TOKEN secret is empty or missing"
-            exit 1
-          else
-            echo "COOLIFY_TOKEN secret is set"
-          fi
-          if [[ -z "${{ secrets.DOCKERHUB_USER }}" ]]; then
-            echo "DOCKERHUB_USER secret is empty or missing"
-            exit 1
-          else
-            echo "DOCKERHUB_USER secret is set"
-          fi
-          if [[ -z "${{ secrets.DOCKERHUB_TOKEN }}" ]]; then
-            echo "DOCKERHUB_TOKEN secret is empty or missing"
-            exit 1
-          else
-            echo "DOCKERHUB_TOKEN secret is set"
-          fi
-          echo "Current Version: ${{inputs.current_version}}"
-  build:
-    needs: check-inputs
-    if: needs.check-inputs.result == 'success' && inputs.workflow_type == 'release'
-    environment: ${{ inputs.environments }}
-    runs-on: 'ubuntu-latest'
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Branch Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.branch }}
-      - name: Login to Docker
-        uses: docker/login-action@v3
-        with:
-          registry: docker.io
-          username: ${{ secrets.DOCKERHUB_USER }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Docker Build Backend
-        run: docker build -f api/Dockerfile -t john4064/shiftsync:prod_api ./api --build-arg ENVIRONMENT=prod
-      - name: Docker Push Backend
-        run: docker push john4064/shiftsync:prod_api
-  deploy:
-    needs: build
-    if: needs.build.result == 'success' && inputs.workflow_type == 'release'
-    environment: ${{ inputs.environments }}
-    runs-on: 'ubuntu-latest'
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Deploy to Coolify
-        run: |
-          curl '${{ secrets.COOLIFY_WEBHOOK_API }}' --header 'Authorization: Bearer ${{ secrets.COOLIFY_TOKEN }}'
-    
+name: API Deployment Production
+on:
+  workflow_call:
+    inputs:
+      environments:
+        type: string
+        description: An optional list of environments to deploy to.
+        default: 'prod'
+      workflow_type:
+        type: string
+        description: An optional string for workflow types.
+        default: 'prod'
+      branch:
+        type: string
+        description: An optional string to define which branch to checkout.
+        default: 'main'
+      current_version:
+        type: string
+        description: Current Version of the package.json.
+        default: '0.0.0'
+    secrets:
+      DOCKERHUB_USER: {}
+      DOCKERHUB_TOKEN: {}
+      TEST: {}
+      TEAMCITY_API_ID: {}
+      TEAMCITY_URL: {}
+      TEAMCITY_USERNAME: {}
+      TEAMCITY_PASSWORD: {}
+jobs:
+  check-inputs:
+    runs-on: 'ubuntu-latest'
+    environment: ${{ inputs.environments }}
+    steps:
+      - name: Check secrets present
+        run: |
+          if [[ -z "${{ secrets.TEAMCITY_API_ID }}" ]]; then
+            echo "TEAMCITY_API_ID secret is empty or missing"
+            exit 1
+          else
+            echo "TEAMCITY_API_ID secret is set"
+          fi
+          if [[ -z "${{ secrets.TEAMCITY_URL }}" ]]; then
+            echo "TEAMCITY_URL secret is empty or missing"
+            exit 1
+          else
+            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"
+            exit 1
+          else
+            echo "DOCKERHUB_USER secret is set"
+          fi
+          if [[ -z "${{ secrets.DOCKERHUB_TOKEN }}" ]]; then
+            echo "DOCKERHUB_TOKEN secret is empty or missing"
+            exit 1
+          else
+            echo "DOCKERHUB_TOKEN secret is set"
+          fi
+          echo "Current Version: ${{inputs.current_version}}"
+  build:
+    needs: check-inputs
+    if: needs.check-inputs.result == 'success' && inputs.workflow_type == 'release'
+    environment: ${{ inputs.environments }}
+    runs-on: 'ubuntu-latest'
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Branch Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.branch }}
+      - name: Login to Docker
+        uses: docker/login-action@v3
+        with:
+          registry: docker.io
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Docker Build Backend
+        run: docker build -f api/Dockerfile -t john4064/shiftsync:prod_api ./api --build-arg ENVIRONMENT=prod
+      - name: Docker Push Backend
+        run: docker push john4064/shiftsync:prod_api
+  deploy:
+    needs: build
+    if: needs.build.result == 'success' && inputs.workflow_type == 'release'
+    environment: ${{ inputs.environments }}
+    runs-on: 'ubuntu-latest'
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Deploy to Team City
+        run: |
+          curl -u ${{ secrets.TEAMCITY_USERNAME }}:${{ secrets.TEAMCITY_PASSWORD }} \
+               -X POST \
+               -H "Content-Type: application/json" \
+               -d '{"buildType": {"id": "${{ secrets.TEAMCITY_API_ID }}"}}' \
+               "${{ secrets.TEAMCITY_URL }}/httpAuth/app/rest/buildQueue" > /dev/null

.github/workflows/pr-validation.yml

@@ -1,19 +1,19 @@
-name: PR Validation
-on:
-  pull_request:
-    types: [opened]
-
-permissions:
-  contents: read
-
-jobs:
-  pr-validation:
-    permissions:
-      contents: read
-      pull-requests: write
-    runs-on: ['self-hosted', 'pi']
-    steps:
-      - uses: TimonVS/pr-labeler-action@v5
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          configuration-path: .github/configs/pr-labeler-configuration.yml
+name: PR Validation
+on:
+  pull_request:
+    types: [opened]
+
+permissions:
+  contents: read
+
+jobs:
+  pr-validation:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: 'ubuntu-latest'
+    steps:
+      - uses: TimonVS/pr-labeler-action@v5
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          configuration-path: .github/configs/pr-labeler-configuration.yml

.github/workflows/web-container.yml

@@ -9,6 +9,8 @@ on:
       - reopened
       - synchronize
       - ready_for_review
+    paths:
+      - web/**
   push:
     branches:
       - main
@@ -16,7 +18,7 @@ on:
       - web/**
 jobs:
   determine-workflow:
-    runs-on: ['self-hosted','pi']
+    runs-on: 'ubuntu-latest'
     outputs:
       workflow_type: ${{ steps.workflow.outputs.workflow_type }}
       workflow_envs: ${{ steps.workflow.outputs.workflow_envs }}
@@ -66,8 +68,10 @@ jobs:
       DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
       TEST: ${{ secrets.TEST }}
-      COOLIFY_WEBHOOK_WEB: ${{ secrets.COOLIFY_WEBHOOK_WEB }}
-      COOLIFY_TOKEN: ${{ secrets.COOLIFY_TOKEN }}
+      TEAMCITY_WEB_ID: ${{ secrets.TEAMCITY_WEB_ID }}
+      TEAMCITY_URL: ${{ secrets.TEAMCITY_URL }}
+      TEAMCITY_USERNAME: ${{ secrets.TEAMCITY_USERNAME }}
+      TEAMCITY_PASSWORD: ${{ secrets.TEAMCITY_PASSWORD }}
     permissions:
       contents: read
       packages: write
@@ -88,8 +92,10 @@ jobs:
       DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
       TEST: ${{ secrets.TEST }}
-      COOLIFY_WEBHOOK_WEB: ${{ secrets.COOLIFY_WEBHOOK_WEB }}
-      COOLIFY_TOKEN: ${{ secrets.COOLIFY_TOKEN }}
+      TEAMCITY_WEB_ID: ${{ secrets.TEAMCITY_WEB_ID }}
+      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

@@ -1,94 +1,111 @@
-name: Web Deployment Non-Production
-on:
-  workflow_call:
-    inputs:
-      environments:
-        type: string
-        description: An optional list of environments to deploy to.
-        default: 'dev'
-      workflow_type:
-        type: string
-        description: An optional string for workflow types.
-        default: 'dev'
-      branch:
-        type: string
-        description: An optional string to define which branch to checkout.
-        default: 'main'
-      current_version:
-        type: string
-        description: Current Version of the package.json.
-        default: '0.0.0'
-    secrets:
-      DOCKERHUB_USER: {}
-      DOCKERHUB_TOKEN: {}
-      TEST: {}
-      COOLIFY_WEBHOOK_WEB: {}
-      COOLIFY_TOKEN: {}
-jobs:
-  check-inputs:
-    runs-on: 'ubuntu-latest'
-    environment: ${{ inputs.environments }}
-    steps:
-      - name: Check secrets present
-        run: |
-          if [[ -z "${{ secrets.COOLIFY_WEBHOOK_WEB }}" ]]; then
-            echo "COOLIFY_WEBHOOK_WEB secret is empty or missing"
-            exit 1
-          else
-            echo "COOLIFY_WEBHOOK_WEB secret is set"
-          fi
-          if [[ -z "${{ secrets.COOLIFY_TOKEN }}" ]]; then
-            echo "COOLIFY_TOKEN secret is empty or missing"
-            exit 1
-          else
-            echo "COOLIFY_TOKEN secret is set"
-          fi
-          if [[ -z "${{ secrets.DOCKERHUB_USER }}" ]]; then
-            echo "DOCKERHUB_USER secret is empty or missing"
-            exit 1
-          else
-            echo "DOCKERHUB_USER secret is set"
-          fi
-          if [[ -z "${{ secrets.DOCKERHUB_TOKEN }}" ]]; then
-            echo "DOCKERHUB_TOKEN secret is empty or missing"
-            exit 1
-          else
-            echo "DOCKERHUB_TOKEN secret is set"
-          fi
-          echo "Current Version: ${{inputs.current_version}}"
-  build:
-    needs: check-inputs
-    if: needs.check-inputs.result == 'success' && inputs.workflow_type != 'release'
-    environment: ${{ inputs.environments }}
-    runs-on: 'ubuntu-latest'
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Branch Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.branch }}
-      - name: Login to Docker
-        uses: docker/login-action@v3
-        with:
-          registry: docker.io
-          username: ${{ secrets.DOCKERHUB_USER }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Docker Build Backend
-        run: docker build -f web/Dockerfile -t john4064/shiftsync:latest_web ./web --build-arg ENVIRONMENT=dev
-      - name: Docker Push Backend
-        run: docker push john4064/shiftsync:latest_web
-  deploy:
-    needs: build
-    if: needs.build.result == 'success' && inputs.workflow_type != 'release'
-    environment: ${{ inputs.environments }}
-    runs-on: 'ubuntu-latest'
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Deploy to Coolify
-        run: |
-          curl '${{ secrets.COOLIFY_WEBHOOK_WEB }}' --header 'Authorization: Bearer ${{ secrets.COOLIFY_TOKEN }}'
-    
+name: Web Deployment Non-Production
+on:
+  workflow_call:
+    inputs:
+      environments:
+        type: string
+        description: An optional list of environments to deploy to.
+        default: 'dev'
+      workflow_type:
+        type: string
+        description: An optional string for workflow types.
+        default: 'dev'
+      branch:
+        type: string
+        description: An optional string to define which branch to checkout.
+        default: 'main'
+      current_version:
+        type: string
+        description: Current Version of the package.json.
+        default: '0.0.0'
+    secrets:
+      DOCKERHUB_USER: {}
+      DOCKERHUB_TOKEN: {}
+      TEST: {}
+      TEAMCITY_WEB_ID: {}
+      TEAMCITY_URL: {}
+      TEAMCITY_USERNAME: {}
+      TEAMCITY_PASSWORD: {}
+jobs:
+  check-inputs:
+    runs-on: 'ubuntu-latest'
+    environment: ${{ inputs.environments }}
+    steps:
+      - name: Check secrets present
+        run: |
+          if [[ -z "${{ secrets.TEAMCITY_WEB_ID }}" ]]; then
+            echo "TEAMCITY_WEB_ID secret is empty or missing"
+            exit 1
+          else
+            echo "TEAMCITY_WEB_ID secret is set"
+          fi
+          if [[ -z "${{ secrets.TEAMCITY_URL }}" ]]; then
+            echo "TEAMCITY_URL secret is empty or missing"
+            exit 1
+          else
+            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"
+            exit 1
+          else
+            echo "DOCKERHUB_USER secret is set"
+          fi
+          if [[ -z "${{ secrets.DOCKERHUB_TOKEN }}" ]]; then
+            echo "DOCKERHUB_TOKEN secret is empty or missing"
+            exit 1
+          else
+            echo "DOCKERHUB_TOKEN secret is set"
+          fi
+          echo "Current Version: ${{inputs.current_version}}"
+  build:
+    needs: check-inputs
+    if: needs.check-inputs.result == 'success' && inputs.workflow_type != 'release'
+    environment: ${{ inputs.environments }}
+    runs-on: 'ubuntu-latest'
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Branch Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.branch }}
+      - name: Login to Docker
+        uses: docker/login-action@v3
+        with:
+          registry: docker.io
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Docker Build Backend
+        run: docker build -f web/Dockerfile -t john4064/shiftsync:latest_web ./web --build-arg ENVIRONMENT=dev
+      - name: Docker Push Backend
+        run: docker push john4064/shiftsync:latest_web
+  deploy:
+    needs: build
+    if: needs.build.result == 'success' && inputs.workflow_type != 'release'
+    environment: ${{ inputs.environments }}
+    runs-on: 'ubuntu-latest'
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Deploy to Team City
+        run: |
+          curl -u ${{ secrets.TEAMCITY_USERNAME }}:${{ secrets.TEAMCITY_PASSWORD }} \
+               -X POST \
+               -H "Content-Type: application/json" \
+               -d '{"buildType": {"id": "${{ secrets.TEAMCITY_WEB_ID }}"}}' \
+               "${{ secrets.TEAMCITY_URL }}/httpAuth/app/rest/buildQueue" > /dev/null

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

@@ -1,94 +1,111 @@
-name: Web Deployment Production
-on:
-  workflow_call:
-    inputs:
-      environments:
-        type: string
-        description: An optional list of environments to deploy to.
-        default: 'prod'
-      workflow_type:
-        type: string
-        description: An optional string for workflow types.
-        default: 'prod'
-      branch:
-        type: string
-        description: An optional string to define which branch to checkout.
-        default: 'main'
-      current_version:
-        type: string
-        description: Current Version of the package.json.
-        default: '0.0.0'
-    secrets:
-      DOCKERHUB_USER: {}
-      DOCKERHUB_TOKEN: {}
-      TEST: {}
-      COOLIFY_WEBHOOK_WEB: {}
-      COOLIFY_TOKEN: {}
-jobs:
-  check-inputs:
-    runs-on: 'ubuntu-latest'
-    environment: ${{ inputs.environments }}
-    steps:
-      - name: Check secrets present
-        run: |
-          if [[ -z "${{ secrets.COOLIFY_WEBHOOK_WEB }}" ]]; then
-            echo "COOLIFY_WEBHOOK_WEB secret is empty or missing"
-            exit 1
-          else
-            echo "COOLIFY_WEBHOOK_WEB secret is set"
-          fi
-          if [[ -z "${{ secrets.COOLIFY_TOKEN }}" ]]; then
-            echo "COOLIFY_TOKEN secret is empty or missing"
-            exit 1
-          else
-            echo "COOLIFY_TOKEN secret is set"
-          fi
-          if [[ -z "${{ secrets.DOCKERHUB_USER }}" ]]; then
-            echo "DOCKERHUB_USER secret is empty or missing"
-            exit 1
-          else
-            echo "DOCKERHUB_USER secret is set"
-          fi
-          if [[ -z "${{ secrets.DOCKERHUB_TOKEN }}" ]]; then
-            echo "DOCKERHUB_TOKEN secret is empty or missing"
-            exit 1
-          else
-            echo "DOCKERHUB_TOKEN secret is set"
-          fi
-          echo "Current Version: ${{inputs.current_version}}"
-  build:
-    needs: check-inputs
-    if: needs.check-inputs.result == 'success' && inputs.workflow_type == 'release'
-    environment: ${{ inputs.environments }}
-    runs-on: 'ubuntu-latest'
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Branch Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.branch }}
-      - name: Login to Docker
-        uses: docker/login-action@v3
-        with:
-          registry: docker.io
-          username: ${{ secrets.DOCKERHUB_USER }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Docker Build Backend
-        run: docker build -f web/Dockerfile -t john4064/shiftsync:prod_web ./web --build-arg ENVIRONMENT=prod
-      - name: Docker Push Backend
-        run: docker push john4064/shiftsync:prod_web
-  deploy:
-    needs: build
-    if: needs.build.result == 'success' && inputs.workflow_type == 'release'
-    environment: ${{ inputs.environments }}
-    runs-on: 'ubuntu-latest'
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Deploy to Coolify
-        run: |
-          curl '${{ secrets.COOLIFY_WEBHOOK_WEB }}' --header 'Authorization: Bearer ${{ secrets.COOLIFY_TOKEN }}'
-    
+name: Web Deployment Production
+on:
+  workflow_call:
+    inputs:
+      environments:
+        type: string
+        description: An optional list of environments to deploy to.
+        default: 'prod'
+      workflow_type:
+        type: string
+        description: An optional string for workflow types.
+        default: 'prod'
+      branch:
+        type: string
+        description: An optional string to define which branch to checkout.
+        default: 'main'
+      current_version:
+        type: string
+        description: Current Version of the package.json.
+        default: '0.0.0'
+    secrets:
+      DOCKERHUB_USER: {}
+      DOCKERHUB_TOKEN: {}
+      TEST: {}
+      TEAMCITY_WEB_ID: {}
+      TEAMCITY_URL: {}
+      TEAMCITY_USERNAME: {}
+      TEAMCITY_PASSWORD: {}
+jobs:
+  check-inputs:
+    runs-on: 'ubuntu-latest'
+    environment: ${{ inputs.environments }}
+    steps:
+      - name: Check secrets present
+        run: |
+          if [[ -z "${{ secrets.TEAMCITY_WEB_ID }}" ]]; then
+            echo "TEAMCITY_WEB_ID secret is empty or missing"
+            exit 1
+          else
+            echo "TEAMCITY_WEB_ID secret is set"
+          fi
+          if [[ -z "${{ secrets.TEAMCITY_URL }}" ]]; then
+            echo "TEAMCITY_URL secret is empty or missing"
+            exit 1
+          else
+            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"
+            exit 1
+          else
+            echo "DOCKERHUB_USER secret is set"
+          fi
+          if [[ -z "${{ secrets.DOCKERHUB_TOKEN }}" ]]; then
+            echo "DOCKERHUB_TOKEN secret is empty or missing"
+            exit 1
+          else
+            echo "DOCKERHUB_TOKEN secret is set"
+          fi
+          echo "Current Version: ${{inputs.current_version}}"
+  build:
+    needs: check-inputs
+    if: needs.check-inputs.result == 'success' && inputs.workflow_type == 'release'
+    environment: ${{ inputs.environments }}
+    runs-on: 'ubuntu-latest'
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Branch Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.branch }}
+      - name: Login to Docker
+        uses: docker/login-action@v3
+        with:
+          registry: docker.io
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Docker Build Backend
+        run: docker build -f web/Dockerfile -t john4064/shiftsync:prod_web ./web --build-arg ENVIRONMENT=prod
+      - name: Docker Push Backend
+        run: docker push john4064/shiftsync:prod_web
+  deploy:
+    needs: build
+    if: needs.build.result == 'success' && inputs.workflow_type == 'release'
+    environment: ${{ inputs.environments }}
+    runs-on: 'ubuntu-latest'
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Deploy to Team City
+        run: |
+          curl -u ${{ secrets.TEAMCITY_USERNAME }}:${{ secrets.TEAMCITY_PASSWORD }} \
+               -X POST \
+               -H "Content-Type: application/json" \
+               -d '{"buildType": {"id": "${{ secrets.TEAMCITY_WEB_ID }}"}}' \
+               "${{ secrets.TEAMCITY_URL }}/httpAuth/app/rest/buildQueue" > /dev/null

api/Dockerfile

@@ -1,14 +1,14 @@
-FROM node:20-alpine
-
-WORKDIR /app
-
-COPY ./package*.json ./
-
-RUN npm cache clean --force && npm install --no-audit --no-fund
-
-COPY . ./
-
-EXPOSE 5172
-EXPOSE 5170
-
-CMD npm run dev
+FROM node:20-alpine
+
+WORKDIR /app
+
+COPY ./package*.json ./
+
+RUN npm ci
+
+COPY . ./
+
+EXPOSE 5172
+EXPOSE 5170
+
+CMD npm run dev

api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shiftsync-website-api",
-  "version": "1.0.1",
+  "version": "1.0.11",
   "private": true,
   "type": "module",
   "scripts": {

api/server.js

@@ -1,6 +1,7 @@
 import express from 'express';
 import cors from 'cors';
 import dotenv from 'dotenv';
+import fs from 'fs/promises';
 import { medicationRouter } from './services/medications/index.js';
 import { shiftsRouter } from './services/shifts/index.js';
 import { shiftRunQuery } from './services/shiftConnection.js';
@@ -45,9 +46,12 @@ app.get('/api/db-health', async (req, res) => {
     res.status(500).json({ connected: false, error: err.message });
   }
 });
+
 app.get('/api/version', async (req, res) => {
   try {
-    res.json('1.0.1');
+    const packageData = await fs.readFile('./package.json', 'utf8');
+    const pkg = JSON.parse(packageData);
+    res.json(pkg.version);
   } catch (err) {
     console.error(err);
     res.status(500).json({ connected: false, error: err.message });

web/Dockerfile

@@ -1,17 +1,17 @@
-FROM node:20-alpine
-
-WORKDIR /app
-
-COPY ./package*.json ./
-
-RUN npm cache clean --force && npm install --no-audit --no-fund
-
-COPY . ./
-
-EXPOSE 5173
-EXPOSE 5171
-
-ARG ENVIRONMENT
-ENV ENVIRONMENT ${ENVIRONMENT}
-
-CMD npm run ${ENVIRONMENT}
+FROM node:20-alpine
+
+WORKDIR /app
+
+COPY ./package*.json ./
+
+RUN npm ci
+
+COPY . ./
+
+EXPOSE 5173
+EXPOSE 5171
+
+ARG ENVIRONMENT
+ENV ENVIRONMENT ${ENVIRONMENT}
+
+CMD npm run ${ENVIRONMENT}

web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shiftsync-website-web",
+  "version": "1.0.10",
   "private": true,
-  "version": "1.0.5",
   "type": "module",
   "scripts": {
     "local": "vite",

web/src/pages/Home/Home.jsx

@@ -14,10 +14,11 @@ export const Home = () => {
   }, []);
 
   return (
-    <div>
+    <div >
       <h1>Home Page</h1>
       <Link to="/settings">Go to Settings</Link>
       <p>Version: {pkg.version}</p>
+      <p>This site does nothing</p>
     </div>
   );
 };