Skip to content

Commit 9cf1e6a

Browse files
Brett Loganmbwhite
Brett Logan
authored and
mbwhite
committed
[FABCI-482] Update Nexus URL's to Artifactory
Signed-off-by: Brett Logan <[email protected]>
1 parent 7ab7145 commit 9cf1e6a

File tree

5 files changed

+23
-58
lines changed

5 files changed

+23
-58
lines changed

‎ci/azure-pipelines.yml‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ variables:
3838
value: fabric-chaincode-java
3939
- name: pipeline
4040
value: ci
41-
- name: NEXUS_REPO_URL
42-
value: nexus3.hyperledger.org:10003
4341
- name: PUSH_VERSION
4442
value: stable
4543

@@ -143,37 +141,6 @@ stages:
143141
git push https://$(GITHUB-PAT)@github.com/hyperledger/fabric-chaincode-java.git gh-pages
144142
displayName: 'Commit gh-pages changes'
145143
146-
# Publish the snapshot images etc.
147-
# Original source of these is https://github.com/hyperledger/ci-management/blob/master/jjb/fabric-chaincode-java/shell/include-raw-publish-docker-jar.sh
148-
- job: snapshot_publish
149-
dependsOn: main
150-
condition: and(succeeded(),eq(variables['Build.Reason'], 'IndividualCI'))
151-
variables:
152-
PACKAGE_VERSION: $[ dependencies.main.outputs['BuildData.PACKAGE_VERSION'] ]
153-
steps:
154-
- task: DownloadPipelineArtifact@2
155-
inputs:
156-
artifact: javaenv-docker-image
157-
path: $(Build.SourcesDirectory)/build
158-
- script: |
159-
docker image load --input build/fabric-javaenv.tar.gz
160-
docker images
161-
# Publish docker images to nexus repository
162-
docker login ${DOCKER_REGISTRY_URL} --username=${DOCKER_REGISTRY_USERNAME} --password=${DOCKER_REGISTRY_PASSWORD}
163-
echo "Logged in to docker registry"
164-
# tag javaenv image to $PUSH_VERSION
165-
docker tag hyperledger/fabric-javaenv ${DOCKER_REGISTRY_URL}/fabric-javaenv:amd64-${MAPPED_VERSION}-beta
166-
docker tag hyperledger/fabric-javaenv ${DOCKER_REGISTRY_URL}/fabric-javaenv:amd64-beta
167-
# push javaenv to nexus repository
168-
docker push ${DOCKER_REGISTRY_URL}/fabric-javaenv:amd64-${MAPPED_VERSION}-beta
169-
docker push ${DOCKER_REGISTRY_URL}/fabric-javaenv:amd64-beta
170-
env:
171-
DOCKER_REGISTRY_USERNAME: $(nexus-user)
172-
DOCKER_REGISTRY_PASSWORD: $(nexus-password)
173-
DOCKER_REGISTRY_URL: nexus3.hyperledger.org:10003/hyperledger
174-
MAPPED_VERSION: $(PACKAGE_VERSION)
175-
displayName: 'docker push to nexus'
176-
177144
# As the next script is more complex and uses loops, run this descretely in a sh file
178145
# Publishing step for git tags
179146
- stage: Publish_tag
@@ -196,7 +163,6 @@ stages:
196163
197164
docker image load --input build/fabric-javaenv.tar.gz
198165
docker images
199-
# Publish docker images to nexus repository
200166
docker login ${DOCKER_REGISTRY_URL} --username=${DOCKER_REGISTRY_USERNAME} --password=${DOCKER_REGISTRY_PASSWORD}
201167
echo "Logged in to docker registry"
202168
# tag javaenv image to PACKAGE_VERSION

