From 86f91a51400ee7f2e7df7cf384b191ed9e413ccf Mon Sep 17 00:00:00 2001 From: "dorian.hodin" Date: Mon, 3 Apr 2023 16:36:51 +0200 Subject: [PATCH] Add new secret, try to add container name in base url --- .drone.yml | 5 ++++- Source/Config/config.php | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 64ced87..1309584 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,9 +24,12 @@ steps: image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest environment: IMAGENAME: hub.codefirst.iut.uca.fr/dorian.hodin/sae4.01_formulaire:latest - CONTAINERNAME: formulaire + CONTAINERNAME: + from_secret : CONTAINER_NAME COMMAND: create OVERWRITE: true + CODEFIRST_CLIENTDRONE_ENV_CONTAINER_NAME: + from_secret: CONTAINER_NAME ADMINS: dorianhodin,alexislamande,baptistebaverel,johanlachenal depends_on: [ formulaire ] diff --git a/Source/Config/config.php b/Source/Config/config.php index 658e883..f9cdd73 100644 --- a/Source/Config/config.php +++ b/Source/Config/config.php @@ -13,7 +13,11 @@ $views['responses'] = 'Views/HTML/responses.php'; $views['thanks'] = 'Views/HTML/thanks.php'; $views['error'] = 'Views/HTML/error.php'; -$_SERVER['BASE_URI'] = ''; +if (empty($_ENV['CONTAINER_NAME'])){ + $_SERVER['BASE_URI'] = ''; +}else{ + $_SERVER['BASE_URI'] = $_ENV['CONTAINER_NAME']; +} $url = $_SERVER['PHP_SELF'];