From 95ebc2b95da2e81ce887f0d9f11922cc76235430 Mon Sep 17 00:00:00 2001 From: leon-morival Date: Sun, 30 Nov 2025 17:20:38 +0100 Subject: [PATCH] feat: try fix ci cd --- .gitlab-ci.yml | 1 - docker-compose.prod.yml | 42 +++++++++++++++++++++-------------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 52684bc..4cf269b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -110,7 +110,6 @@ deploy-to-portainer: -H "Content-Type: application/json" \ --data "$JSON_PAYLOAD") - CREATE_BODY=$(echo "$CREATE_RESP" | sed -e 's/HTTPSTATUS:.*//g') CREATE_STATUS=$(echo "$CREATE_RESP" | tr -d '\n' | sed -e 's/.*HTTPSTATUS://') diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index f1c8beb..84eb069 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -1,3 +1,5 @@ +version: "3.8" + services: treasure-api: image: registry.gitlab.com/treasure-hunt4/treasure-api:latest @@ -5,18 +7,18 @@ services: depends_on: - treasure-api-migrate ports: - - "8000:80" + - "8000:80" # API dispo sur http://IP_DU_SERVEUR:8000 environment: - APP_ENV: production - APP_KEY: ${APP_KEY} + APP_ENV: "production" + APP_KEY: "${APP_KEY}" APP_DEBUG: "false" - DB_CONNECTION: mysql - DB_HOST: mysql + DB_CONNECTION: "mysql" + DB_HOST: "mysql" DB_PORT: 3306 - DB_DATABASE: ${DB_DATABASE} - DB_USERNAME: ${DB_USERNAME} - DB_PASSWORD: ${DB_PASSWORD} + DB_DATABASE: "${DB_DATABASE}" + DB_USERNAME: "${DB_USERNAME}" + DB_PASSWORD: "${DB_PASSWORD}" treasure-api-migrate: image: registry.gitlab.com/treasure-hunt4/treasure-api:latest @@ -24,15 +26,15 @@ services: depends_on: - mysql environment: - APP_ENV: production - APP_KEY: ${APP_KEY} + APP_ENV: "production" + APP_KEY: "${APP_KEY}" - DB_CONNECTION: mysql - DB_HOST: mysql + DB_CONNECTION: "mysql" + DB_HOST: "mysql" DB_PORT: 3306 - DB_DATABASE: ${DB_DATABASE} - DB_USERNAME: ${DB_USERNAME} - DB_PASSWORD: ${DB_PASSWORD} + DB_DATABASE: "${DB_DATABASE}" + DB_USERNAME: "${DB_USERNAME}" + DB_PASSWORD: "${DB_PASSWORD}" command: ["php", "artisan", "migrate", "--force", "--no-interaction"] @@ -40,14 +42,14 @@ services: image: mysql:8.0 restart: unless-stopped environment: - MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD} - MYSQL_DATABASE: ${DB_DATABASE} - MYSQL_USER: ${DB_USERNAME} - MYSQL_PASSWORD: ${DB_PASSWORD} + MYSQL_ROOT_PASSWORD: "${MYSQL_ROOT_PASSWORD}" + MYSQL_DATABASE: "${DB_DATABASE}" + MYSQL_USER: "${DB_USERNAME}" + MYSQL_PASSWORD: "${DB_PASSWORD}" volumes: - mysql-data:/var/lib/mysql ports: - - "3307:3306" # optionnel, juste si tu veux accéder à MySQL depuis l'extérieur + - "3307:3306" # Optionnel, pour accès externe à MySQL volumes: mysql-data: