Skip to content

Commit

Permalink
[FABCI-482] Update Nexus URL's to Artifactory (#36)
Browse files Browse the repository at this point in the history
Signed-off-by: Brett Logan <Brett.T.Logan@ibm.com>
  • Loading branch information
Brett Logan authored and andrew-coleman committed Jan 20, 2020
1 parent 4a8b56e commit ed2dd26
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ pom.xml
### Java and Node Chaincode environment
You may also need to on your <span style="color:red"><b>v2.0</b> </span> Fabric network docker deployment explicitly pull the Java and Node chaincode environments for now.

`docker pull nexus3.hyperledger.org:10001/hyperledger/fabric-nodeenv:amd64-2.0.0-stable&&docker tag nexus3.hyperledger.org:10001/hyperledger/fabric-nodeenv:amd64-2.0.0-stable hyperledger/fabric-nodeenv:amd64-latest&&docker tag nexus3.hyperledger.org:10001/hyperledger/fabric-nodeenv:amd64-2.0.0-stable hyperledger/fabric-nodeenv`
`docker pull hyperledger-fabric.jfrog.io/fabric-nodeenv:amd64-2.0.0-stable&&docker tag hyperledger-fabric.jfrog.io/fabric-nodeenv:amd64-2.0.0-stable hyperledger/fabric-nodeenv:amd64-latest&&docker tag hyperledger-fabric.jfrog.io/fabric-nodeenv:amd64-2.0.0-stable hyperledger/fabric-nodeenv`

`docker pull nexus3.hyperledger.org:10001/hyperledger/fabric-javaenv:amd64-2.0.0-stable&&docker tag nexus3.hyperledger.org:10001/hyperledger/fabric-javaenv:amd64-2.0.0-stable hyperledger/fabric-javaenv:amd64-latest&&docker tag nexus3.hyperledger.org:10001/hyperledger/fabric-javaenv:amd64-2.0.0-stable hyperledger/fabric-javaenv`
`docker pull hyperledger-fabric.jfrog.io/fabric-javaenv:amd64-2.0.0-stable&&docker tag hyperledger-fabric.jfrog.io/fabric-javaenv:amd64-2.0.0-stable hyperledger/fabric-javaenv:amd64-latest&&docker tag hyperledger-fabric.jfrog.io/fabric-javaenv:amd64-2.0.0-stable hyperledger/fabric-javaenv`

## Known limitations and restrictions

Expand Down
14 changes: 7 additions & 7 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ jobs:
export IMAGE_TAG_FABRIC=2.0
export IMAGE_TAG_FABRIC_CA=2.0
########################
# Pull nodenev image from nexus and re-tag to hyperledger/fabric-nodeenv
# Pull nodenev image from Artifactory and re-tag to hyperledger/fabric-nodeenv
#######################
docker pull nexus3.hyperledger.org:10001/hyperledger/fabric-nodeenv:amd64-2.0.0-stable
docker tag nexus3.hyperledger.org:10001/hyperledger/fabric-nodeenv:amd64-2.0.0-stable hyperledger/fabric-nodeenv:amd64-latest
docker tag nexus3.hyperledger.org:10001/hyperledger/fabric-nodeenv:amd64-2.0.0-stable hyperledger/fabric-nodeenv
docker pull nexus3.hyperledger.org:10001/hyperledger/fabric-javaenv:amd64-2.0.0-stable
docker tag nexus3.hyperledger.org:10001/hyperledger/fabric-javaenv:amd64-2.0.0-stable hyperledger/fabric-javaenv:amd64-latest
docker tag nexus3.hyperledger.org:10001/hyperledger/fabric-javaenv:amd64-2.0.0-stable hyperledger/fabric-javaenv
docker pull hyperledger-fabric.jfrog.io/fabric-nodeenv:amd64-2.0.0-stable
docker tag hyperledger-fabric.jfrog.io/fabric-nodeenv:amd64-2.0.0-stable hyperledger/fabric-nodeenv:amd64-latest
docker tag hyperledger-fabric.jfrog.io/fabric-nodeenv:amd64-2.0.0-stable hyperledger/fabric-nodeenv
docker pull hyperledger-fabric.jfrog.io/fabric-javaenv:amd64-2.0.0-stable
docker tag hyperledger-fabric.jfrog.io/fabric-javaenv:amd64-2.0.0-stable hyperledger/fabric-javaenv:amd64-latest
docker tag hyperledger-fabric.jfrog.io/fabric-javaenv:amd64-2.0.0-stable hyperledger/fabric-javaenv
##########
docker images | grep hyperledger/fabric-nodeenv || true
source ./src/test/fabric_test_commitlevel.sh
Expand Down
30 changes: 15 additions & 15 deletions src/test/pull_images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ set -o pipefail
echo "======== PULL DOCKER IMAGES ========"

##########################################################
# Pull and Tag the fabric and fabric-ca images from Nexus
# Pull and Tag the fabric and fabric-ca images from Artifactory
##########################################################
echo "Fetching images from Nexus"
NEXUS_URL=nexus3.hyperledger.org:10001
ORG_NAME="hyperledger/fabric"
echo "Fetching images from Artifactory"
ARTIFACTORY_URL=hyperledger-fabric.jfrog.io
ORG_NAME="hyperledger"

VERSION=2.0.0
ARCH="amd64"
Expand All @@ -22,33 +22,33 @@ dockerTag() {
for IMAGES in peer orderer ca ca orderer baseos ccenv javaenv nodeenv tools; do
echo "Images: $IMAGES"
echo
docker pull $NEXUS_URL/$ORG_NAME-$IMAGES:$STABLE_TAG
docker pull $ARTIFACTORY_URL/fabric-$IMAGES:$STABLE_TAG
if [ $? != 0 ]; then
echo "FAILED: Docker Pull Failed on $IMAGES"
exit 1
fi
docker tag $NEXUS_URL/$ORG_NAME-$IMAGES:$STABLE_TAG $ORG_NAME-$IMAGES
docker tag $NEXUS_URL/$ORG_NAME-$IMAGES:$STABLE_TAG $ORG_NAME-$IMAGES:$MASTER_TAG
echo "$ORG_NAME-$IMAGES:$MASTER_TAG"
echo "Deleting Nexus docker images: $IMAGES"
docker rmi -f $NEXUS_URL/$ORG_NAME-$IMAGES:$STABLE_TAG
docker tag $ARTIFACTORY_URL/fabric-$IMAGES:$STABLE_TAG $ORG_NAME/fabric-$IMAGES
docker tag $ARTIFACTORY_URL/fabric-$IMAGES:$STABLE_TAG $ORG_NAME/fabric-$IMAGES:$MASTER_TAG
echo "$ORG_NAME/fabric-$IMAGES:$MASTER_TAG"
echo "Deleting Artifactory docker images: $IMAGES"
docker rmi -f $ARTIFACTORY_URL/fabric-$IMAGES:$STABLE_TAG
done
}

dockerTag2() {
for IMAGES in baseos ccenv javaenv nodeenv; do
echo "Images: $IMAGES"
echo
docker pull $NEXUS_URL/$ORG_NAME-$IMAGES:$STABLE_TAG
docker pull $ARTIFACTORY_URL/fabric-$IMAGES:$STABLE_TAG
if [ $? != 0 ]; then
echo "FAILED: Docker Pull Failed on $IMAGES"
exit 1
fi
docker tag $NEXUS_URL/$ORG_NAME-$IMAGES:$STABLE_TAG $ORG_NAME-$IMAGES
docker tag $NEXUS_URL/$ORG_NAME-$IMAGES:$STABLE_TAG $ORG_NAME-$IMAGES:$VERSION
docker tag $ARTIFACTORY_URL/fabric-$IMAGES:$STABLE_TAG $ORG_NAME/fabric-$IMAGES
docker tag $ARTIFACTORY_URL/fabric-$IMAGES:$STABLE_TAG $ORG_NAME/fabric-$IMAGES:$VERSION
echo "$ORG_NAME-$IMAGES:$VERSION"
echo "Deleting Nexus docker images: $IMAGES"
docker rmi -f $NEXUS_URL/$ORG_NAME-$IMAGES:$STABLE_TAG
echo "Deleting Artifactory docker images: $IMAGES"
docker rmi -f $ARTIFACTORY_URL/fabric-$IMAGES:$STABLE_TAG
done
}

Expand Down

0 comments on commit ed2dd26

Please sign in to comment.