From 64d1d50a46326f3a713e5f10c54ebf98f6f45d9d Mon Sep 17 00:00:00 2001 From: UO281801 Date: Tue, 2 May 2023 21:41:23 +0200 Subject: [PATCH] Fix --- docker-compose-deploy.yml | 8 +------- docker-compose.yml | 2 +- restapi/Dockerfile | 2 +- restapi/package-lock.json | 28 +++++++++------------------- webapp/Dockerfile | 4 ++-- webapp/package-lock.json | 21 --------------------- 6 files changed, 14 insertions(+), 51 deletions(-) diff --git a/docker-compose-deploy.yml b/docker-compose-deploy.yml index b9e978c..0a60b04 100644 --- a/docker-compose-deploy.yml +++ b/docker-compose-deploy.yml @@ -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 diff --git a/docker-compose.yml b/docker-compose.yml index 5bf82ce..dbc395e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: webapp: build: ./webapp ports: - - "443:443" + - "3000:3000" depends_on: - restapi prometheus: diff --git a/restapi/Dockerfile b/restapi/Dockerfile index 612b8c9..445c8c2 100644 --- a/restapi/Dockerfile +++ b/restapi/Dockerfile @@ -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" ] \ No newline at end of file diff --git a/restapi/package-lock.json b/restapi/package-lock.json index 0a52f15..8f8e48f 100644 --- a/restapi/package-lock.json +++ b/restapi/package-lock.json @@ -1607,6 +1607,11 @@ "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==", "dev": true }, + "node_modules/async": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", + "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==" + }, "node_modules/async-parallel-foreach": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/async-parallel-foreach/-/async-parallel-foreach-1.0.1.tgz", @@ -2695,19 +2700,6 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true }, - "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -9849,6 +9841,10 @@ "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==", "dev": true }, + "async": { + "version": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", + "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==" + }, "async-parallel-foreach": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/async-parallel-foreach/-/async-parallel-foreach-1.0.1.tgz", @@ -10654,12 +10650,6 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true }, - "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "optional": true - }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", diff --git a/webapp/Dockerfile b/webapp/Dockerfile index 48116f6..a852f0f 100644 --- a/webapp/Dockerfile +++ b/webapp/Dockerfile @@ -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 diff --git a/webapp/package-lock.json b/webapp/package-lock.json index 1a7f139..dcf7212 100644 --- a/webapp/package-lock.json +++ b/webapp/package-lock.json @@ -10041,20 +10041,6 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true }, - "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -31909,13 +31895,6 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true }, - "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, - "optional": true - }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",