Merge "[FAB-15351] Retire fab-zookeeper and fab-kafka"

Makefile

@@ -48,7 +48,10 @@ PREV_VERSION = 2.0.0-alpha
 BASEIMAGE_RELEASE = 0.4.16
 
 # 3rd party image version
+# These versions are also set in the runners in ./integration/runners/
 COUCHDB_VER ?= 2.3
+KAFKA_VER ?= 5.3.1
+ZOOKEEPER_VER ?= 5.3.1
 
 # Disable implicit rules
 .SUFFIXES:
@@ -153,10 +156,8 @@ unit-tests: unit-test
 .PHONY: docker-thirdparty
 docker-thirdparty:
 	docker pull couchdb:${COUCHDB_VER}
-	docker pull $(BASE_DOCKER_NS)/fabric-zookeeper:$(BASE_DOCKER_TAG)
-	docker tag $(BASE_DOCKER_NS)/fabric-zookeeper:$(BASE_DOCKER_TAG) $(DOCKER_NS)/fabric-zookeeper
-	docker pull $(BASE_DOCKER_NS)/fabric-kafka:$(BASE_DOCKER_TAG)
-	docker tag $(BASE_DOCKER_NS)/fabric-kafka:$(BASE_DOCKER_TAG) $(DOCKER_NS)/fabric-kafka
+	docker pull confluentinc/cp-zookeeper:${ZOOKEEPER_VER}
+	docker pull confluentinc/cp-kafka:${KAFKA_VER}
 	docker pull hyperledger/fabric-ccenv:1.4
 
 .PHONY: verify

integration/runner/kafka.go

@@ -21,7 +21,7 @@ import (
 	"github.com/tedsuo/ifrit"
 )
 
-const KafkaDefaultImage = "hyperledger/fabric-kafka:latest"
+const KafkaDefaultImage = "confluentinc/cp-kafka:5.3.1"
 
 // Kafka manages the execution of an instance of a dockerized CouchDB
 // for tests.

integration/runner/zookeeper.go

@@ -20,7 +20,7 @@ import (
 	"github.com/tedsuo/ifrit"
 )
 
-const ZooKeeperDefaultImage = "hyperledger/fabric-zookeeper:latest"
+const ZooKeeperDefaultImage = "confluentinc/cp-zookeeper:5.3.1"
 
 type ZooKeeper struct {
 	Client         *docker.Client
@@ -104,8 +104,9 @@ func (z *ZooKeeper) Run(sigCh <-chan os.Signal, ready chan<- struct{}) error {
 		Config: &docker.Config{
 			Image: z.Image,
 			Env: []string{
-				fmt.Sprintf("ZOO_MY_ID=%d", z.ZooMyID),
-				fmt.Sprintf("ZOO_SERVERS=%s", z.ZooServers),
+				fmt.Sprintf("ZOOKEEPER_MY_ID=%d", z.ZooMyID),
+				fmt.Sprintf("ZOOKEEPER_SERVERS=%s", z.ZooServers),
+				fmt.Sprintf("ZOOKEEPER_CLIENT_PORT=%s", z.ClientPort.Port()),
 			},
 		},
 	}