From 7366e92d429e82cb2055bd037995e5fb53c756e4 Mon Sep 17 00:00:00 2001
From: Simon Larsen <simonlarsen@oneuptime.com>
Date: Thu, 28 Dec 2023 19:30:58 +0000
Subject: [PATCH] Update Dockerfile paths for App

---
 .github/workflows/compile.yml       | 2 +-
 .github/workflows/docker-build.yml  | 2 +-
 .github/workflows/release.yml       | 2 +-
 .github/workflows/test-release.yaml | 2 +-
 .vscode/launch.json                 | 2 +-
 App/Dockerfile.tpl                  | 6 +++---
 docker-compose.dev.yml              | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
index 5760b855ec..214aefd9c8 100644
--- a/.github/workflows/compile.yml
+++ b/.github/workflows/compile.yml
@@ -76,7 +76,7 @@ jobs:
       - run: cd Model && npm install
       - run: cd CommonServer && npm install
       - run: cd CommonUI && npm install --force
-      - run: cd DashboardAPI && npm install && npm run compile && npm run dep-check
+      - run: cd App && npm install && npm run compile && npm run dep-check
   
 
   compile-admin-dashboard:
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index daa572339b..d88a25cd4b 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -55,7 +55,7 @@ jobs:
         
       # build image for accounts service
       - name: build docker image
-        run: sudo docker build -f ./DashboardAPI/Dockerfile .
+        run: sudo docker build -f ./App/Dockerfile .
 
   docker-build-admin-dashboard:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9729bb1016..f790ac3cac 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -862,7 +862,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v4
         with:
-          file: ./DashboardAPI/Dockerfile
+          file: ./App/Dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
diff --git a/.github/workflows/test-release.yaml b/.github/workflows/test-release.yaml
index adc46031d2..4414b3f19b 100644
--- a/.github/workflows/test-release.yaml
+++ b/.github/workflows/test-release.yaml
@@ -806,7 +806,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v4
         with:
-          file: ./DashboardAPI/Dockerfile
+          file: ./App/Dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 784b46a00b..ed315ec44a 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -29,7 +29,7 @@
         },
         {
             "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/DashboardAPI",
+            "localRoot": "${workspaceFolder}/App",
             "name": "Dashboard API: Debug with Docker",
             "port": 9232,
             "remoteRoot": "/usr/src/app",
diff --git a/App/Dockerfile.tpl b/App/Dockerfile.tpl
index ea8b0c7182..aed81c687b 100644
--- a/App/Dockerfile.tpl
+++ b/App/Dockerfile.tpl
@@ -1,5 +1,5 @@
 #
-# OneUptime-DashboardAPI Dockerfile
+# OneUptime-App Dockerfile
 #
 
 # Pull base image nodejs image.
@@ -53,7 +53,7 @@ ENV PRODUCTION=true
 WORKDIR /usr/src/app
 
 # Install app dependencies
-COPY ./DashboardAPI/package*.json /usr/src/app/
+COPY ./App/package*.json /usr/src/app/
 RUN npm install
 
 # Expose ports.
@@ -65,7 +65,7 @@ EXPOSE 3002
 CMD [ "npm", "run", "dev" ]
 {{ else }}
 # Copy app source
-COPY ./DashboardAPI /usr/src/app
+COPY ./App /usr/src/app
 # Bundle app source
 RUN npm run compile
 #Run the app
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 122fea068b..55331bd683 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -176,7 +176,7 @@ services:
 
     app:
         volumes:
-            - ./DashboardAPI:/usr/src/app
+            - ./App:/usr/src/app
             # Use node modules of the container and not host system.
             # https://stackoverflow.com/questions/29181032/add-a-volume-to-docker-but-exclude-a-sub-folder
             - /usr/src/app/node_modules/
@@ -196,7 +196,7 @@ services:
         build:
             network: host
             context: .
-            dockerfile: ./DashboardAPI/Dockerfile
+            dockerfile: ./App/Dockerfile
         
 
     workflow: