diff --git a/plugins/common/functions b/plugins/common/functions index 562ee1310..cb0a7a2af 100755 --- a/plugins/common/functions +++ b/plugins/common/functions @@ -325,7 +325,7 @@ copy_from_image() { [[ -z "$WORKDIR" ]] && local WORKDIR=/app local SRC_FILE="$WORKDIR/$SRC_FILE" fi - local CID=$(docker run "$DOKKU_GLOBAL_RUN_ARGS" -d "$IMAGE" bash) + local CID=$(docker create "$DOKKU_GLOBAL_RUN_ARGS" "$IMAGE") docker cp "$CID:$SRC_FILE" "$DST_DIR" docker rm -f "$CID" &> /dev/null else diff --git a/tests.mk b/tests.mk index 24f0dbd22..8eb1eaa7d 100644 --- a/tests.mk +++ b/tests.mk @@ -5,7 +5,6 @@ ifneq ($(shell shellcheck --version > /dev/null 2>&1 ; echo $$?),0) ifeq ($(SYSTEM),Darwin) brew install shellcheck else - sudo apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 5072E1F5 sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse' sudo rm -rf /var/lib/apt/lists/* && sudo apt-get clean sudo apt-get update -qq && sudo apt-get install -qq -y shellcheck