Skip to content
This repository was archived by the owner on Apr 22, 2025. It is now read-only.

Commit ed2dd26

Browse files
Brett Loganandrew-coleman
authored andcommitted
[FABCI-482] Update Nexus URL's to Artifactory (#36)
Signed-off-by: Brett Logan <[email protected]>
1 parent 4a8b56e commit ed2dd26

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ pom.xml
9797
### Java and Node Chaincode environment
9898
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.
9999

100-
`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`
100+
`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`
101101

102-
`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`
102+
`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`
103103

104104
## Known limitations and restrictions
105105

azure-pipelines.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ jobs:
1919
export IMAGE_TAG_FABRIC=2.0
2020
export IMAGE_TAG_FABRIC_CA=2.0
2121
########################
22-
# Pull nodenev image from nexus and re-tag to hyperledger/fabric-nodeenv
22+
# Pull nodenev image from Artifactory and re-tag to hyperledger/fabric-nodeenv
2323
#######################
24-
docker pull nexus3.hyperledger.org:10001/hyperledger/fabric-nodeenv:amd64-2.0.0-stable
25-
docker tag nexus3.hyperledger.org:10001/hyperledger/fabric-nodeenv:amd64-2.0.0-stable hyperledger/fabric-nodeenv:amd64-latest
26-
docker tag nexus3.hyperledger.org:10001/hyperledger/fabric-nodeenv:amd64-2.0.0-stable hyperledger/fabric-nodeenv
27-
docker pull nexus3.hyperledger.org:10001/hyperledger/fabric-javaenv:amd64-2.0.0-stable
28-
docker tag nexus3.hyperledger.org:10001/hyperledger/fabric-javaenv:amd64-2.0.0-stable hyperledger/fabric-javaenv:amd64-latest
29-
docker tag nexus3.hyperledger.org:10001/hyperledger/fabric-javaenv:amd64-2.0.0-stable hyperledger/fabric-javaenv
24+
docker pull hyperledger-fabric.jfrog.io/fabric-nodeenv:amd64-2.0.0-stable
25+
docker tag hyperledger-fabric.jfrog.io/fabric-nodeenv:amd64-2.0.0-stable hyperledger/fabric-nodeenv:amd64-latest
26+
docker tag hyperledger-fabric.jfrog.io/fabric-nodeenv:amd64-2.0.0-stable hyperledger/fabric-nodeenv
27+
docker pull hyperledger-fabric.jfrog.io/fabric-javaenv:amd64-2.0.0-stable
28+
docker tag hyperledger-fabric.jfrog.io/fabric-javaenv:amd64-2.0.0-stable hyperledger/fabric-javaenv:amd64-latest
29+
docker tag hyperledger-fabric.jfrog.io/fabric-javaenv:amd64-2.0.0-stable hyperledger/fabric-javaenv
3030
##########
3131
docker images | grep hyperledger/fabric-nodeenv || true
3232
source ./src/test/fabric_test_commitlevel.sh

src/test/pull_images.sh

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ set -o pipefail
44
echo "======== PULL DOCKER IMAGES ========"
55

66
##########################################################
7-
# Pull and Tag the fabric and fabric-ca images from Nexus
7+
# Pull and Tag the fabric and fabric-ca images from Artifactory
88
##########################################################
9-
echo "Fetching images from Nexus"
10-
NEXUS_URL=nexus3.hyperledger.org:10001
11-
ORG_NAME="hyperledger/fabric"
9+
echo "Fetching images from Artifactory"
10+
ARTIFACTORY_URL=hyperledger-fabric.jfrog.io
11+
ORG_NAME="hyperledger"
1212

1313
VERSION=2.0.0
1414
ARCH="amd64"
@@ -22,33 +22,33 @@ dockerTag() {
2222
for IMAGES in peer orderer ca ca orderer baseos ccenv javaenv nodeenv tools; do
2323
echo "Images: $IMAGES"
2424
echo
25-
docker pull $NEXUS_URL/$ORG_NAME-$IMAGES:$STABLE_TAG
25+
docker pull $ARTIFACTORY_URL/fabric-$IMAGES:$STABLE_TAG
2626
if [ $? != 0 ]; then
2727
echo "FAILED: Docker Pull Failed on $IMAGES"
2828
exit 1
2929
fi
30-
docker tag $NEXUS_URL/$ORG_NAME-$IMAGES:$STABLE_TAG $ORG_NAME-$IMAGES
31-
docker tag $NEXUS_URL/$ORG_NAME-$IMAGES:$STABLE_TAG $ORG_NAME-$IMAGES:$MASTER_TAG
32-
echo "$ORG_NAME-$IMAGES:$MASTER_TAG"
33-
echo "Deleting Nexus docker images: $IMAGES"
34-
docker rmi -f $NEXUS_URL/$ORG_NAME-$IMAGES:$STABLE_TAG
30+
docker tag $ARTIFACTORY_URL/fabric-$IMAGES:$STABLE_TAG $ORG_NAME/fabric-$IMAGES
31+
docker tag $ARTIFACTORY_URL/fabric-$IMAGES:$STABLE_TAG $ORG_NAME/fabric-$IMAGES:$MASTER_TAG
32+
echo "$ORG_NAME/fabric-$IMAGES:$MASTER_TAG"
33+
echo "Deleting Artifactory docker images: $IMAGES"
34+
docker rmi -f $ARTIFACTORY_URL/fabric-$IMAGES:$STABLE_TAG
3535
done
3636
}
3737

3838
dockerTag2() {
3939
for IMAGES in baseos ccenv javaenv nodeenv; do
4040
echo "Images: $IMAGES"
4141
echo
42-
docker pull $NEXUS_URL/$ORG_NAME-$IMAGES:$STABLE_TAG
42+
docker pull $ARTIFACTORY_URL/fabric-$IMAGES:$STABLE_TAG
4343
if [ $? != 0 ]; then
4444
echo "FAILED: Docker Pull Failed on $IMAGES"
4545
exit 1
4646
fi
47-
docker tag $NEXUS_URL/$ORG_NAME-$IMAGES:$STABLE_TAG $ORG_NAME-$IMAGES
48-
docker tag $NEXUS_URL/$ORG_NAME-$IMAGES:$STABLE_TAG $ORG_NAME-$IMAGES:$VERSION
47+
docker tag $ARTIFACTORY_URL/fabric-$IMAGES:$STABLE_TAG $ORG_NAME/fabric-$IMAGES
48+
docker tag $ARTIFACTORY_URL/fabric-$IMAGES:$STABLE_TAG $ORG_NAME/fabric-$IMAGES:$VERSION
4949
echo "$ORG_NAME-$IMAGES:$VERSION"
50-
echo "Deleting Nexus docker images: $IMAGES"
51-
docker rmi -f $NEXUS_URL/$ORG_NAME-$IMAGES:$STABLE_TAG
50+
echo "Deleting Artifactory docker images: $IMAGES"
51+
docker rmi -f $ARTIFACTORY_URL/fabric-$IMAGES:$STABLE_TAG
5252
done
5353
}
5454

0 commit comments

Comments
 (0)