From 4e24e4735a38bbc9476d577ac0f5b7e37109a810 Mon Sep 17 00:00:00 2001 From: Brett Logan Date: Sat, 11 Jul 2020 13:56:41 -0400 Subject: [PATCH] Add baseos to vendored images and bump fab version (#67) Signed-off-by: Brett Logan --- azure-pipelines.yml | 2 +- scripts/pull-fabric-images.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bee4a7d3..7535f29e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -11,7 +11,7 @@ pr: variables: GOPATH: $(Build.Repository.LocalPath)/src/test/fixture - FABRIC_VERSION: 2.1 + FABRIC_VERSION: 2.2 pool: vmImage: 'ubuntu-18.04' diff --git a/scripts/pull-fabric-images.sh b/scripts/pull-fabric-images.sh index afd0aff2..cbfc4910 100755 --- a/scripts/pull-fabric-images.sh +++ b/scripts/pull-fabric-images.sh @@ -2,10 +2,10 @@ set -euo pipefail # FABRIC_VERSION is set in ci/azure-pipelines.yml -VERSION=${FABRIC_VERSION:-2.1} +VERSION=${FABRIC_VERSION:-2.2} STABLE_TAG=amd64-${VERSION}-stable -for image in peer orderer tools ccenv javaenv nodeenv; do +for image in peer orderer tools ccenv baseos javaenv nodeenv; do docker pull -q hyperledger-fabric.jfrog.io/fabric-${image}:${STABLE_TAG} docker tag hyperledger-fabric.jfrog.io/fabric-${image}:${STABLE_TAG} hyperledger/fabric-${image} docker rmi -f hyperledger-fabric.jfrog.io/fabric-${image}:${STABLE_TAG} >/dev/null