Skip to content

Commit 9d1da95

Browse files
committed
[FAB-3386] Remove fabric-testenv-orderer image
We need to make our examples/scripts work with production-level artifacts. The fabric-testenv-orderer image is not an artifact targeted for production. This abundance of options leads to user confusion (I've had folks ask me whether they need to use `fabric-testenv-orderer` to make Kafka work), and it also means we have yet another image we need to maintain. This changeset removes all references to the fabric-testenv-orderer Docker image. Change-Id: I19daa1a21b2ce15b299caa77ca1e59c7101cb553 Signed-off-by: Kostas Christidis <[email protected]>
1 parent db236d6 commit 9d1da95

File tree

7 files changed

+5
-67
lines changed

7 files changed

+5
-67
lines changed

bddtests/docker-compose-orderer-kafka.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ services:
1818
- zookeeper
1919

2020
orderer:
21-
image: hyperledger/fabric-testenv-orderer
21+
image: hyperledger/fabric-orderer
2222
restart: always
2323
environment:
2424
- ORDERER_GENERAL_LOGLEVEL=debug

bddtests/environments/orderer-1-kafka-1/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ services:
44
image: hyperledger/fabric-zookeeper
55

66
orderer0:
7-
image: hyperledger/fabric-testenv-orderer
7+
image: hyperledger/fabric-orderer
88
environment:
99
- ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
1010
- ORDERER_GENERAL_GENESISPROFILE=SampleInsecureKafka

bddtests/environments/orderer-1-kafka-3/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ services:
44
image: hyperledger/fabric-zookeeper
55

66
orderer0:
7-
image: hyperledger/fabric-testenv-orderer
7+
image: hyperledger/fabric-orderer
88
environment:
99
- ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
1010
- ORDERER_GENERAL_GENESISPROFILE=SampleInsecureKafka

bddtests/environments/orderer/Dockerfile

-8
This file was deleted.

bddtests/environments/orderer/docker-compose.yml

-10
This file was deleted.

bddtests/environments/orderer/docker-entrypoint.sh

-44
This file was deleted.

bddtests/orderer-3-kafka-1.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ services:
33
orderer1:
44
extends:
55
service: orderer0
6-
image: hyperledger/fabric-testenv-orderer
6+
image: hyperledger/fabric-orderer
77
environment:
88
- ORDERER_GENERAL_LOCALMSPID=${ORDERER1_ORDERER_GENERAL_LOCALMSPID}
99
- ORDERER_GENERAL_TLS_PRIVATEKEY=${ORDERER1_ORDERER_GENERAL_TLS_PRIVATEKEY}
@@ -16,7 +16,7 @@ services:
1616
orderer2:
1717
extends:
1818
service: orderer0
19-
image: hyperledger/fabric-testenv-orderer
19+
image: hyperledger/fabric-orderer
2020
environment:
2121
- ORDERER_GENERAL_LOCALMSPID=${ORDERER2_ORDERER_GENERAL_LOCALMSPID}
2222
- ORDERER_GENERAL_TLS_PRIVATEKEY=${ORDERER2_ORDERER_GENERAL_TLS_PRIVATEKEY}

0 commit comments

Comments
 (0)