diff --git a/docker-compose.yml b/docker-compose.yml index ba4803967f..0c1481c922 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.7' services: zookeeper-1: - image: 'confluentinc/cp-zookeeper:${CONFLUENT_PLATFORM_VERSION:-3.1.0}' + image: 'confluentinc/cp-zookeeper:7.0.1' restart: always environment: ZOOKEEPER_SERVER_ID: '1' @@ -13,7 +13,7 @@ services: ZOOKEEPER_SYNC_LIMIT: '5' ZOOKEEPER_MAX_CLIENT_CONNS: '0' zookeeper-2: - image: 'confluentinc/cp-zookeeper:${CONFLUENT_PLATFORM_VERSION:-3.1.0}' + image: 'confluentinc/cp-zookeeper:7.0.1' restart: always environment: ZOOKEEPER_SERVER_ID: '2' @@ -25,7 +25,7 @@ services: ZOOKEEPER_SYNC_LIMIT: '5' ZOOKEEPER_MAX_CLIENT_CONNS: '0' zookeeper-3: - image: 'confluentinc/cp-zookeeper:${CONFLUENT_PLATFORM_VERSION:-3.1.0}' + image: 'confluentinc/cp-zookeeper:7.0.1' restart: always environment: ZOOKEEPER_SERVER_ID: '3' @@ -37,7 +37,7 @@ services: ZOOKEEPER_SYNC_LIMIT: '5' ZOOKEEPER_MAX_CLIENT_CONNS: '0' kafka-1: - image: 'bitnami/kafka:${CONFLUENT_PLATFORM_VERSION:-3.1.0}' + image: 'bitnami/kafka:${KAFKA_VERSION:-3.1.0}' restart: always environment: KAFKA_CFG_ZOOKEEPER_CONNECT: 'zookeeper-1:2181,zookeeper-2:2181,zookeeper-3:2181' @@ -55,7 +55,7 @@ services: KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE: 'false' ALLOW_PLAINTEXT_LISTENER: 'true' kafka-2: - image: 'bitnami/kafka:${CONFLUENT_PLATFORM_VERSION:-3.1.0}' + image: 'bitnami/kafka:${KAFKA_VERSION:-3.1.0}' restart: always environment: KAFKA_CFG_ZOOKEEPER_CONNECT: 'zookeeper-1:2181,zookeeper-2:2181,zookeeper-3:2181' @@ -73,7 +73,7 @@ services: KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE: 'false' ALLOW_PLAINTEXT_LISTENER: 'true' kafka-3: - image: 'bitnami/kafka:${CONFLUENT_PLATFORM_VERSION:-3.1.0}' + image: 'bitnami/kafka:${KAFKA_VERSION:-3.1.0}' restart: always environment: KAFKA_CFG_ZOOKEEPER_CONNECT: 'zookeeper-1:2181,zookeeper-2:2181,zookeeper-3:2181' @@ -91,7 +91,7 @@ services: KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE: 'false' ALLOW_PLAINTEXT_LISTENER: 'true' kafka-4: - image: 'bitnami/kafka:${CONFLUENT_PLATFORM_VERSION:-3.1.0}' + image: 'bitnami/kafka:${KAFKA_VERSION:-3.1.0}' restart: always environment: KAFKA_CFG_ZOOKEEPER_CONNECT: 'zookeeper-1:2181,zookeeper-2:2181,zookeeper-3:2181' @@ -109,7 +109,7 @@ services: KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE: 'false' ALLOW_PLAINTEXT_LISTENER: 'true' kafka-5: - image: 'bitnami/kafka:${CONFLUENT_PLATFORM_VERSION:-3.1.0}' + image: 'bitnami/kafka:${KAFKA_VERSION:-3.1.0}' restart: always environment: KAFKA_CFG_ZOOKEEPER_CONNECT: 'zookeeper-1:2181,zookeeper-2:2181,zookeeper-3:2181' diff --git a/functional_test.go b/functional_test.go index 38d8fd0948..4f6cfc9d86 100644 --- a/functional_test.go +++ b/functional_test.go @@ -142,7 +142,7 @@ func prepareDockerTestEnvironment(ctx context.Context, env *testEnvironment) err c := exec.Command("docker-compose", "up", "-d") c.Stdout = os.Stdout c.Stderr = os.Stderr - c.Env = append(os.Environ(), fmt.Sprintf("CONFLUENT_PLATFORM_VERSION=%s", env.KafkaVersion)) + c.Env = append(os.Environ(), fmt.Sprintf("KAFKA_VERSION=%s", env.KafkaVersion)) err := c.Run() if err != nil { return fmt.Errorf("failed to run docker-compose to start test environment: %w", err)