Merge "change to tty for docker exec"

diff --git a/plans/policy/apex-pdp/setup.sh b/plans/policy/apex-pdp/setup.sh
index 377ce4b..d3c1d62 100644 (file)
--- 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 8bd4b4a..466435d 100644 (file)
--- 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 d1a0863..52573b5 100644 (file)
--- 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 a5350b2..5b06049 100644 (file)
--- 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