From 84b072e8b912eb709d817b7ff093d37735a131ce Mon Sep 17 00:00:00 2001 From: syoul Date: Fri, 20 Mar 2026 13:43:10 +0100 Subject: [PATCH] Adapte le depot pour deployer www.mafabriqueadeco.com - Renomme le projet Compose en ajr-mafabriqueadeco-main - Remplace /opt/prestashop par /opt/mafabriqueadeco dans le pipeline - Remplace les projets dtrack prestashop-test-* par mafabriqueadeco-* - Injecte le domaine Dependency-Track via le secret dtrack_domain - Deplace PS_DOMAIN/PS_ADMIN_FOLDER dans environment: placeholder (validate) - Met a jour .env.example et supprime /docs-syoul du .gitignore Co-Authored-By: Claude Sonnet 4.6 --- .env.example | 4 ++-- .gitignore | 1 - .woodpecker.yml | 32 +++++++++++++++++--------------- docker-compose.yml | 6 +++--- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/.env.example b/.env.example index 04de06d..cedb120 100644 --- a/.env.example +++ b/.env.example @@ -1,11 +1,11 @@ # Domaine PrestaShop (utilise par Fabio pour le routage) -PS_DOMAIN=presta.syoul.fr +PS_DOMAIN=www.mafabriqueadeco.com # Dossier admin (renommer pour la securite) PS_ADMIN_FOLDER=admin-secure # Compte administrateur PrestaShop -PRESTASHOP_ADMIN_EMAIL=admin@syoul.fr +PRESTASHOP_ADMIN_EMAIL=admin@mafabriqueadeco.com PRESTASHOP_ADMIN_PASSWORD=changeme_fort # Base de donnees diff --git a/.gitignore b/.gitignore index f4f43b7..bab2e38 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ /docs-sbom -/docs-syoul /docs-sonic /plans .env diff --git a/.woodpecker.yml b/.woodpecker.yml index 275fd48..f7a2566 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -15,11 +15,11 @@ steps: DB_ROOT_PASSWORD: placeholder PRESTASHOP_ADMIN_EMAIL: placeholder PRESTASHOP_ADMIN_PASSWORD: placeholder + PS_DOMAIN: placeholder + PS_ADMIN_FOLDER: placeholder commands: - | export COMPOSE_PROJECT_NAME=$(printf '%s-%s-%s' "$CI_REPO_OWNER" "$CI_REPO_NAME" "$CI_COMMIT_BRANCH" | tr 'A-Z/' 'a-z-') - export PS_DOMAIN="validate.example.com" - export PS_ADMIN_FOLDER="admin-secure" docker compose config --quiet - echo "docker-compose.yml valide" @@ -61,30 +61,32 @@ steps: - trivy sbom --format json --output .reports/trivy-mariadb.json .reports/sbom-mariadb.cyclonedx.json - echo "Scan CVE termine" - # Etape 2d : Publication SBOM vers Dependency-Track (dtrack.syoul.fr) + # Etape 2d : Publication SBOM vers Dependency-Track # NOTE: from_secret et volumes: incompatibles — pas de volumes ici - name: sbom-publish image: alpine/curl:latest environment: DTRACK_TOKEN: from_secret: dependency_track_token + DTRACK_DOMAIN: + from_secret: dtrack_domain commands: - | VERSION=$(date +%Y-%m-%d)-$(echo "$CI_COMMIT_SHA" | cut -c1-8) - HTTP=$(curl -s -o /tmp/dtrack-response.txt -w "%{http_code}" -X POST "https://dtrack.syoul.fr/api/v1/bom" \ + HTTP=$(curl -s -o /tmp/dtrack-response.txt -w "%{http_code}" -X POST "https://$DTRACK_DOMAIN/api/v1/bom" \ -H "X-Api-Key: $DTRACK_TOKEN" \ -F "autoCreate=true" \ - -F "projectName=prestashop-test-app" \ + -F "projectName=mafabriqueadeco-app" \ -F "projectVersion=$VERSION" \ -F "bom=@.reports/sbom-prestashop.cyclonedx.json") echo "HTTP $HTTP : $(cat /tmp/dtrack-response.txt)" [ "$HTTP" -ge 200 ] && [ "$HTTP" -lt 300 ] || exit 1 - | VERSION=$(date +%Y-%m-%d)-$(echo "$CI_COMMIT_SHA" | cut -c1-8) - HTTP=$(curl -s -o /tmp/dtrack-response.txt -w "%{http_code}" -X POST "https://dtrack.syoul.fr/api/v1/bom" \ + HTTP=$(curl -s -o /tmp/dtrack-response.txt -w "%{http_code}" -X POST "https://$DTRACK_DOMAIN/api/v1/bom" \ -H "X-Api-Key: $DTRACK_TOKEN" \ -F "autoCreate=true" \ - -F "projectName=prestashop-test-db" \ + -F "projectName=mafabriqueadeco-db" \ -F "projectVersion=$VERSION" \ -F "bom=@.reports/sbom-mariadb.cyclonedx.json") echo "HTTP $HTTP : $(cat /tmp/dtrack-response.txt)" @@ -122,16 +124,16 @@ steps: image: docker:27-cli volumes: - /var/run/docker.sock:/var/run/docker.sock - - /opt/prestashop:/opt/prestashop + - /opt/mafabriqueadeco:/opt/mafabriqueadeco commands: - - cp .env.deploy /opt/prestashop/.env - - chmod 600 /opt/prestashop/.env - - cp docker-compose.yml /opt/prestashop/docker-compose.yml - - cd /opt/prestashop && docker compose pull - - cd /opt/prestashop && docker compose up -d --remove-orphans - - cd /opt/prestashop && docker compose ps + - cp .env.deploy /opt/mafabriqueadeco/.env + - chmod 600 /opt/mafabriqueadeco/.env + - cp docker-compose.yml /opt/mafabriqueadeco/docker-compose.yml + - cd /opt/mafabriqueadeco && docker compose pull + - cd /opt/mafabriqueadeco && docker compose up -d --remove-orphans + - cd /opt/mafabriqueadeco && docker compose ps - | - DOMAIN=$(grep '^PS_DOMAIN=' /opt/prestashop/.env | cut -d= -f2) + DOMAIN=$(grep '^PS_DOMAIN=' /opt/mafabriqueadeco/.env | cut -d= -f2) # --- Certificat TLS (acme.sh via sonic-acme-1) --- # acme.sh est idempotent : skip si cert valide, renouvelle si proche expiration diff --git a/docker-compose.yml b/docker-compose.yml index ebe9d76..046b722 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,11 +1,11 @@ -# Convention de nommage : user-project-branch (ex: syoul-prestashop-main) +# Convention de nommage : user-project-branch (ex: ajr-mafabriqueadeco-main) # Permet plusieurs instances en parallele (prod/test/multi-user) sans collision -name: ${COMPOSE_PROJECT_NAME:-syoul-prestashop-main} +name: ${COMPOSE_PROJECT_NAME:-ajr-mafabriqueadeco-main} services: prestashop: image: prestashop/prestashop:9.0.3-3.0-classic-8.3-apache - container_name: ${COMPOSE_PROJECT_NAME:-syoul-prestashop-main}-app + container_name: ${COMPOSE_PROJECT_NAME:-ajr-mafabriqueadeco-main}-app restart: always depends_on: db: