Skip to content

Commit f942b25

Browse files
Merge pull request #1662 from OpenSignLabs/staging
feat: changes to implement one click deployment
2 parents ae2c156 + 8373679 commit f942b25

5 files changed

Lines changed: 7 additions & 317 deletions

File tree

Caddyfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{$HOST_URL} {
22
reverse_proxy client:3000
3-
handle_path /app/* {
3+
handle_path /api/* {
44
reverse_proxy server:8080
5-
rewrite * /app{uri}
5+
rewrite * {uri}
66
}
77
}

apps/OpenSign/src/components/pdf/EmbedTab.js

Lines changed: 0 additions & 305 deletions
This file was deleted.

apps/OpenSign/src/constant/appinfo.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import logo from "../assets/images/logo.png";
22

33
export function serverUrl_fn() {
4-
let baseUrl;
5-
baseUrl = process.env.REACT_APP_SERVERURL
6-
? process.env.REACT_APP_SERVERURL
7-
: window.location.origin + "/app";
8-
4+
let baseUrl = process.env.REACT_APP_SERVERURL
5+
? process.env.REACT_APP_SERVERURL
6+
: window.location.origin + "/api/app";
97
return baseUrl;
108
}
119
export const appInfo = {

apps/OpenSignServer/Utils.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ dotenv.config();
66

77
export const cloudServerUrl = 'http://localhost:8080/app';
88
export const appName = 'OpenSign™';
9-
export function customAPIurl() {
10-
const url = new URL(cloudServerUrl);
11-
return url.pathname === '/api/app' ? url.origin + '/api' : url.origin;
12-
}
139

1410
export const color = [
1511
'#93a3db',

docker-compose.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ services:
1111
env_file: .env.prod
1212
environment:
1313
- NODE_ENV=production
14-
- SERVER_URL=${HOST_URL:-https://localhost:3001}/app
14+
- SERVER_URL=${HOST_URL:-https://localhost:3001}/api/app
15+
- PUBLIC_URL=${HOST_URL:-https://localhost:3001}
1516
networks:
1617
- app-network
1718
mongo:

0 commit comments

Comments
 (0)