Commit graph

24 commits

Author SHA1 Message Date
nikhil550
38e08da13b
Rm docker files mount for CLI container (#479)
Signed-off-by: Nikhil Gupta <ngupta@triplepointliquidity.com>

Co-authored-by: Nikhil Gupta <ngupta@triplepointliquidity.com>
Co-authored-by: Arnaud J Le Hors <lehors@us.ibm.com>
2021-09-07 14:22:26 +00:00
nao
b8edd6593f
Fix: logspec output (#470)
If ORDERER_KAFKA_VERBOSE is true, the output of /logspec will contain
the following kafka information even if it is raft orderer.
{"spec":"orderer.consensus.kafka.sarama=debug:info"}
This PR deletes environment valiable for kafka in docker-compose.

Signed-off-by: Nao Nishijima <nao.nishijima.xt@hitachi.com>
2021-09-03 08:09:51 +01:00
Arnaud J Le Hors
2b47c9f0c0
Update Compose Spec & VM Spec Version (#482)
Based on PR 449 by Brett Logan <lindluni@github.com>

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2021-09-02 10:26:14 +01:00
Tatsuya Sato
8890d49d19
Fix typo (#466)
Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
2021-08-02 13:33:25 -04:00
nao
31ef28e647
Support docker.sock in rootless mode (#447)
Docker version 20.10 support rootless mode. That features
changes a mount path of docker.sock.
This PR loads a mount path from DOCKER_HOST environment,
and if not set, a mount path will be /var/run/docker.sock

FAB-18481

Signed-off-by: Nao Nishijima <nao.nishijima.xt@hitachi.com>
2021-07-26 16:11:14 +02:00
Varad Ramamoorthy
5e933c10cb
expose operations port (#453)
Signed-off-by: Varad Ramamoorthy <varad@us.ibm.com>
2021-06-30 16:07:54 -04:00
denyeart
6ebf692ab8
Disable Go pprof profiling in test network (#444)
Peers and Orderers by default disable Go pprof profiling, however test
network was enabling pprof in peers by default. As a good practice,
pprof should be disabled by default and only enabled when needed
for debug profiling.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2021-04-30 11:57:30 +00:00
bblwbtd
15275a0d4d
Change docker compose file version (#421)
Signed-off-by: bblwbtd <gmyxgmyx@outlook.com>
2021-02-14 18:48:35 -05:00
Brett Logan
37513c3c2b Add Service Labels and Cleanup Using Standard Tools
Add a service label to all containers launch by compose.
This allows us to filter on the label for removing running
containers.

Use filtering for querying running containers and
images to make sure we only target the containers
and images we want to remove.

Signed-off-by: Brett Logan <lindluni@github.com>
2021-02-11 17:34:49 -05:00
Brett Logan
49bf79909d
Remove .env Files and Explicitly Name Network (#417)
There have been lots of changes and quirks with the
docker-compose .env file, this change removes the file
and explicitly creates and assigns the networks in the
compose yaml files.

Signed-off-by: Brett Logan <lindluni@github.com>
2021-02-10 21:38:35 -05:00
SamYuan1990
f67079584e try to fix CI error
Signed-off-by: SamYuan1990 <yy19902439@126.com>
2021-02-08 10:52:35 -05:00
Julian Castrence
aa7287e1e3 Update Test Network to Use osadmin
FAB-18369

Signed-off-by: Julian Castrence <juliancastrence@ibm.com>
2021-01-19 20:55:19 -05:00
Will Lahti
b690d8f30f
Stop using deprecated outputAnchorPeersUpdate in test-network (#394)
* Stop using deprecated outputAnchorPeersUpdate in test-network

FAB-18381

Signed-off-by: Will Lahti <wtlahti@us.ibm.com>

* Improve consistency of test-network output

Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
2021-01-07 13:22:03 -05:00
Brett Logan
df752bfc7b
Explicitly Mount the Docker Unix Socket (#397)
Instead of mounted the entire /var/run directory
explicitly mount the unix socket. Mounting the entire
directory causes issues with future versions of Docker
on some platforms.

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2021-01-04 13:47:57 -05:00
denyeart
e29ee4d7d9
Revert "Mount configuration files (#376)" (#380)
This reverts commit 0998528b3e.
2020-11-25 11:36:11 -05:00
nikhil550
0998528b3e
Mount configuration files (#376)
Signed-off-by: Nikhil Gupta <ngupta@symbridge.com>
2020-11-24 11:04:29 +01:00
David Enyeart
1794c026c9 Update CouchDB to 3.1.1
Update CouchDB in CI and test-network to 3.1.1.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2020-10-22 19:18:55 -04:00
denyeart
9291154f78
Remove gossip leader election config from samples (#223)
In Fabric v2.2, the gossip defaults are changed to make
peers org leaders instead of using leader election.
This change removes the config from the samples, so that
the samples simply inherit the new peer defaults.
This will simplify the sample configuration.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2020-07-02 15:37:15 -04:00
Brett Logan
8b54e14ee4 Use Official CouchDB 3.1 Image
Fabric 2.2 removes official support for CouchDB 2.x.
The migration to 3.1 was to address fsync issues
in the underlying storage implementation in Couch.

This change moves to CouchDB 3.1 which requires the
user to now set an admin identity at startup.

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-07-02 09:56:30 -04:00
NIKHIL E GUPTA
a576a27e1b Remove docker-compose-e2e file
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-05-07 11:59:49 -04:00
Brett Logan
e17574d28c
Add CA's to docker test network (#124)
The CA's are not part of the `test` docker network. So
applications written and hosted on the `test` network
cannot interact with the CA

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-03-20 14:24:56 +00:00
nikhil550
e204ebb3b2
Remove reference to 2.0 beta (#111)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-02-23 07:18:29 +01:00
nikhil550
b3b526728f FAB-17243 Add support for Fabric CA for Org3 on the (#91)
test network.

Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-01-16 22:32:12 +01:00
NIKHIL E GUPTA
5d58254280 [FAB-17145] Add test network to Fabric Samples
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2019-12-11 10:28:39 -05:00