From 5e23d979d29a1fe55b695fa8bea6e1f2fb56f3c3 Mon Sep 17 00:00:00 2001 From: Amrit K Kandola Date: Thu, 20 Feb 2020 14:19:17 +0000 Subject: [PATCH] Remove credential helper from Z due to bionic (#59) * Temporarily remove credential helper from Z build due to bionic issue --- Makefile | 2 +- travis-build-scripts/install-credential-helper.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 98713b2..a80c2f4 100644 --- a/Makefile +++ b/Makefile @@ -385,7 +385,7 @@ install-build-deps: .PHONY: install-credential-helper install-credential-helper: -ifneq ($(ARCH),ppc64le) +ifeq ($(ARCH),amd64) ARCH=$(ARCH) ./travis-build-scripts/install-credential-helper.sh endif diff --git a/travis-build-scripts/install-credential-helper.sh b/travis-build-scripts/install-credential-helper.sh index 9a8f69a..14b9021 100755 --- a/travis-build-scripts/install-credential-helper.sh +++ b/travis-build-scripts/install-credential-helper.sh @@ -25,7 +25,6 @@ git clone https://github.com/docker/docker-credential-helpers cd docker-credential-helpers make pass cp bin/docker-credential-pass $GOPATH/bin/docker-credential-pass - mkdir -p /home/travis/.docker echo '{ "credsStore": "pass" }' | tee /home/travis/.docker/config.json gpg --batch --gen-key <<-EOF