Răsfoiți Sursa

use container id for docker commands in bin scripts

Jerry Lopez 6 ani în urmă
părinte
comite
1a745c6076

+ 1 - 1
compose/magento-2-windows/bin/copydir.ps1

@@ -3,4 +3,4 @@ Param(
   [Parameter(Mandatory=$True,Position=1)]
   [string]$dir
 )
-docker cp $(docker-compose ps|grep phpfpm|awk '{print $dir}'):/var/www/html/$dir src/
+docker cp $(docker-compose ps -q phpfpm|awk '{print $dir}'):/var/www/html/$dir src/

+ 2 - 2
compose/magento-2/bin/copyfromcontainer

@@ -2,9 +2,9 @@
 [ -z "$1" ] && echo "Please specify a directory or file to copy from container (ex. vendor, --all)" && exit
 
 if [ "$1" == "--all" ]; then
-  docker cp $(docker-compose ps|grep phpfpm|awk '{print $1}'):/var/www/html/./ src/
+  docker cp $(docker-compose ps -q phpfpm|awk '{print $1}'):/var/www/html/./ src/
   echo "Completed copying all files from container to host"
 else
-  docker cp $(docker-compose ps|grep phpfpm|awk '{print $1}'):/var/www/html/$1 src/
+  docker cp $(docker-compose ps -q phpfpm|awk '{print $1}'):/var/www/html/$1 src/
   echo "Completed copying $1 from container to host"
 fi

+ 2 - 2
compose/magento-2/bin/copytocontainer

@@ -2,10 +2,10 @@
 [ -z "$1" ] && echo "Please specify a directory or file to copy to container (ex. vendor, --all)" && exit
 
 if [ "$1" == "--all" ]; then
-  docker cp src/./ $(docker-compose ps|grep phpfpm|awk '{print $1}'):/var/www/html/
+  docker cp src/./ $(docker-compose ps -q phpfpm|awk '{print $1}'):/var/www/html/
   echo "Completed copying all files from host to container"
 else
-  docker cp src/$1 $(docker-compose ps|grep phpfpm|awk '{print $1}'):/var/www/html/
+  docker cp src/$1 $(docker-compose ps -q phpfpm|awk '{print $1}'):/var/www/html/
   echo "Completed copying $1 from host to container"
 fi