diff --git a/packages/composer-website/installers/hlfv1/build.sh b/packages/composer-website/installers/hlfv1/build.sh index 05651661f3..8031f9f2d1 100755 --- a/packages/composer-website/installers/hlfv1/build.sh +++ b/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 diff --git a/packages/composer-website/installers/hlfv1/docker-compose-playground-unstable.yml b/packages/composer-website/installers/hlfv1/docker-compose-playground-unstable.yml deleted file mode 100644 index 8a21b7fc3e..0000000000 --- a/packages/composer-website/installers/hlfv1/docker-compose-playground-unstable.yml +++ /dev/null @@ -1,47 +0,0 @@ -version: '2' - -services: - - composer: - container_name: composer - image: hyperledger/composer-playground:unstable - ports: - - '8080:8080' - environment: - COMPOSER_CONFIG: > - { - "defaultConnectionProfile": "hlfabric", - "connectionProfiles": { - "hlfabric": { - "name": "hlfabric", - "description": "Hyperledger Fabric v1.0", - "type": "hlfv1", - "keyValStore": "/home/composer/.hfc-key-store", - "timeout": 300, - "orderers": [ - { - "url": "grpc://orderer.example.com:7050" - } - ], - "channel": "mychannel", - "mspID": "Org1MSP", - "ca": {"url": "http://ca.example.com:7054", "name": "ca.example.com"}, - "peers": [ - { - "requestURL": "grpc://peer0.org1.example.com:7051", - "eventURL": "grpc://peer0.org1.example.com:7053" - } - ] - } - }, - "credentials": { - "hlfabric": { - "PeerAdmin": "NOTUSED", - "admin": "adminpw" - } - } - } -networks: - default: - external: - name: composer_default diff --git a/packages/composer-website/installers/hlfv1/install-unstable.sh b/packages/composer-website/installers/hlfv1/install-unstable.sh index 5495a756ef..e3e4e6daff 100644 Binary files a/packages/composer-website/installers/hlfv1/install-unstable.sh and b/packages/composer-website/installers/hlfv1/install-unstable.sh differ diff --git a/packages/composer-website/installers/hlfv1/install.sh.in b/packages/composer-website/installers/hlfv1/install.sh.in index 72fc245ee7..25b359bf55 100755 --- a/packages/composer-website/installers/hlfv1/install.sh.in +++ b/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 diff --git a/packages/composer-website/jekylldocs/install-hlfv1-unstable.sh b/packages/composer-website/jekylldocs/install-hlfv1-unstable.sh index 5495a756ef..e3e4e6daff 100644 Binary files a/packages/composer-website/jekylldocs/install-hlfv1-unstable.sh and b/packages/composer-website/jekylldocs/install-hlfv1-unstable.sh differ diff --git a/packages/composer-website/jekylldocs/install-hlfv1.sh b/packages/composer-website/jekylldocs/install-hlfv1.sh index 51adb196a7..873c98b3b0 100755 Binary files a/packages/composer-website/jekylldocs/install-hlfv1.sh and b/packages/composer-website/jekylldocs/install-hlfv1.sh differ