Update Dockerfile paths for App

This commit is contained in:
Simon Larsen 2023-12-28 19:30:58 +00:00
parent a85bf8b228
commit 7366e92d42
No known key found for this signature in database
GPG Key ID: AB45983AA9C81CDE
7 changed files with 10 additions and 10 deletions

View File

@ -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:

View File

@ -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

View File

@ -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

View File

@ -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

2
.vscode/launch.json vendored
View File

@ -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",

View File

@ -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

View File

@ -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: