add current db layout and data
add handling for mounted export template directory fixed naming problems and port exposure
This commit is contained in:
+2
-1
@@ -1 +1,2 @@
|
||||
bamort-db*
|
||||
bamort-db*
|
||||
templates
|
||||
@@ -37,6 +37,7 @@ WORKDIR /app
|
||||
|
||||
# Copy the compiled binary from builder stage
|
||||
COPY --from=builder /app/server /app
|
||||
COPY --from=builder /app/templates /app/default_templates
|
||||
|
||||
# Expose port
|
||||
EXPOSE 8180
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
version: "3.8"
|
||||
services:
|
||||
backend-dev:
|
||||
build:
|
||||
@@ -11,9 +10,9 @@ services:
|
||||
- GO_ENV=development
|
||||
- CGO_ENABLED=1
|
||||
- DATABASE_TYPE=mysql
|
||||
- DATABASE_URL=bamort:bG4)efozrc@tcp(mariadb:3306)/bamort?charset=utf8mb4&parseTime=True&loc=Local
|
||||
- DATABASE_URL=bamort:bG4)efozrc@tcp(mariadb-dev:3306)/bamort?charset=utf8mb4&parseTime=True&loc=Local
|
||||
depends_on:
|
||||
mariadb:
|
||||
mariadb-dev:
|
||||
condition: service_healthy
|
||||
working_dir: /app
|
||||
# Restart if Go code changes cause crash
|
||||
@@ -39,7 +38,7 @@ services:
|
||||
- ../frontend:/app
|
||||
- /app/node_modules # Prevent overwriting node_modules
|
||||
|
||||
mariadb:
|
||||
mariadb-dev:
|
||||
image: mariadb:11.4
|
||||
container_name: bamort-mariadb-dev
|
||||
restart: unless-stopped
|
||||
@@ -61,21 +60,21 @@ services:
|
||||
timeout: 5s
|
||||
retries: 3
|
||||
|
||||
phpmyadmin:
|
||||
phpmyadmin-dev:
|
||||
image: phpmyadmin/phpmyadmin:5.2
|
||||
container_name: bamort-phpmyadmin-dev
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "8081:80"
|
||||
environment:
|
||||
PMA_HOST: mariadb
|
||||
PMA_HOST: mariadb-dev
|
||||
PMA_PORT: 3306
|
||||
PMA_USER: root
|
||||
PMA_PASSWORD: root_password_dev
|
||||
MYSQL_ROOT_PASSWORD: root_password_dev
|
||||
PMA_ARBITRARY: 1
|
||||
depends_on:
|
||||
mariadb:
|
||||
mariadb-dev:
|
||||
condition: service_healthy
|
||||
|
||||
volumes:
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
version: "3.8"
|
||||
services:
|
||||
backend:
|
||||
build:
|
||||
@@ -16,19 +15,17 @@ services:
|
||||
mariadb:
|
||||
condition: service_healthy
|
||||
working_dir: /app
|
||||
volumes:
|
||||
- ./templates:/app/templates
|
||||
restart: unless-stopped
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
frontend:
|
||||
build:
|
||||
context: ../frontend
|
||||
dockerfile: ../docker/Dockerfile.frontend
|
||||
container_name: bamort-frontend
|
||||
ports:
|
||||
- "5173:80"
|
||||
- "80:80"
|
||||
environment:
|
||||
- ENVIRONMENT=production
|
||||
- VITE_API_URL=${VITE_API_URL:-http://bamort.trokan.de:8180}
|
||||
@@ -56,8 +53,8 @@ services:
|
||||
- ./init-db:/docker-entrypoint-initdb.d
|
||||
healthcheck:
|
||||
test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
|
||||
start_period: 30s
|
||||
timeout: 15s
|
||||
start_period: 20s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
|
||||
# phpMyAdmin - Database Management (commented out for production)
|
||||
|
||||
Reference in New Issue
Block a user