From a970bfad975f3f4579306c9be9cd06d62cd99d32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Mon, 6 Nov 2017 09:16:36 +0100 Subject: [PATCH] Don't display unwanted trace --- docker-compose-run | 5 ++++- .../scaffolds/create/docker-compose-run | 9 ++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/docker-compose-run b/docker-compose-run index 4bd70c0c905..ef34f0a4e0d 100755 --- a/docker-compose-run +++ b/docker-compose-run @@ -15,7 +15,10 @@ os.environ["RUN"] = urllib.parse.quote(json.dumps(sys.argv[1:])) if os.path.exists(".SUCCESS"): os.remove(".SUCCESS") -subprocess.check_call(["docker-compose", "up", "--abort-on-container-exit"]) +try: + subprocess.check_call(["docker-compose", "up", "--abort-on-container-exit"]) +except subprocess.CalledProcessError: + exit(2) if os.path.exists(".SUCCESS"): os.remove(".SUCCESS") diff --git a/geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose-run b/geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose-run index e2e687aa8fa..d1f9213f2fd 100755 --- a/geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose-run +++ b/geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose-run @@ -15,9 +15,12 @@ os.environ["RUN"] = urllib.parse.quote(json.dumps(sys.argv[1:])) if os.path.exists(".SUCCESS"): os.remove(".SUCCESS") -subprocess.check_call([ - "docker-compose", "--file", "docker-compose-build.yaml", "up", "--abort-on-container-exit" -]) +try: + subprocess.check_call([ + "docker-compose", "--file", "docker-compose-build.yaml", "up", "--abort-on-container-exit" + ]) +except subprocess.CalledProcessError: + exit(2) if os.path.exists(".SUCCESS"): os.remove(".SUCCESS")