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

Commit 6565522

Browse files
Pull Fabric release images from DockerHub (#666)
This SDK targets release versions of Fabric v2.2 so there is no need to pull development images of Fabric from Artifactory. Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>
1 parent aaf1f35 commit 6565522

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

scripts/utility/fabric_images.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
#
77
set -euo pipefail
88

9-
version=${FABRIC_VERSION:-2.2}
10-
artifactory_url=hyperledger-fabric.jfrog.io
9+
FABRIC_VERSION=${FABRIC_VERSION:-2.2}
10+
COUCHDB_VERSION=${COUCHDB_VERSION:-3.2}
11+
CA_VERSION=${CA_VERSION:-1.5}
1112

1213
for image in peer orderer ccenv baseos nodeenv javaenv tools; do
13-
artifactory_image="${artifactory_url}/fabric-${image}:amd64-${version}-stable"
14-
docker pull -q "${artifactory_image}"
15-
docker tag "${artifactory_image}" "hyperledger/fabric-${image}"
16-
docker rmi -f "${artifactory_image}" >/dev/null
14+
docker pull -q "hyperledger/fabric-${image}:${FABRIC_VERSION}"
15+
docker tag "hyperledger/fabric-${image}:${FABRIC_VERSION}" "hyperledger/fabric-${image}"
1716
done
1817

19-
docker pull -q couchdb:3.1
20-
docker pull -q hyperledger/fabric-ca:1.4
21-
docker tag hyperledger/fabric-ca:1.4 hyperledger/fabric-ca
22-
docker rmi hyperledger/fabric-ca:1.4 >/dev/null
18+
docker pull -q "couchdb:${COUCHDB_VERSION}"
19+
docker tag "couchdb:${COUCHDB_VERSION}" couchdb
20+
21+
docker pull -q "hyperledger/fabric-ca:${CA_VERSION}"
22+
docker tag "hyperledger/fabric-ca:${CA_VERSION}" hyperledger/fabric-ca

test/fixtures/docker-compose/docker-compose-base.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ services:
110110

111111
couchdb:
112112
container_name: couchdb
113-
image: couchdb:3.1
113+
image: couchdb
114114
environment:
115115
- COUCHDB_USER=admin
116116
- COUCHDB_PASSWORD=adminpw

test/ts-fixtures/docker-compose/docker-compose-base.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ services:
150150

151151
couchdb:
152152
container_name: couchdb
153-
image: couchdb:3.1
153+
image: couchdb
154154
environment:
155155
- COUCHDB_USER=admin
156156
- COUCHDB_PASSWORD=adminpw

0 commit comments

Comments
 (0)