bebe/bamort
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Now it is working... on bamort.trokan.de

Browse Source
This commit is contained in:
Frank
2026-01-01 14:02:38 +01:00
parent faa9489700
commit 717f4abd34
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/docker-compose.yml
+6 -5
View File
@@ -5,12 +5,13 @@ services:
dockerfile: ../docker/Dockerfile.backend dockerfile: ../docker/Dockerfile.backend
container_name: bamort-backend container_name: bamort-backend
ports: ports:
- "8180:8180" - "8182:8180"
environment: environment:
- GO_ENV=production - GO_ENV=production
- CGO_ENABLED=1 - CGO_ENABLED=1
- DATABASE_TYPE=${DATABASE_TYPE:-mysql} - DATABASE_TYPE=${DATABASE_TYPE:-mysql}
- DATABASE_URL=${DATABASE_URL:-bamort:${MARIADB_PASSWORD:-secure_user_password}@tcp(mariadb:3306)/bamort?charset=utf8mb4&parseTime=True&loc=Local} - DATABASE_URL=${MARIADB_USER:-bamort}:${MARIADB_PASSWORD:-secure_user_password}@tcp(mariadb:3306)/${MARIADB_DATABASE:-bamort}?charset=utf8mb4&parseTime=True&loc=Local
- BASE_URL=${BASE_URL:-https://bamort.trokan.de}
- API_PORT=${API_PORT:-8180} - API_PORT=${API_PORT:-8180}
depends_on: depends_on:
mariadb: mariadb:
@@ -25,9 +26,9 @@ services:
context: ../frontend context: ../frontend
dockerfile: ../docker/Dockerfile.frontend dockerfile: ../docker/Dockerfile.frontend
args: args:
VITE_API_URL: ${API_URL:-https://bamort.trokan.de:8180} VITE_API_URL: ${API_URL:-https://bamort-api.trokan.de}
VITE_BASE_URL: ${BASE_URL:-https://bamort.trokan.de} VITE_BASE_URL: ${BASE_URL:-https://bamort.trokan.de}
VITE_API_PORT: ${API_PORT:-8180} VITE_API_PORT: ${API_PORT:-443}
container_name: bamort-frontend container_name: bamort-frontend
ports: ports:
- "8181:80" - "8181:80"
@@ -82,4 +83,4 @@ services:
# condition: service_healthy # condition: service_healthy
#volumes: #volumes:
# db_data: # db_data:
frontend/src/utils/api.js
+1 -1
View File
@@ -1,7 +1,7 @@
import axios from 'axios' import axios from 'axios'
const API = axios.create({ const API = axios.create({
baseURL: import.meta.env.VITE_API_URL || 'https://bamort.trokan.de:8180', // Use env variable with fallback baseURL: import.meta.env.VITE_API_URL || 'https://bamort-api.trokan.de', // Use env variable with fallback
}) })
// Request interceptor to add auth token // Request interceptor to add auth token