fix(prod): use shared MongoDB container via external docker network, remove mongo service
This commit is contained in:
1 parent
43976194cb
commit
c493d31e79
2 files changed
+12
-23
No files matched your search
@@ -48,11 +48,10 @@ jobs:
|
||||
"mkdir -p /volume1/docker/adam-acs && cat > /volume1/docker/adam-acs/docker-compose.prod.yml"
|
||||
|
||||
# Créer le fichier .env sur le NAS à partir des secrets
|
||||
# MongoDB mutualisé : connexion hard-codée dans docker-compose.prod.yml (admin/admin_password)
|
||||
sshpass -p "${{ secrets.NASPASS }}" ssh -o StrictHostKeyChecking=no Stude12@192.168.1.39 "cat > /volume1/docker/adam-acs/.env" <<EOF
|
||||
APP_KEY=${{ secrets.APP_KEY }}
|
||||
APP_URL=${{ secrets.APP_URL }}
|
||||
MONGO_USER=${{ secrets.MONGO_USER }}
|
||||
MONGO_PASSWORD=${{ secrets.MONGO_PASSWORD }}
|
||||
APP_PORT=${{ secrets.APP_PORT }}
|
||||
LOG_LEVEL=info
|
||||
HASH_KEY=${{ secrets.HASH_KEY }}
|
||||
|
||||
+11
-21
@@ -1,19 +1,4 @@
|
||||
services:
|
||||
mongodb:
|
||||
image: mongo:7
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
MONGO_INITDB_ROOT_USERNAME: ${MONGO_USER:-adam}
|
||||
MONGO_INITDB_ROOT_PASSWORD: ${MONGO_PASSWORD}
|
||||
MONGO_INITDB_DATABASE: adam-acs
|
||||
volumes:
|
||||
- mongo_data:/data/db
|
||||
healthcheck:
|
||||
test: ["CMD", "mongosh", "--eval", "db.adminCommand('ping')"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
|
||||
app:
|
||||
image: 192.168.1.39:3000/stude12/adam-acs:latest
|
||||
restart: unless-stopped
|
||||
@@ -23,19 +8,16 @@ services:
|
||||
NODE_ENV: production
|
||||
PORT: 8080
|
||||
HOST: 0.0.0.0
|
||||
MONGODB_URI: mongodb://${MONGO_USER:-adam}:${MONGO_PASSWORD}@mongodb:27017/adam-acs?authSource=admin
|
||||
MONGODB_URI: mongodb://admin:admin_password@mongodb:27017/adam-acs?authSource=admin
|
||||
MONGODB_DB_NAME: adam-acs
|
||||
APP_KEY: ${APP_KEY}
|
||||
APP_URL: ${APP_URL:-http://localhost:8080}
|
||||
APP_URL: ${APP_URL}
|
||||
SESSION_DRIVER: cookie
|
||||
LOG_LEVEL: ${LOG_LEVEL:-info}
|
||||
HASH_KEY: ${HASH_KEY}
|
||||
WEBUI_USERNAME: ${WEBUI_USERNAME:-Admin}
|
||||
WEBUI_PASSWORD: ${WEBUI_PASSWORD}
|
||||
API_KEY: ${API_KEY}
|
||||
depends_on:
|
||||
mongodb:
|
||||
condition: service_healthy
|
||||
volumes:
|
||||
- app_tr069_data:/app/data
|
||||
- app_tr069_logs:/app/logs/tr069
|
||||
@@ -45,8 +27,16 @@ services:
|
||||
timeout: 5s
|
||||
retries: 10
|
||||
start_period: 15s
|
||||
networks:
|
||||
- mongo_net
|
||||
- default
|
||||
|
||||
volumes:
|
||||
mongo_data:
|
||||
app_tr069_data:
|
||||
app_tr069_logs:
|
||||
|
||||
networks:
|
||||
# Réseau externe partagé avec le conteneur MongoDB mutualisé
|
||||
# À créer une fois sur le NAS : docker network create mongo_net
|
||||
mongo_net:
|
||||
external: true
|
||||
Reference in new issue
Block a user