From 33b1b899b2f4d1c563eb601ea02c10543542d9dd Mon Sep 17 00:00:00 2001 From: Taka Cho Date: Tue, 5 May 2020 19:33:21 +0000 Subject: [PATCH] change to tty for docker exec there is no TTY device for Jenkins Job change to tty option for docker exec instead Issue-ID: POLICY-2541 Change-Id: I4b33332e53ff2119e3e2846d96c8b3309a0420d4 Signed-off-by: Taka Cho --- plans/policy/apex-pdp/setup.sh | 4 ++-- plans/policy/api/setup.sh | 4 ++-- plans/policy/distribution/setup.sh | 4 ++-- plans/policy/pap/setup.sh | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plans/policy/apex-pdp/setup.sh b/plans/policy/apex-pdp/setup.sh index 377ce4b1..d3c1d629 100644 --- a/plans/policy/apex-pdp/setup.sh +++ b/plans/policy/apex-pdp/setup.sh @@ -64,8 +64,8 @@ echo ${POLICY_APEX_PDP_VERSION} docker-compose -f ${WORKSPACE}/scripts/policy/policy-apex-pdp/docker-compose-apex.yml run --rm start_dependencies #Configure the database -docker exec -it mariadb chmod +x /docker-entrypoint-initdb.d/db.sh -docker exec -it mariadb /docker-entrypoint-initdb.d/db.sh +docker exec --tty mariadb chmod +x /docker-entrypoint-initdb.d/db.sh +docker exec --tty mariadb /docker-entrypoint-initdb.d/db.sh # now bring everything else up docker-compose -f ${WORKSPACE}/scripts/policy/policy-apex-pdp/docker-compose-apex.yml run --rm start_all diff --git a/plans/policy/api/setup.sh b/plans/policy/api/setup.sh index 8bd4b4af..466435d3 100644 --- a/plans/policy/api/setup.sh +++ b/plans/policy/api/setup.sh @@ -38,8 +38,8 @@ echo ${POLICY_API_VERSION} docker-compose -f ${WORKSPACE}/scripts/policy/docker-compose-api.yml run --rm start_dependencies #Configure the database -docker exec -it mariadb chmod +x /docker-entrypoint-initdb.d/db.sh -docker exec -it mariadb /docker-entrypoint-initdb.d/db.sh +docker exec --tty mariadb chmod +x /docker-entrypoint-initdb.d/db.sh +docker exec --tty mariadb /docker-entrypoint-initdb.d/db.sh # now bring everything else up docker-compose -f ${WORKSPACE}/scripts/policy/docker-compose-api.yml run --rm start_all diff --git a/plans/policy/distribution/setup.sh b/plans/policy/distribution/setup.sh index d1a08632..52573b58 100644 --- a/plans/policy/distribution/setup.sh +++ b/plans/policy/distribution/setup.sh @@ -72,8 +72,8 @@ zip -F ${SCRIPT_DIR}/config/distribution/csar/sample_csar_with_apex_policy.csar docker-compose -f ${SCRIPT_DIR}/docker-compose-distribution.yml run --rm start_dependencies #Configure the database -docker exec -it mariadb chmod +x /docker-entrypoint-initdb.d/db.sh -docker exec -it mariadb /docker-entrypoint-initdb.d/db.sh +docker exec --tty mariadb chmod +x /docker-entrypoint-initdb.d/db.sh +docker exec --tty mariadb /docker-entrypoint-initdb.d/db.sh # now bring everything else up docker-compose -f ${SCRIPT_DIR}/docker-compose-distribution.yml run --rm start_all diff --git a/plans/policy/pap/setup.sh b/plans/policy/pap/setup.sh index a5350b2d..5b060497 100644 --- a/plans/policy/pap/setup.sh +++ b/plans/policy/pap/setup.sh @@ -40,8 +40,8 @@ echo ${POLICY_PAP_VERSION} docker-compose -f ${WORKSPACE}/scripts/policy/docker-compose-pap.yml run --rm start_dependencies #Configure the database -docker exec -it mariadb chmod +x /docker-entrypoint-initdb.d/db.sh -docker exec -it mariadb /docker-entrypoint-initdb.d/db.sh +docker exec --tty mariadb chmod +x /docker-entrypoint-initdb.d/db.sh +docker exec --tty mariadb /docker-entrypoint-initdb.d/db.sh # now bring everything else up docker-compose -f ${WORKSPACE}/scripts/policy/docker-compose-pap.yml run --rm start_all -- 2.16.6