Skip to content

Commit 49958da

Browse files
Merge pull request #75 from ModischFabrications/feature/cutsolver-v1.1.0
Feature/cutsolver v1.1.0
2 parents add46b6 + 8b908ca commit 49958da

17 files changed

+266
-197
lines changed

.env

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Dev
22
DOMAIN_NAME=localhost
33
EMAIL_ADDRESS=mail@example.com
4+
VUE_APP_BACKEND_SOLVER_URL=http://localhost:8000/
45

56
# Prod
67
#DOMAIN_NAME=cutsolver.modisch.me

Caddyfile

+7-5
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@
88
}
99
}
1010

11-
# remove once everyone forgot about it
12-
vps.modisch.me {
13-
redir /cutsolver https://{$DOMAIN_NAME} permanent
14-
}
15-
1611
{$DOMAIN_NAME} {
1712
reverse_proxy /solve cutsolver
1813
reverse_proxy cutsolver_frontend
@@ -28,3 +23,10 @@ vps.modisch.me {
2823

2924
respond /ping "pong at {$DOMAIN_NAME}"
3025
}
26+
27+
# This could be managed by DNS!
28+
29+
# remove once everyone forgot about it
30+
vps.modisch.me {
31+
redir /cutsolver https://{$DOMAIN_NAME} permanent
32+
}

docker-compose-deploy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services:
66
image: modischfabrications/cutsolver_frontend:latest
77
restart: unless-stopped
88
environment:
9-
- VUE_APP_BACKEND_SOLVER_URL=https://${DOMAIN_NAME:?err}/solve
9+
- VUE_APP_BACKEND_SOLVER_URL=https://${DOMAIN_NAME:?err}/
1010
networks:
1111
- webserver
1212
- cutsolver

docker-compose.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
version: '3'
1+
version: '3.3'
22

33
services:
4-
54
cutsolver_frontend:
65
# use specific tags for a persistent reference
76
image: modischfabrications/cutsolver_frontend:latest
@@ -12,7 +11,7 @@ services:
1211
- cutsolver
1312
environment:
1413
# point this to your backend host URL!
15-
- VUE_APP_BACKEND_SOLVER_URL=http://localhost:8000/solve
14+
- VUE_APP_BACKEND_SOLVER_URL=http://localhost:8000/
1615

1716
cutsolver:
1817
image: modischfabrications/cutsolver:latest

0 commit comments

Comments
 (0)