Merge pull request #15 from solutionDrive/bug/docker-compose-slug-fix

michz · web-flow · commit 9cbfb281d120 · 2018-11-20T11:44:00.000+01:00
change docker exec to call the container with the new docker-compose …
diff --git a/bin/runInSdTest.sh b/bin/runInSdTest.sh
@@ -29,4 +29,4 @@ PROJECT_NAME="$( basename ${PROJECT_DIR} | tr '[:upper:]' '[:lower:]' )"
 PHP_CONTAINER_NAME="${PROJECT_NAME}_shopware54_php${VERSION}_1"
 WORK_DIR=${WORK_DIR:-"/var/www/shopware54_php${VERSION}"}
 
-docker exec --workdir ${WORK_DIR} -it ${PHP_CONTAINER_NAME} ${@:2}
+docker exec --workdir ${WORK_DIR} -it $(docker container ls -f name=${PHP_CONTAINER_NAME} -q) ${@:2}
diff --git a/bin/sdPlugin.sh b/bin/sdPlugin.sh
@@ -66,7 +66,7 @@ function remove_plugin {
 }
 
 function execute_in_docker {
-    docker exec --workdir ${WORK_DIR} -it ${PHP_CONTAINER_NAME} $1
+    docker exec --workdir ${WORK_DIR} -it $(docker container ls -f name=${PHP_CONTAINER_NAME} -q) $1
 }
 
 ## start of the real program

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ function remove_plugin {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`function execute_in_docker {`
`69`		`- docker exec --workdir ${WORK_DIR} -it ${PHP_CONTAINER_NAME} $1`
	`69`	`+ docker exec --workdir ${WORK_DIR} -it $(docker container ls -f name=${PHP_CONTAINER_NAME} -q) $1`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`## start of the real program`