From 35a4f4913471e478520a52455abc1f7a9d8435f4 Mon Sep 17 00:00:00 2001 From: Quentin Duchemin <quentinduchemin@tuta.io> Date: Wed, 3 Jun 2020 19:57:18 +0200 Subject: [PATCH] [docker_test.sh] Do not reset hard after launching testing containers There is some situations where this is not desirable : docker_test.sh replaces all .picasoft.net with .test.picasoft.net to help testing. If, for example, you have a mounted config.json with a modified URL, and that you reset the repository, the file will be reset inside the container, leading to strange bug, such as the test container trying to connect to the production database. Also, it is really easier to debug the test instance with test values --- docker_test.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker_test.sh b/docker_test.sh index bdbb8172..101978c7 100755 --- a/docker_test.sh +++ b/docker_test.sh @@ -94,9 +94,8 @@ docker-compose config | grep "image:" | cut -d ':' -f 2- | xargs docker image rm echo -e "\n==== Pull new versions of images ====" docker-compose pull -echo -e "\n==== Lauch $1 and restore repository ====" +echo -e "\n==== Lauch $1 ====" docker-compose up -d -git reset --hard echo -e "\n==== Print logs (use Ctrl+C to stop) ====" docker-compose logs -f -- GitLab