From 66948b9de4eb440572f9f9b99853c6e606a12d1c Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 6 Oct 2018 19:03:35 -0400 Subject: [PATCH 1/2] feat: use create instead of run for faster and more reliable file copy from docker images Closes #3272 --- plugins/common/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 58fcb01e08c6ad951214e70583d386914914e422 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 7 Oct 2018 18:08:40 -0400 Subject: [PATCH 2/2] hack: drop apt-key call for mysql key --- tests.mk | 1 - 1 file changed, 1 deletion(-) 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