Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
UO281801 committed May 2, 2023
1 parent a3cb07d commit 64d1d50
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 51 deletions.
8 changes: 1 addition & 7 deletions docker-compose-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,11 @@ version: "3.5"
services:
restapi:
image: ghcr.io/arquisoft/lomap_en1a/restapi:latest
volumes:
- /etc/letsencrypt/live/lomapen1a.cloudns.ph/privkey.pem:/app/certificates/host.pem
- /etc/letsencrypt/live/lomapen1a.cloudns.ph/fullchain.pem:/app/certificates/host.cert
ports:
- "5000:5000"
webapp:
image: ghcr.io/arquisoft/lomap_en1a/webapp:latest
volumes:
- /etc/letsencrypt/live/lomapen1a.cloudns.ph/privkey.pem:/app/certificates/host.pem
- /etc/letsencrypt/live/lomapen1a.cloudns.ph/fullchain.pem:/app/certificates/host.cert
ports:
- "443:443"
- "3000:3000"
depends_on:
- restapi
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
webapp:
build: ./webapp
ports:
- "443:443"
- "3000:3000"
depends_on:
- restapi
prometheus:
Expand Down
2 changes: 1 addition & 1 deletion restapi/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ WORKDIR /app
#Install the dependencies
RUN npm install

ARG host="20.38.6.214"
ARG host="20.13.141.12"
ENV host=$host

CMD [ "npm", "start" ]
28 changes: 9 additions & 19 deletions restapi/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions webapp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ WORKDIR /app
#Install the dependencies
RUN npm install

ARG API_URI="http://20.38.6.214:5000/api"
ARG API_URI="http://20.13.141.12:5000/api"
ENV REACT_APP_API_URI=$API_URI

ARG HOST_URI="20.38.6.214"
ARG HOST_URI="20.13.141.12"
ENV host=$HOST_URI

#Create an optimized version of the webapp
Expand Down
21 changes: 0 additions & 21 deletions webapp/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 64d1d50

Please sign in to comment.