reverting to app on container app

.github/workflows/app_build.yaml

@@ -0,0 +1,70 @@
+name: 'App Build'
+on:
+  workflow_call:
+    inputs:
+      environment_name:
+        required: true
+        type: string
+      version_number:
+        required: true
+        type: string
+
+env:
+  VITE_API_URL: ${{ vars.VITE_API_URL }}
+  VITE_CLIENT_ID: ${{ vars.VITE_CLIENT_ID }}
+  VITE_TENANT_ID: ${{ vars.VITE_TENANT_ID }}
+  VITE_REDIRECT_URL: ${{ vars.VITE_REDIRECT_URL }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    environment: ${{ inputs.environment_name }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            app
+
+      - uses: pnpm/action-setup@v4
+        name: Install pnpm
+        with:
+          version: 10
+          run_install: false
+
+      - name: 'Setup Node'
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ vars.NODE_VERSION }}
+
+      - name: Install
+        run: |
+          pnpm install
+
+      - name: Build
+        run: |
+          pnpm --filter app build
+
+      - name: Deploy
+        if: ${{ github.event_name != 'pull_request' }}
+        run: |
+          pnpm --filter app --prod deploy ./.prod/app
+
+      - name: Setup Docker Buildx
+        if: ${{ github.event_name != 'pull_request' }}
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log into Docker Hub
+        if: ${{ github.event_name != 'pull_request' }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push to registry
+        if: ${{ github.event_name != 'pull_request' }}
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          tags: noahspan/root-app:${{ inputs.version_number }}
+          context: .
+          target: app

.github/workflows/app_build_deploy.yaml

@@ -1,73 +0,0 @@
-name: 'App Build'
-on:
-  workflow_call:
-    inputs:
-      environment_name:
-        required: true
-        type: string
-        
-env:
-  VITE_API_URL: ${{ vars.VITE_API_URL }}
-  VITE_CLIENT_ID: ${{ vars.VITE_CLIENT_ID }}
-  VITE_TENANT_ID: ${{ vars.VITE_TENANT_ID }}
-  VITE_REDIRECT_URL: ${{ vars.VITE_REDIRECT_URL }}
-
-permissions:
-  id-token: write
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    environment: ${{ inputs.environment_name }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          sparse-checkout: |
-            app
-
-      - uses: pnpm/action-setup@v4
-        name: Install pnpm
-        with:
-          version: 10
-          run_install: false
-
-      - name: 'Setup Node'
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ vars.NODE_VERSION }}
-
-      - name: Install
-        run: |
-          pnpm install
-
-      - name: Build
-        run: |
-          pnpm --filter app build
-
-      - name: Deploy
-        if: ${{ inputs.environment_name != 'pull_request' }}
-        uses: azure/login@v2
-        with:
-          client-id: ${{ vars.VITE_CLIENT_ID }}
-          tenant-id: ${{ vars.VITE_TENANT_ID }}
-          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-      
-      - name: Upload
-        if: ${{ inputs.environment_name != 'pull_request' }}
-        uses: azure/CLI@v1
-        with:
-          inlineScript: |
-            az storage blob upload-batch --account-name ${{ vars.AZURE_STORAGE_ACCOUNT_NAME }} --auth-mode key -d '$web' -s ./app/dist --overwrite true
-
-      # - name: Purge CDN endpoint
-      #   if: ${{ inputs.environment_name != 'pull_request' }}
-      #   uses: azure/CLI@v1
-      #   with:
-      #     inlineScript: |
-      #       az cdn endpoint purge --content-paths  "/*" --profile-name "CDN_PROFILE_NAME" --name "CDN_ENDPOINT" --resource-group "RESOURCE_GROUP"
-
-      - name: Azure CLI logout
-        if: ${{ inputs.environment_name != 'pull_request' }}
-        run: |
-          az logout

.github/workflows/deploy.yaml

@@ -15,7 +15,6 @@ on:
 permissions:
   id-token: write
   contents: read
-  
 jobs:
   deploy:
     runs-on: ubuntu-latest

.github/workflows/main.yaml

@@ -24,20 +24,32 @@ jobs:
     needs: 
       - changes
       - build-api
-    uses: ./.github/workflows/api_deploy.yaml
+    uses: ./.github/workflows/deploy.yaml
     with:
       app_name: root-api
       environment_name: test
       version_number: ${{ github.run_id }}
     secrets: inherit
 
-  build-deploy-app:
+  build-app:
     if: ${{ needs.changes.outputs.app == 'true' }}
-    name: build-deploy-app
+    name: build-app
     needs:
       - changes
-    uses: ./.github/workflows/app_build_deploy.yaml
+    uses: ./.github/workflows/app_build.yaml
     with:
       environment_name: test
+      version_number: ${{ github.run_id }}
     secrets: inherit
 
+  deploy-app:
+    name: deploy-app
+    needs: 
+      - changes
+      - build-app
+    uses: ./.github/workflows/deploy.yaml
+    with:
+      app_name: root-app
+      environment_name: test
+      version_number: ${{ github.run_id }}
+    secrets: inherit

.github/workflows/pull_request.yaml

@@ -23,7 +23,8 @@ jobs:
     name: build-app
     needs:
       - changes
-    uses: ./.github/workflows/app_build_deploy.yaml
+    uses: ./.github/workflows/app_build.yaml
     with:
       environment_name: pull_request
+      version_number: ${{ github.run_id }}
     secrets: inherit

.github/workflows/tag.yaml

@@ -17,16 +17,28 @@ jobs:
     name: deploy-api
     needs: 
       - build-api
-    uses: ./.github/workflows/api_deploy.yaml
+    uses: ./.github/workflows/deploy.yaml
     with:
       app_name: root-api
       environment_name: prod
       version_number: ${{ github.ref_name }}
     secrets: inherit
 
-  build-deploy-app:
-    name: build-deploy-app
-    uses: ./.github/workflows/app_build_deploy.yaml
+  build-app:
+    name: build-app
+    uses: ./.github/workflows/app_build.yaml
     with:
       environment_name: prod
+      version_number: ${{ github.ref_name }}
+    secrets: inherit
+
+  deploy-app:
+    name: deploy-app
+    needs: 
+      - build-app
+    uses: ./.github/workflows/deploy.yaml
+    with:
+      app_name: root-app
+      environment_name: prod
+      version_number: ${{ github.ref_name }}
     secrets: inherit