From 6d4905ba2a7b8502f8707cd5910103d058df16b8 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 28 Feb 2018 16:40:59 +0000 Subject: [PATCH] cmd: Update generated code. The source script changed Signed-off-by: Rolf Neugebauer --- src/cmd/linuxkit/pkglib/manifest_push_script.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/cmd/linuxkit/pkglib/manifest_push_script.go b/src/cmd/linuxkit/pkglib/manifest_push_script.go index 7a80d159c..31b883c0b 100644 --- a/src/cmd/linuxkit/pkglib/manifest_push_script.go +++ b/src/cmd/linuxkit/pkglib/manifest_push_script.go @@ -27,7 +27,12 @@ TAG=$(echo "$TARGET" | cut -d':' -f2) # we need them for notary on all platforms. case $(uname -s) in Darwin) - CRED=$(echo "https://index.docker.io/v1/" | /Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain.bin get) + # Prior to 2018-03-27 D4M used a .bin suffix on the keychain utility binary name. Support the old name for a while + if [ -f /Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain.bin ]; then + CRED=$(echo "https://index.docker.io/v1/" | /Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain.bin get) + else + CRED=$(echo "https://index.docker.io/v1/" | /Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain get) + fi USER=$(echo "$CRED" | jq -r '.Username') PASS=$(echo "$CRED" | jq -r '.Secret') MT_ARGS="--username $USER --password $PASS"