Skip to content

Commit 7e0b9a3

Browse files
Nao Nishijimachristo4ferris
Nao Nishijima
authored andcommitted
[FAB-4255] Fix "make release" failed
It seems like that required file related to "release/%/install" target in Makefile was deleted by FAB-4109. restore template, update Makefile, add .gitignore remove whitespace Change-Id: Ibec1ad9a2d788396fd03aa82058fb9868e28df8f Signed-off-by: Nao Nishijima <[email protected]> Signed-off-by: Christopher Ferris <[email protected]>
1 parent 6188bbb commit 7e0b9a3

File tree

3 files changed

+27
-0
lines changed

3 files changed

+27
-0
lines changed

.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ tags
1010
.tags
1111
.vagrant/
1212
/build
13+
/release/darwin-amd64
14+
/release/linux-amd64
15+
/release/linux-s390x
16+
/release/linux-ppc64le
17+
/release/windows-amd64
1318
# Emacs backup files
1419
*~
1520
*#

Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,7 @@ release/%/install: $(PROJECT_FILES)
349349
| sed -e 's/_NS_/$(DOCKER_NS)/g' \
350350
| sed -e 's/_ARCH_/$(DOCKER_ARCH)/g' \
351351
| sed -e 's/_VERSION_/$(PROJECT_VERSION)/g' \
352+
| sed -e 's/_BASE_DOCKER_TAG_/$(BASE_DOCKER_TAG)/g' \
352353
> $@/get-docker-images.sh
353354
@chmod +x $@/get-docker-images.sh
354355

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/bin/bash -eu
2+
3+
# This script pulls docker images from the Dockerhub hyperledger repositories
4+
5+
# set the default Docker namespace and tag
6+
DOCKER_NS=_NS_
7+
ARCH=_ARCH_
8+
VERSION=_VERSION_
9+
BASE_DOCKER_TAG=_BASE_DOCKER_TAG_
10+
11+
# set of Hyperledger Fabric images
12+
FABRIC_IMAGES=(fabric-peer fabric-orderer fabric-ccenv fabric-javaenv fabric-kafka fabric-zookeeper \
13+
fabric-couchdb fabric-tools)
14+
15+
for image in ${FABRIC_IMAGES[@]}; do
16+
echo "Pulling ${DOCKER_NS}/$image:${ARCH}-${VERSION}"
17+
docker pull ${DOCKER_NS}/$image:${ARCH}-${VERSION}
18+
done
19+
20+
echo "Pulling ${DOCKER_NS}/fabric-baseos:${BASE_DOCKER_TAG}"
21+
docker pull ${DOCKER_NS}/fabric-baseos:${BASE_DOCKER_TAG}

0 commit comments

Comments
 (0)