Skip to content

Commit df84d9a

Browse files
author
Jason Clark
committed
Add javaenv to pull_build_artifacts.sh
Change-Id: I85e3f91f5074d2941d6cde4d96afd275ee78c8e8 Signed-off-by: Jason Clark <jtclark@linux.vnet.ibm.com>
1 parent 33f003b commit df84d9a

File tree

1 file changed

+79
-65
lines changed

1 file changed

+79
-65
lines changed

scripts/pull_build_artifacts.sh

Lines changed: 79 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,28 @@
66
#
77

88
############################################
9-
# Pull "1.2.1-stable" docker images from nexus3
10-
# Tag it as $ARCH-$BASE_VERSION (1.2.1)
11-
# Push tagged images to hyperledger dockerhub
9+
# Pull "1.3.0-stable" docker images from nexus3
10+
# Tag it as $ARCH-$BASE_VERSION (1.3.0)
1211
#############################################
1312

1413
export ORG_NAME=hyperledger/fabric
1514
export NEXUS_URL=nexus3.hyperledger.org:10001
16-
export STABLE_VERSION=${STABLE_VERSION:-1.2.1-stable}
17-
export BASE_VERSION=${BASE_VERSION:-1.2.1}
15+
export STABLE_VERSION=${STABLE_VERSION:-1.3.0-stable}
16+
export BASE_VERSION=${BASE_VERSION:-1.3.0}
1817
export IMAGES_LIST=(peer orderer ccenv tools)
19-
export CA_IMAGES_LIST=(ca)
18+
export CA_IMAGES_LIST=(ca ca-peer ca-orderer ca-tools)
19+
export JAVAENV_IMAGES_LIST=(javaenv)
2020
export THIRDPARTY_IMAGES_LIST=(kafka couchdb zookeeper)
2121

2222
ARCH=$(go env GOARCH)
2323
if [ "$ARCH" = "amd64" ]; then
2424
ARCH=amd64
2525
else
26-
ARCH=$(uname -m)
26+
ARCH=$(uname -m)
2727
fi
2828

