fix: contournement bug volumes+from_secret, healthcheck lit depuis workspace
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
This commit is contained in:
@@ -32,20 +32,9 @@ steps:
|
|||||||
- 'grep -q "^\.env$" .gitignore || (echo "ERREUR: .env manquant dans .gitignore" && exit 1)'
|
- 'grep -q "^\.env$" .gitignore || (echo "ERREUR: .env manquant dans .gitignore" && exit 1)'
|
||||||
- echo "Verifications de securite OK"
|
- echo "Verifications de securite OK"
|
||||||
|
|
||||||
# Debug : volumes + from_secret
|
# Etape 3a : Ecriture du .env depuis les secrets (sans volumes)
|
||||||
- name: debug-volumes-secret
|
- name: write-env
|
||||||
image: docker:27-cli
|
image: alpine:3.20
|
||||||
environment:
|
|
||||||
PS_DOMAIN:
|
|
||||||
from_secret: ps_domain
|
|
||||||
volumes:
|
|
||||||
- /var/run/docker.sock:/var/run/docker.sock
|
|
||||||
commands:
|
|
||||||
- echo "PS_DOMAIN=${PS_DOMAIN}"
|
|
||||||
|
|
||||||
# Etape 3 : Deploiement sur sonic via Docker socket
|
|
||||||
- name: deploy
|
|
||||||
image: docker:27-cli
|
|
||||||
environment:
|
environment:
|
||||||
PS_DOMAIN:
|
PS_DOMAIN:
|
||||||
from_secret: ps_domain
|
from_secret: ps_domain
|
||||||
@@ -59,11 +48,18 @@ steps:
|
|||||||
from_secret: db_root_password
|
from_secret: db_root_password
|
||||||
DB_PASSWORD:
|
DB_PASSWORD:
|
||||||
from_secret: db_password
|
from_secret: db_password
|
||||||
|
commands:
|
||||||
|
- printf 'PS_DOMAIN=%s\nPS_ADMIN_FOLDER=%s\nPRESTASHOP_ADMIN_EMAIL=%s\nPRESTASHOP_ADMIN_PASSWORD=%s\nDB_ROOT_PASSWORD=%s\nDB_PASSWORD=%s\n' "${PS_DOMAIN}" "${PS_ADMIN_FOLDER}" "${PRESTASHOP_ADMIN_EMAIL}" "${PRESTASHOP_ADMIN_PASSWORD}" "${DB_ROOT_PASSWORD}" "${DB_PASSWORD}" > .env.deploy
|
||||||
|
- echo "Fichier .env.deploy cree ($(wc -c < .env.deploy) octets)"
|
||||||
|
|
||||||
|
# Etape 3b : Deploiement sur sonic via Docker socket (sans secrets)
|
||||||
|
- name: deploy
|
||||||
|
image: docker:27-cli
|
||||||
volumes:
|
volumes:
|
||||||
- /var/run/docker.sock:/var/run/docker.sock
|
- /var/run/docker.sock:/var/run/docker.sock
|
||||||
- /opt/prestashop:/opt/prestashop
|
- /opt/prestashop:/opt/prestashop
|
||||||
commands:
|
commands:
|
||||||
- printf 'PS_DOMAIN=%s\nPS_ADMIN_FOLDER=%s\nPRESTASHOP_ADMIN_EMAIL=%s\nPRESTASHOP_ADMIN_PASSWORD=%s\nDB_ROOT_PASSWORD=%s\nDB_PASSWORD=%s\n' "${PS_DOMAIN}" "${PS_ADMIN_FOLDER}" "${PRESTASHOP_ADMIN_EMAIL}" "${PRESTASHOP_ADMIN_PASSWORD}" "${DB_ROOT_PASSWORD}" "${DB_PASSWORD}" > /opt/prestashop/.env
|
- cp .env.deploy /opt/prestashop/.env
|
||||||
- chmod 600 /opt/prestashop/.env
|
- chmod 600 /opt/prestashop/.env
|
||||||
- cp docker-compose.yml /opt/prestashop/docker-compose.yml
|
- cp docker-compose.yml /opt/prestashop/docker-compose.yml
|
||||||
- cd /opt/prestashop && docker compose pull
|
- cd /opt/prestashop && docker compose pull
|
||||||
@@ -73,13 +69,11 @@ steps:
|
|||||||
# Etape 4 : Healthcheck post-deploiement
|
# Etape 4 : Healthcheck post-deploiement
|
||||||
- name: healthcheck
|
- name: healthcheck
|
||||||
image: curlimages/curl:8.11.0
|
image: curlimages/curl:8.11.0
|
||||||
environment:
|
|
||||||
PS_DOMAIN:
|
|
||||||
from_secret: ps_domain
|
|
||||||
commands:
|
commands:
|
||||||
- |
|
- |
|
||||||
|
PS_DOMAIN=$(grep '^PS_DOMAIN=' .env.deploy | cut -d= -f2)
|
||||||
if [ -z "${PS_DOMAIN}" ]; then
|
if [ -z "${PS_DOMAIN}" ]; then
|
||||||
echo "ERREUR: PS_DOMAIN non defini, verifier le secret Woodpecker"
|
echo "ERREUR: PS_DOMAIN non defini dans .env.deploy"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
TARGET="http://${PS_DOMAIN}"
|
TARGET="http://${PS_DOMAIN}"
|
||||||
|
|||||||
Reference in New Issue
Block a user