dev #1

Open
backdev wants to merge 47 commits from dev into main
2 changed files with 24 additions and 4 deletions
Showing only changes of commit be4073795f - Show all commits
+23 -3
View File
@@ -1,6 +1,21 @@
version: '3.9' version: '3.9'
services: services:
db:
image: postgres:17
container_name: admin-db
environment:
POSTGRES_DB: admin_db
POSTGRES_USER: admin
POSTGRES_PASSWORD: adminDbApp
ports:
- "5454:5432"
volumes:
- postgres_data:/var/lib/postgresql/data
networks:
- app-network
restart: unless-stopped
admin: admin:
build: . build: .
container_name: admin-backend container_name: admin-backend
@@ -9,15 +24,20 @@ services:
environment: environment:
SPRING_PROFILES_ACTIVE: prod SPRING_PROFILES_ACTIVE: prod
POSTGRES_HOST: db POSTGRES_HOST: db
POSTGRES_PORT: 5454 POSTGRES_PORT: 5432
POSTGRES_DB: admin_db POSTGRES_DB: admin_db
POSTGRES_USER: admin
POSTGRES_PASSWORD: adminDbApp
SERVER_PORT: ${SERVER_PORT:-8082} SERVER_PORT: ${SERVER_PORT:-8082}
POSTGRES_USER: ${POSTGRES_USER} depends_on:
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} - db
networks: networks:
- app-network - app-network
restart: unless-stopped restart: unless-stopped
volumes:
postgres_data:
networks: networks:
app-network: app-network:
external: true external: true
+1 -1
View File
@@ -3,7 +3,7 @@ spring:
compatibility-verifier: compatibility-verifier:
enabled: false enabled: false
datasource: datasource:
url: jdbc:postgresql://${POSTGRES_HOST:db}:${POSTGRES_PORT:5454}/${POSTGRES_DB:admin_db} url: jdbc:postgresql://${POSTGRES_HOST:db}:${POSTGRES_PORT:5432}/${POSTGRES_DB:admin_db}
username: ${POSTGRES_USER:admin} username: ${POSTGRES_USER:admin}
password: ${POSTGRES_PASSWORD:adminDbApp} password: ${POSTGRES_PASSWORD:adminDbApp}