Skip to content

Commit

Permalink
Change Download Location of Fabric Binaries (#143)
Browse files Browse the repository at this point in the history
The current scripts download the fabric binaries and place them
in `/usr/local`. Modifying the host system in CI is generally
bad practice. The `bootstrap.sh` script also downloads the
binaries into the root of the `fabric-samples` repo. It is
good practice for us to do the same in CI. We also have
several samples that make an assumption about the location
of these scripts. In the future we should re-evaluate these
examples.

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
  • Loading branch information
Brett Logan committed Mar 30, 2020
1 parent 1f283fc commit 59c6641
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@
vendor/
.vscode
.gradle
.idea
1 change: 1 addition & 0 deletions ci/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ trigger:

variables:
NODE_VER: '12.x'
PATH: $(Agent.BuildDirectory)/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin

jobs:
- job: fabcar_go
Expand Down
6 changes: 2 additions & 4 deletions ci/install-fabric.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@
steps:
- script: |
set -eo pipefail
wget -q -P /tmp https://hyperledger.jfrog.io/hyperledger/fabric-binaries/hyperledger-fabric-linux-amd64-latest.tar.gz
sudo tar xzvf /tmp/hyperledger-fabric-linux-amd64-latest.tar.gz -C /usr/local
curl -L --retry 5 --retry-delay 3 https://hyperledger.jfrog.io/hyperledger/fabric-binaries/hyperledger-fabric-linux-amd64-latest.tar.gz | tar xz
displayName: Download Fabric CLI
- script: |
set -eo pipefail
wget -q -P /tmp https://hyperledger.jfrog.io/hyperledger/fabric-binaries/hyperledger-fabric-ca-linux-amd64-latest.tar.gz
sudo tar xzvf /tmp/hyperledger-fabric-ca-linux-amd64-latest.tar.gz -C /usr/local
curl -L --retry 5 --retry-delay 3 https://hyperledger.jfrog.io/hyperledger/fabric-binaries/hyperledger-fabric-ca-linux-amd64-latest.tar.gz | tar xz
displayName: Download Fabric CA CLI
- script: bash ci/getDockerImages.sh
displayName: Pull Fabric Docker images

0 comments on commit 59c6641

Please sign in to comment.