‎examples/fabric-contract-example-gradle-kotlin/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ repositories {
3535
setUrl("https://jitpack.io")
3636
}
3737
maven {
38-
setUrl("https://nexus.hyperledger.org/content/repositories/snapshots/")
38+
setUrl("https://hyperledger.jfrog.io/hyperledger/fabric-maven")
3939
}
4040
}
4141

‎examples/fabric-contract-example-gradle/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ repositories {
1414
url "https://www.jitpack.io"
1515
}
1616
maven {
17-
url "https://nexus.hyperledger.org/content/repositories/snapshots/"
17+
url "https://hyperledger.jfrog.io/hyperledger/fabric-maven"
1818
}
1919

2020
}

‎examples/fabric-contract-example-maven/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<url>https://www.jitpack.io</url>
3131
</repository>
3232
<repository>
33-
<id>nexus</id>
34-
<url>https://nexus.hyperledger.org/content/repositories/snapshots/</url>
33+
<id>artifactory</id>
34+
<url>https://hyperledger.jfrog.io/hyperledger/fabric-maven</url>
3535
</repository>
3636
</repositories>
3737

‎fabric-chaincode-integration-test/getDockerImages.sh‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
#!/bin/bash -e
2-
set -o pipefail
2+
set -euo pipefail
33

44
echo "======== PULL DOCKER IMAGES ========"
55

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

1413
VERSION=2.0.0
1514
ARCH="amd64"
@@ -20,25 +19,25 @@ MASTER_TAG=$ARCH-master
2019
echo "---------> STABLE_VERSION:" $STABLE_VERSION
2120

2221
dockerTag() {
23-
for IMAGES in peer orderer ca tools orderer ccenv; do
24-
echo "Images: $IMAGES"
22+
for IMAGE in peer orderer ca tools orderer ccenv; do
23+
echo "Images: $IMAGE"
2524
echo
26-
docker pull $NEXUS_URL/$ORG_NAME-$IMAGES:$STABLE_TAG
27-
if [ $? != 0 ]; then
28-
echo "FAILED: Docker Pull Failed on $IMAGES"
25+
docker pull $ARTIFACTORY_URL/fabric-$IMAGE:$STABLE_TAG
26+
if [[ $? != 0 ]]; then
27+
echo "FAILED: Docker Pull Failed on $IMAGE"
2928
exit 1
3029
fi
31-
docker tag $NEXUS_URL/$ORG_NAME-$IMAGES:$STABLE_TAG $ORG_NAME-$IMAGES
32-
docker tag $NEXUS_URL/$ORG_NAME-$IMAGES:$STABLE_TAG $ORG_NAME-$IMAGES:$MASTER_TAG
33-
docker tag $NEXUS_URL/$ORG_NAME-$IMAGES:$STABLE_TAG $ORG_NAME-$IMAGES:$VERSION
34-
echo "$ORG_NAME-$IMAGES:$MASTER_TAG"
35-
echo "Deleting Nexus docker images: $IMAGES"
36-
docker rmi -f $NEXUS_URL/$ORG_NAME-$IMAGES:$STABLE_TAG
30+
docker tag $ARTIFACTORY_URL/fabric-$IMAGE:$STABLE_TAG $ORG_NAME/fabric-$IMAGE
31+
docker tag $ARTIFACTORY_URL/fabric-$IMAGE:$STABLE_TAG $ORG_NAME/fabric-$IMAGE:$MASTER_TAG
32+
docker tag $ARTIFACTORY_URL/fabric-$IMAGE:$STABLE_TAG $ORG_NAME/fabric-$IMAGE:$VERSION
33+
echo "$ORG_NAME-$IMAGE:$MASTER_TAG"
34+
echo "Deleting Artifactory docker images: $IMAGE"
35+
docker rmi -f $ARTIFACTORY_URL/fabric-$IMAGE:$STABLE_TAG
3736
done
3837
}
3938

4039
dockerTag
4140

4241
echo
4342
docker images | grep "hyperledger*"
44-
echo
43+
echo

0 commit comments

Comments
 (0)