Skip to content

Commit 9cf69d1

Browse files
authored
Refactor copy scripts to reuse resolved container ID (#1410)
1 parent d47aca2 commit 9cf69d1

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

compose/bin/copyfromcontainer

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
#!/usr/bin/env bash
22
[ -z "$1" ] && echo "Please specify a directory or file to copy from container (ex. vendor, --all)" && exit
33

4+
CONTAINER_ID=$(bin/docker-compose ps -q phpfpm | awk '{print $1}')
45
REAL_SRC=$(cd -P "src" >/dev/null && pwd)
56
if [ ! -d "$REAL_SRC" ]; then
67
mkdir -p "$REAL_SRC"
78
fi
9+
810
if [ "$1" == "--all" ]; then
9-
docker cp "$(bin/docker-compose ps -q phpfpm|awk '{print $1}')":/var/www/html/./ "$REAL_SRC/"
11+
docker cp "$CONTAINER_ID":/var/www/html/./ "$REAL_SRC/"
1012
echo "Completed copying all files from container to host"
1113
else
1214
if [ -f "$1" ] ; then
13-
docker cp "$(bin/docker-compose ps -q phpfpm|awk '{print $1}')":/var/www/html/"$1" "$REAL_SRC/$1"
15+
docker cp "$CONTAINER_ID":/var/www/html/"$1" "$REAL_SRC/$1"
1416
else
15-
docker cp "$(bin/docker-compose ps -q phpfpm|awk '{print $1}')":/var/www/html/"$1" "$REAL_SRC/$(dirname "$1")"
17+
docker cp "$CONTAINER_ID":/var/www/html/"$1" "$REAL_SRC/$(dirname "$1")"
1618
fi
1719
echo "Completed copying $1 from container to host"
1820
fi

compose/bin/copytocontainer

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env bash
22
[ $# -eq 0 ] && echo "Please specify one or more directories/files to copy to container (ex. vendor, --all)" && exit 1
33

4-
REAL_SRC=$(cd -P "src" >/dev/null && pwd)
54
CONTAINER_ID=$(bin/docker-compose ps -q phpfpm | awk '{print $1}')
5+
REAL_SRC=$(cd -P "src" >/dev/null && pwd)
66

77
for ARG in "$@"; do
88
if [ "$ARG" == "--all" ]; then

0 commit comments

Comments
 (0)