Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/cutsolver v1.1.0 #75

Merged
merged 4 commits into from
Apr 19, 2024
Merged

Feature/cutsolver v1.1.0 #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f49d16b
implement new API of cutsolver v1.1.0 (single stocks); show backend v…
ModischFabrications Apr 15, 2024
4543844
skip version check and use mock solver in tests
ModischFabrications Apr 15, 2024
7946616
Merge branch 'main' into feature/cutsolver-v1.1.0
ModischFabrications Apr 19, 2024
8b908ca
fix a few audit warnings by spamming fix --force
ModischFabrications Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Dev
DOMAIN_NAME=localhost
EMAIL_ADDRESS=mail@example.com
VUE_APP_BACKEND_SOLVER_URL=http://localhost:8000/

# Prod
#DOMAIN_NAME=cutsolver.modisch.me
Expand Down
12 changes: 7 additions & 5 deletions Caddyfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
}
2 changes: 1 addition & 1 deletion docker-compose-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
version: '3'
version: '3.3'

services:

cutsolver_frontend:
# use specific tags for a persistent reference
image: modischfabrications/cutsolver_frontend:latest
Expand All @@ -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
Expand Down
Loading