Defect 1334

packages/composer-website/installers/hlfv1/build.sh

@@ -3,10 +3,12 @@ set -ev
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd "${DIR}"
 
-cat install.sh.in | sed 's/{{ENV}}//g' > install.sh
+# build the latest version of the installer - note the 0.8.0
+cat install.sh.in | sed 's/{{ENV}}//g' | sed 's/{{ENV_VER}}/0.8.0/g' > install.sh
 echo "PAYLOAD:" >> install.sh
 tar czf - docker-compose-playground.yml fabric-dev-servers mychannel.tx twoorgs.genesis.block >> install.sh
 
-cat install.sh.in | sed 's/{{ENV}}/-unstable/g' > install-unstable.sh
+# build the unstable installer
+cat install.sh.in | sed 's/{{ENV}}/-unstable/g' | sed 's/{{ENV_VER}}/unstable/g' > install-unstable.sh
 echo "PAYLOAD:" >> install-unstable.sh
-tar czf - docker-compose-playground-unstable.yml fabric-dev-servers mychannel.tx twoorgs.genesis.block >> install-unstable.sh
+tar czf - docker-compose-playground.yml fabric-dev-servers mychannel.tx twoorgs.genesis.block >> install-unstable.sh

packages/composer-website/installers/hlfv1/install.sh.in

@@ -59,8 +59,13 @@ stop
 ./fabric-dev-servers/startFabric.sh
 ./fabric-dev-servers/createComposerProfile.sh
 
+# pull and tage the correct image for the installer
+docker pull hyperledger/composer-playground:{{ENV_VER}}
+docker tag hyperledger/composer-playground:{{ENV_VER}} hyperledger/composer-playground:latest
+
+
 # Start all composer
-docker-compose -p composer -f docker-compose-playground{{ENV}}.yml up -d
+docker-compose -p composer -f docker-compose-playground.yml up -d
 # copy over pre-imported admin credentials
 cd fabric-dev-servers/fabric-scripts/hlfv1/composer/creds
 docker exec composer mkdir /home/composer/.hfc-key-store