Clean up Fabric Version Methodology

Signed-off-by: Brett Logan <[email protected]>
Signed-off-by: Brett Logan <[email protected]>

Author: Brett Logan

ci/azure-pipelines.yml

@@ -40,6 +40,8 @@ variables:
     value: ci
   - name: PUSH_VERSION
     value: stable
+  - name: FABRIC_VERSION
+    value: 2.2
 
 pool:
   vmImage: "ubuntu-latest"

fabric-chaincode-integration-test/getDockerImages.sh

@@ -1,43 +1,22 @@
-#!/bin/bash -e
+#!/bin/bash
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
 set -euo pipefail
 
-echo "======== PULL DOCKER IMAGES ========"
+version=${FABRIC_VERSION:-2.2}
+artifactory_url=hyperledger-fabric.jfrog.io
 
-###############################################################
-# Pull and Tag the fabric and fabric-ca images from Artifactory
-###############################################################
-echo "Fetching images from Artifactory"
-ARTIFACTORY_URL=hyperledger-fabric.jfrog.io
-ORG_NAME="hyperledger"
+for image in peer orderer ca tools; do
+    artifactory_image="${artifactory_url}/fabric-${image}:amd64-${version}-stable"
+    docker pull -q "${artifactory_image}"
+    docker tag "${artifactory_image}" "hyperledger/fabric-${image}"
+    docker rmi -f "${artifactory_image}" >/dev/null
+done
 
-VERSION=2.1
-ARCH="amd64"
-: ${STABLE_VERSION:=$VERSION-stable}
-STABLE_TAG=$ARCH-$STABLE_VERSION
-MASTER_TAG=$ARCH-master
-
-echo "---------> STABLE_VERSION:" $STABLE_VERSION
-
-dockerTag() {
-  for IMAGE in peer orderer ca tools orderer ccenv; do
-    echo "Images: $IMAGE"
-    echo
-    docker pull $ARTIFACTORY_URL/fabric-$IMAGE:$STABLE_TAG
-          if [[ $? != 0 ]]; then
-             echo  "FAILED: Docker Pull Failed on $IMAGE"
-             exit 1
-          fi
-    docker tag $ARTIFACTORY_URL/fabric-$IMAGE:$STABLE_TAG $ORG_NAME/fabric-$IMAGE
-    docker tag $ARTIFACTORY_URL/fabric-$IMAGE:$STABLE_TAG $ORG_NAME/fabric-$IMAGE:$MASTER_TAG
-    docker tag $ARTIFACTORY_URL/fabric-$IMAGE:$STABLE_TAG $ORG_NAME/fabric-$IMAGE:$VERSION
-    echo "$ORG_NAME-$IMAGE:$MASTER_TAG"
-    echo "Deleting Artifactory docker images: $IMAGE"
-    docker rmi -f $ARTIFACTORY_URL/fabric-$IMAGE:$STABLE_TAG
-  done
-}
-
-dockerTag
-
-echo
-docker images | grep "hyperledger*"
-echo
+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

fabric-chaincode-integration-test/src/test/resources/first-network/.env

@@ -1,2 +1 @@
 COMPOSE_PROJECT_NAME=net
-IMAGE_TAG=latest

fabric-chaincode-integration-test/src/test/resources/first-network/base/docker-compose-base.yaml

@@ -9,7 +9,7 @@ services:
 
   orderer.example.com:
     container_name: orderer.example.com
-    image: hyperledger/fabric-orderer:latest
+    image: hyperledger/fabric-orderer
     environment:
       - ORDERER_GENERAL_LOGLEVEL=INFO
       - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0

fabric-chaincode-integration-test/src/test/resources/first-network/base/peer-base.yaml

@@ -7,7 +7,7 @@ version: '2'
 
 services:
   peer-base:
-    image: hyperledger/fabric-peer:latest
+    image: hyperledger/fabric-peer
     environment:
       - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock
       # the following setting starts chaincode containers on the same
@@ -22,7 +22,7 @@ services:
       - CORE_PEER_TLS_CERT_FILE=/etc/hyperledger/fabric/tls/server.crt
       - CORE_PEER_TLS_KEY_FILE=/etc/hyperledger/fabric/tls/server.key
       - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/fabric/tls/ca.crt
-      - CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:amd64-latest
+      - CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv
       - CORE_CHAINCODE_EXECUTETIMEOUT=400s
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer
     command: peer node start

fabric-chaincode-integration-test/src/test/resources/first-network/docker-compose-cli.yaml

@@ -59,7 +59,7 @@ services:
 
   cli:
     container_name: cli
-    image: hyperledger/fabric-tools:latest
+    image: hyperledger/fabric-tools
     tty: true
     stdin_open: true
     environment: