From 99a1e4aa7477cb3e920fb094ab279b45c4492829 Mon Sep 17 00:00:00 2001 From: David Bell Date: Wed, 20 Jan 2021 10:37:09 +0000 Subject: [PATCH] moving to bionic --- .travis.yml | 4 ++-- travis-build-scripts/install-credential-helper.sh | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2952fc7..e37a3c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,10 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -dist: xenial +dist: bionic +group: beta sudo: required language: go -group: xeniallegacy go: - "1.13.15" diff --git a/travis-build-scripts/install-credential-helper.sh b/travis-build-scripts/install-credential-helper.sh index 14b9021..0fba443 100755 --- a/travis-build-scripts/install-credential-helper.sh +++ b/travis-build-scripts/install-credential-helper.sh @@ -27,7 +27,7 @@ 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 +gpg2 --batch --gen-key <<-EOF %echo generating a standard key Key-Type: DSA Key-Length: 1024 @@ -36,13 +36,14 @@ Subkey-Length: 1024 Name-Real: Travis CI Name-Email: travis@osism.io Expire-Date: 0 +Passphrase: $REGISTRY_PASS %commit %echo done EOF -key=$(gpg --no-auto-check-trustdb --list-secret-keys | grep ^sec | cut -d/ -f2 | cut -d" " -f1) -gpg --export-secret-keys | gpg2 --import - +key=$(gpg2 --list-secret-keys | grep uid -B 1 | head -n 1 | sed 's/^ *//g') pass init $key pass insert docker-credential-helpers/docker-pass-initialized-check <<-EOF pass is initialized pass is initialized EOF +gpg2 --passphrase $REGISTRY_PASS --pinentry-mode=loopback --output doc --decrypt ~/.password-store/docker-credential-helpers/docker-pass-initialized-check.gpg