Merge pull request hyperledger#168 from lindluni/version

Change FABRIC_VERSION to latest tag
danielahume · Mar 5, 2021 · 0d8312f · 0d8312f
2 parents 76c7fe4 + b51eac2
commit 0d8312f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml
@@ -40,7 +40,7 @@ variables:
   - name: PUSH_VERSION
     value: stable
   - name: FABRIC_VERSION
-    value: 2.1
+    value: latest
 
 pool:
   vmImage: "ubuntu-latest"

diff --git a/fabric-chaincode-integration-test/getDockerImages.sh b/fabric-chaincode-integration-test/getDockerImages.sh
@@ -6,17 +6,14 @@
 #
 set -euo pipefail
 
-version=${FABRIC_VERSION:-2.3}
+version=${FABRIC_VERSION:-latest}
 artifactory_url=hyperledger-fabric.jfrog.io
 
-for image in peer orderer tools; do
-    artifactory_image="${artifactory_url}/fabric-${image}:amd64-${version}-stable"
+for image in peer orderer ca tools; do
+    artifactory_image="${artifactory_url}/fabric-${image}:amd64-${version}"
     docker pull -q "${artifactory_image}"
     docker tag "${artifactory_image}" "hyperledger/fabric-${image}"
     docker rmi -f "${artifactory_image}" >/dev/null
 done
 
 docker pull -q hyperledger/fabric-couchdb
-docker pull -q hyperledger/fabric-ca:1.4
-docker tag hyperledger/fabric-ca:1.4 hyperledger/fabric-ca
-docker rmi hyperledger/fabric-ca:1.4 >/dev/null