Skip to content

Commit

Permalink
[FAB-4255] Fix "make release" failed
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
Nao Nishijima authored and christo4ferris committed Jun 10, 2017
1 parent 6188bbb commit 7e0b9a3
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 0 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ tags
.tags
.vagrant/
/build
/release/darwin-amd64
/release/linux-amd64
/release/linux-s390x
/release/linux-ppc64le
/release/windows-amd64
# Emacs backup files
*~
*#
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@ release/%/install: $(PROJECT_FILES)
| sed -e 's/_NS_/$(DOCKER_NS)/g' \
| sed -e 's/_ARCH_/$(DOCKER_ARCH)/g' \
| sed -e 's/_VERSION_/$(PROJECT_VERSION)/g' \
| sed -e 's/_BASE_DOCKER_TAG_/$(BASE_DOCKER_TAG)/g' \
> $@/get-docker-images.sh
@chmod +x $@/get-docker-images.sh

Expand Down
21 changes: 21 additions & 0 deletions release/templates/get-docker-images.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/bin/bash -eu

# This script pulls docker images from the Dockerhub hyperledger repositories

# set the default Docker namespace and tag
DOCKER_NS=_NS_
ARCH=_ARCH_
VERSION=_VERSION_
BASE_DOCKER_TAG=_BASE_DOCKER_TAG_

# set of Hyperledger Fabric images
FABRIC_IMAGES=(fabric-peer fabric-orderer fabric-ccenv fabric-javaenv fabric-kafka fabric-zookeeper \
fabric-couchdb fabric-tools)

for image in ${FABRIC_IMAGES[@]}; do
echo "Pulling ${DOCKER_NS}/$image:${ARCH}-${VERSION}"
docker pull ${DOCKER_NS}/$image:${ARCH}-${VERSION}
done

echo "Pulling ${DOCKER_NS}/fabric-baseos:${BASE_DOCKER_TAG}"
docker pull ${DOCKER_NS}/fabric-baseos:${BASE_DOCKER_TAG}

0 comments on commit 7e0b9a3

Please sign in to comment.