2929
printHelp() {
30-
echo "Usage: STABLE_VERSION=1.2.1-stable BASE_VERSION=1.2.1 ./scripts/pull_Build_Artifacts.sh --pull_Fabric_Images"
30+
echo "Usage: STABLE_VERSION=1.3.0-stable BASE_VERSION=1.3.0 ./scripts/pull_Build_Artifacts.sh --pull_Fabric_Images"
3131
echo
3232
echo "pull_All - pull fabric, fabric-ca and thirdparty images"
3333
echo "pull_Fabric_Images_All_Platforms - pull fabric images amd64, s390x"
@@ -36,94 +36,105 @@ printHelp() {
3636
echo "pull_Fabric_Binaries - pull fabric binaries on current arch"
3737
echo "pull_Thirdparty_Images - pull fabric thirdparty docker images on current arch"
3838
echo "pull_Ca_Images - pull fabric ca docker images on current arch"
39+
echo "pull_Java_Images - pull javaenv docker images on current arch (only on master branch)"
3940
echo
4041
# STABLE_VERSION - Image will be pulled from Nexus3
4142
# BASE_VERSION - Tag it as BASE_VERSION in Makefile
42-
echo "e.g. STABLE_VERSION=1.2.1-stable BASE_VERSION=1.2.1 ./scripts/pull_build_artifacts.sh --pull_Fabric_Images"
43-
echo "e.g. STABLE_VERSION=1.2.1-stable BASE_VERSION=1.2.1 ./scripts/pull_build_artifacts.sh --pull_Ca_Images"
43+
echo "e.g. STABLE_VERSION=1.3.0-stable BASE_VERSION=1.3.0 ./scripts/pull_build_artifacts.sh --pull_Fabric_Images"
44+
echo "e.g. STABLE_VERSION=1.3.0-stable BASE_VERSION=1.3.0 ./scripts/pull_build_artifacts.sh --pull_Ca_Images"
4445

4546
}
4647

4748
cleanup() {
48-
# Cleanup docker images
49-
make clean || true
50-
docker images -q | xargs docker rmi -f || true
49+
# Cleanup docker images
50+
make clean || true
51+
docker images -q | xargs docker rmi -f || true
5152
}
5253

5354
# pull fabric, fabric-ca and thirdparty images, and binaries
5455
pull_All() {
55-
56-
echo "-------> pull thirdparty docker images"
57-
pull_Thirdparty_Images
58-
echo "-------> pull binaries"
59-
pull_Fabric_Binaries
60-
echo "-------> pull fabric docker images"
61-
pull_Fabric_Images
62-
echo "-------> pull fabric ca docker images"
63-
pull_Ca_Images
56+
echo "-------> pull thirdparty docker images"
57+
pull_Thirdparty_Images
58+
echo "-------> pull binaries"
59+
pull_Fabric_Binaries
60+
echo "-------> pull fabric docker images"
61+
pull_Fabric_Images
62+
echo "-------> pull fabric ca docker images"
63+
pull_Ca_Images
64+
echo "-------> pull javaenv images"
65+
pull_Java_Images
6466
}
6567

6668
# pull fabric docker images
6769
pull_Fabric_Images() {
68-
for IMAGES in ${IMAGES_LIST[*]}; do
69-
docker pull $NEXUS_URL/$ORG_NAME-$IMAGES:$ARCH-$STABLE_VERSION
70-
docker tag $NEXUS_URL/$ORG_NAME-$IMAGES:$ARCH-$STABLE_VERSION $ORG_NAME-$IMAGES:$ARCH-$BASE_VERSION
71-
docker tag $NEXUS_URL/$ORG_NAME-$IMAGES:$ARCH-$STABLE_VERSION $ORG_NAME-$IMAGES
72-
docker rmi -f $NEXUS_URL/$ORG_NAME-$IMAGES:$ARCH-$STABLE_VERSION
73-
done
70+
for IMAGE in ${IMAGES_LIST[*]}; do
71+
docker pull $NEXUS_URL/$ORG_NAME-$IMAGE:$ARCH-$STABLE_VERSION
72+
docker tag $NEXUS_URL/$ORG_NAME-$IMAGE:$ARCH-$STABLE_VERSION $ORG_NAME-$IMAGE:$ARCH-$BASE_VERSION
73+
docker tag $NEXUS_URL/$ORG_NAME-$IMAGE:$ARCH-$STABLE_VERSION $ORG_NAME-$IMAGE
74+
docker rmi -f $NEXUS_URL/$ORG_NAME-$IMAGE:$ARCH-$STABLE_VERSION
75+
done
7476
}
7577

7678
# pull fabric binaries
7779
pull_Fabric_Binaries() {
78-
export MARCH=$(echo "$(uname -s|tr '[:upper:]' '[:lower:]'|sed 's/mingw64_nt.*/windows/')-$(uname -m | sed 's/x86_64/amd64/g')" | awk '{print tolower($0)}')
79-
echo "-------> MARCH:" $MARCH
80-
echo "-------> pull stable binaries for all platforms (x and z)"
81-
MVN_METADATA=$(echo "https://nexus.hyperledger.org/content/repositories/releases/org/hyperledger/fabric/hyperledger-fabric-$STABLE_VERSION/maven-metadata.xml")
82-
curl -L "$MVN_METADATA" > maven-metadata.xml
83-
RELEASE_TAG=$(cat maven-metadata.xml | grep release)
84-
COMMIT=$(echo $RELEASE_TAG | awk -F - '{ print $4 }' | cut -d "<" -f1)
85-
echo "-------> COMMIT:" $COMMIT
86-
curl https://nexus.hyperledger.org/content/repositories/releases/org/hyperledger/fabric/hyperledger-fabric-$STABLE_VERSION/$MARCH.$STABLE_VERSION-$COMMIT/hyperledger-fabric-$STABLE_VERSION-$MARCH.$STABLE_VERSION-$COMMIT.tar.gz | tar xz
87-
if [ $? != 0 ]; then
88-
echo "-------> FAILED to pull fabric binaries"
89-
exit 1
90-
fi
80+
export MARCH=$(echo "$(uname -s|tr '[:upper:]' '[:lower:]'|sed 's/mingw64_nt.*/windows/')-$(uname -m | sed 's/x86_64/amd64/g')" | awk '{print tolower($0)}')
81+
echo "-------> MARCH:" $MARCH
82+
echo "-------> pull stable binaries for all platforms (x and z)"
83+
MVN_METADATA=$(echo "https://nexus.hyperledger.org/content/repositories/releases/org/hyperledger/fabric/hyperledger-fabric-$STABLE_VERSION/maven-metadata.xml")
84+
curl -L "$MVN_METADATA" > maven-metadata.xml
85+
RELEASE_TAG=$(cat maven-metadata.xml | grep release)
86+
COMMIT=$(echo $RELEASE_TAG | awk -F - '{ print $4 }' | cut -d "<" -f1)
87+
echo "-------> COMMIT:" $COMMIT
88+
curl https://nexus.hyperledger.org/content/repositories/releases/org/hyperledger/fabric/hyperledger-fabric-$STABLE_VERSION/$MARCH.$STABLE_VERSION-$COMMIT/hyperledger-fabric-$STABLE_VERSION-$MARCH.$STABLE_VERSION-$COMMIT.tar.gz | tar xz
89+
if [ $? != 0 ]; then
90+
echo "-------> FAILED to pull fabric binaries"
91+
exit 1
92+
fi
9193
}
9294

9395
# pull fabric docker images from amd64 and s390x platforms
9496
pull_Fabric_Images_All_Platforms() {
95-
96-
# pull stable images from nexus and tag to hyperledger
97-
echo "-------> pull docker images for all platforms (x, z)"
98-
for arch in amd64 s390x; do
99-
for IMAGES in ${IMAGES_LIST[*]}; do
100-
docker pull $NEXUS_URL/$ORG_NAME-$IMAGES:$arch-$STABLE_VERSION
101-
docker tag $NEXUS_URL/$ORG_NAME-$IMAGES:$arch-$STABLE_VERSION $ORG_NAME-$IMAGES:$arch-$BASE_VERSION
102-
docker rmi -f $NEXUS_URL/$ORG_NAME-$IMAGES:$arch-$STABLE_VERSION
103-
done
104-
done
97+
# pull stable images from nexus and tag to hyperledger
98+
echo "-------> pull docker images for all platforms (x, z)"
99+
for arch in amd64 s390x; do
100+
for IMAGE in ${IMAGES_LIST[*]}; do
101+
docker pull $NEXUS_URL/$ORG_NAME-$IMAGE:$arch-$STABLE_VERSION
102+
docker tag $NEXUS_URL/$ORG_NAME-$IMAGE:$arch-$STABLE_VERSION $ORG_NAME-$IMAGE:$arch-$BASE_VERSION
103+
docker rmi -f $NEXUS_URL/$ORG_NAME-$IMAGE:$arch-$STABLE_VERSION
104+
done
105+
done
105106
}
106107

107108
# pull thirdparty docker images from nexus
108109
pull_Thirdparty_Images() {
109-
echo "------> pull thirdparty docker images from nexus"
110-
BASEIMAGE_VERSION=$(curl --silent https://raw.githubusercontent.com/hyperledger/fabric/master/Makefile 2>&1 | tee Makefile | grep "BASEIMAGE_RELEASE=" | cut -d "=" -f2)
111-
for IMAGES in ${THIRDPARTY_IMAGES_LIST[*]}; do
112-
docker pull $NEXUS_URL/$ORG_NAME-$IMAGES:$ARCH-$BASEIMAGE_VERSION
113-
docker tag $NEXUS_URL/$ORG_NAME-$IMAGES:$ARCH-$BASEIMAGE_VERSION $ORG_NAME-$IMAGES
114-
docker tag $NEXUS_URL/$ORG_NAME-$IMAGES:$ARCH-$BASEIMAGE_VERSION $ORG_NAME-$IMAGES:$ARCH-$BASEIMAGE_VERSION
115-
docker rmi -f $NEXUS_URL/$ORG_NAME-$IMAGES:$ARCH-$BASEIMAGE_VERSION
116-
done
110+
echo "------> pull thirdparty docker images from nexus"
111+
BASEIMAGE_VERSION=$(curl --silent https://raw.githubusercontent.com/hyperledger/fabric/master/Makefile 2>&1 | tee Makefile | grep "BASEIMAGE_RELEASE=" | cut -d "=" -f2)
112+
for IMAGE in ${THIRDPARTY_IMAGES_LIST[*]}; do
113+
docker pull $NEXUS_URL/$ORG_NAME-$IMAGE:$ARCH-$BASEIMAGE_VERSION
114+
docker tag $NEXUS_URL/$ORG_NAME-$IMAGE:$ARCH-$BASEIMAGE_VERSION $ORG_NAME-$IMAGE
115+
docker tag $NEXUS_URL/$ORG_NAME-$IMAGE:$ARCH-$BASEIMAGE_VERSION $ORG_NAME-$IMAGE:$ARCH-$BASEIMAGE_VERSION
116+
docker rmi -f $NEXUS_URL/$ORG_NAME-$IMAGE:$ARCH-$BASEIMAGE_VERSION
117+
done
117118
}
118119

119120
# pull fabric-ca docker images
120121
pull_Ca_Images() {
121-
for IMAGES in ${CA_IMAGES_LIST[*]}; do
122-
docker pull $NEXUS_URL/$ORG_NAME-$IMAGES:$ARCH-$STABLE_VERSION
123-
docker tag $NEXUS_URL/$ORG_NAME-$IMAGES:$ARCH-$STABLE_VERSION $ORG_NAME-$IMAGES:$ARCH-$BASE_VERSION
124-
docker tag $NEXUS_URL/$ORG_NAME-$IMAGES:$ARCH-$STABLE_VERSION $ORG_NAME-$IMAGES
125-
docker rmi -f $NEXUS_URL/$ORG_NAME-$IMAGES:$ARCH-$STABLE_VERSION
126-
done
122+
for IMAGE in ${CA_IMAGES_LIST[*]}; do
123+
docker pull $NEXUS_URL/$ORG_NAME-$IMAGE:$ARCH-$STABLE_VERSION
124+
docker tag $NEXUS_URL/$ORG_NAME-$IMAGE:$ARCH-$STABLE_VERSION $ORG_NAME-$IMAGE:$ARCH-$BASE_VERSION
125+
docker tag $NEXUS_URL/$ORG_NAME-$IMAGE:$ARCH-$STABLE_VERSION $ORG_NAME-$IMAGE
126+
docker rmi -f $NEXUS_URL/$ORG_NAME-$IMAGE:$ARCH-$STABLE_VERSION
127+
done
128+
}
129+
130+
# pull javaenv docker images
131+
pull_Java_Images () {
132+
for IMAGE in ${JAVAENV_IMAGES_LIST[*]}; do
133+
docker pull $NEXUS_URL/$ORG_NAME-$IMAGE:$ARCH-$STABLE_VERSION
134+
docker tag $NEXUS_URL/$ORG_NAME-$IMAGE:$ARCH-$STABLE_VERSION $ORG_NAME-$IMAGE:$ARCH-$BASE_VERSION
135+
docker tag $NEXUS_URL/$ORG_NAME-$IMAGE:$ARCH-$STABLE_VERSION $ORG_NAME-$IMAGE
136+
docker rmi -f $NEXUS_URL/$ORG_NAME-$IMAGE:$ARCH-$STABLE_VERSION
137+
done
127138
}
128139

129140
Parse_Arguments() {
@@ -150,6 +161,9 @@ Parse_Arguments() {
150161
--pull_Ca_Images)
151162
pull_Ca_Images
152163
;;
164+
--pull_Java_Images)
165+
pull_Java_Images
166+
;;
153167
--printHelp)
154168
printHelp
155169
;;

0 commit comments

Comments
 (0)