Merge pull request #75 from ModischFabrications/feature/cutsolver-v1.1.0

Feature/cutsolver v1.1.0
ModischFabrications · Apr 19, 2024 · 49958da · 49958da
2 parents add46b6 + 8b908ca
commit 49958da
Show file tree

Hide file tree

Showing 17 changed files with 266 additions and 197 deletions.
diff --git a/.env b/.env
@@ -1,6 +1,7 @@
 # Dev
 DOMAIN_NAME=localhost
 EMAIL_ADDRESS=[email protected]
+VUE_APP_BACKEND_SOLVER_URL=http://localhost:8000/
 
 # Prod
 #DOMAIN_NAME=cutsolver.modisch.me

diff --git a/Caddyfile b/Caddyfile
@@ -8,11 +8,6 @@
  }
 }
 
-# remove once everyone forgot about it
-vps.modisch.me {
- redir /cutsolver https://{$DOMAIN_NAME} permanent
-}
-
 {$DOMAIN_NAME} {
  reverse_proxy /solve cutsolver
  reverse_proxy cutsolver_frontend
@@ -28,3 +23,10 @@ vps.modisch.me {
 
  respond /ping "pong at {$DOMAIN_NAME}"
 }
+
+# This could be managed by DNS!
+
+# remove once everyone forgot about it
+vps.modisch.me {
+ redir /cutsolver https://{$DOMAIN_NAME} permanent
+}
diff --git a/docker-compose-deploy.yml b/docker-compose-deploy.yml
@@ -6,7 +6,7 @@ services:
  image: modischfabrications/cutsolver_frontend:latest
  restart: unless-stopped
  environment:
- - VUE_APP_BACKEND_SOLVER_URL=https://${DOMAIN_NAME:?err}/solve
+ - VUE_APP_BACKEND_SOLVER_URL=https://${DOMAIN_NAME:?err}/
  networks:
  - webserver
  - cutsolver

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,6 @@
-version: '3'
+version: '3.3'
 
 services:
-
  cutsolver_frontend:
  # use specific tags for a persistent reference
  image: modischfabrications/cutsolver_frontend:latest
@@ -12,7 +11,7 @@ services:
  - cutsolver
  environment:
  # point this to your backend host URL!
- - VUE_APP_BACKEND_SOLVER_URL=http://localhost:8000/solve
+ - VUE_APP_BACKEND_SOLVER_URL=http://localhost:8000/
 
  cutsolver:
  image: modischfabrications/cutsolver:latest