From 532ec75ee6af52357c8ea9c280fa9eb3287b202b Mon Sep 17 00:00:00 2001 From: Yunze Xu Date: Mon, 20 Jan 2025 16:38:29 +0800 Subject: [PATCH 1/2] Verify 3.0.9 --- pulsar-test-service-start.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pulsar-test-service-start.sh b/pulsar-test-service-start.sh index 23f70102..5b9e05e1 100755 --- a/pulsar-test-service-start.sh +++ b/pulsar-test-service-start.sh @@ -25,12 +25,12 @@ SRC_DIR=$PWD ./pulsar-test-service-stop.sh -CONTAINER_ID=$(docker run -i --user $(id -u) -p 8080:8080 -p 6650:6650 -p 8443:8443 -p 6651:6651 --rm --detach apachepulsar/pulsar:latest sleep 3600) +CONTAINER_ID=$(docker run -i --user $(id -u) -p 8080:8080 -p 6650:6650 -p 8443:8443 -p 6651:6651 --rm --detach lhotari/pulsar:3.0.9-b6beb90 sleep 3600) build-support/setup-test-service-container.sh $CONTAINER_ID start-test-service-inside-container.sh docker cp $CONTAINER_ID:/pulsar/data/tokens/token.txt .test-token.txt -CONTAINER_ID=$(docker run -i --user $(id -u) -p 8081:8081 -p 6652:6652 -p 8444:8444 -p 6653:6653 --rm --detach apachepulsar/pulsar:latest sleep 3600) +CONTAINER_ID=$(docker run -i --user $(id -u) -p 8081:8081 -p 6652:6652 -p 8444:8444 -p 6653:6653 --rm --detach lhotari/pulsar:3.0.9-b6beb90 sleep 3600) build-support/setup-test-service-container.sh $CONTAINER_ID start-mim-test-service-inside-container.sh echo "-- Ready to start tests" From aeec868b32e7ea0e680841bdc23cd26004a54e9e Mon Sep 17 00:00:00 2001 From: Yunze Xu Date: Mon, 20 Jan 2025 16:42:14 +0800 Subject: [PATCH 2/2] Fix docker-compose.yml --- tests/blue-green/docker-compose.yml | 12 ++++++------ tests/brokermetadata/docker-compose.yml | 2 +- tests/extensibleLM/docker-compose.yml | 12 ++++++------ tests/oauth2/docker-compose.yml | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/blue-green/docker-compose.yml b/tests/blue-green/docker-compose.yml index ee18e7ad..4570b8e6 100644 --- a/tests/blue-green/docker-compose.yml +++ b/tests/blue-green/docker-compose.yml @@ -5,7 +5,7 @@ networks: services: # Start ZooKeeper zookeeper: - image: apachepulsar/pulsar:latest + image: lhotari/pulsar:3.0.9-b6beb90 container_name: green-zookeeper restart: on-failure networks: @@ -27,7 +27,7 @@ services: pulsar-init: container_name: green-pulsar-init hostname: pulsar-init - image: apachepulsar/pulsar:latest + image: lhotari/pulsar:3.0.9-b6beb90 networks: - green-pulsar environment: @@ -45,7 +45,7 @@ services: # Start bookie bookie: - image: apachepulsar/pulsar:latest + image: lhotari/pulsar:3.0.9-b6beb90 container_name: green-bookie restart: on-failure networks: @@ -64,7 +64,7 @@ services: command: bash -c "bin/apply-config-from-env.py conf/bookkeeper.conf && exec bin/pulsar bookie" proxy: - image: apachepulsar/pulsar:latest + image: lhotari/pulsar:3.0.9-b6beb90 container_name: green-proxy hostname: proxy restart: on-failure @@ -87,7 +87,7 @@ services: # Start broker 1 broker-1: - image: apachepulsar/pulsar:latest + image: lhotari/pulsar:3.0.9-b6beb90 container_name: green-broker-1 hostname: broker-1 restart: on-failure @@ -120,7 +120,7 @@ services: # Start broker 2 broker-2: - image: apachepulsar/pulsar:latest + image: lhotari/pulsar:3.0.9-b6beb90 container_name: green-broker-2 hostname: broker-2 restart: on-failure diff --git a/tests/brokermetadata/docker-compose.yml b/tests/brokermetadata/docker-compose.yml index 6b1d36ea..388b3b32 100644 --- a/tests/brokermetadata/docker-compose.yml +++ b/tests/brokermetadata/docker-compose.yml @@ -23,7 +23,7 @@ networks: driver: bridge services: standalone: - image: apachepulsar/pulsar:latest + image: lhotari/pulsar:3.0.9-b6beb90 container_name: standalone hostname: local restart: "no" diff --git a/tests/extensibleLM/docker-compose.yml b/tests/extensibleLM/docker-compose.yml index d74c568f..d91637d4 100644 --- a/tests/extensibleLM/docker-compose.yml +++ b/tests/extensibleLM/docker-compose.yml @@ -5,7 +5,7 @@ networks: services: # Start ZooKeeper zookeeper: - image: apachepulsar/pulsar:latest + image: lhotari/pulsar:3.0.9-b6beb90 container_name: zookeeper restart: on-failure networks: @@ -27,7 +27,7 @@ services: pulsar-init: container_name: pulsar-init hostname: pulsar-init - image: apachepulsar/pulsar:latest + image: lhotari/pulsar:3.0.9-b6beb90 networks: - pulsar environment: @@ -44,7 +44,7 @@ services: # Start bookie bookie: - image: apachepulsar/pulsar:latest + image: lhotari/pulsar:3.0.9-b6beb90 container_name: bookie restart: on-failure networks: @@ -63,7 +63,7 @@ services: command: bash -c "bin/apply-config-from-env.py conf/bookkeeper.conf && exec bin/pulsar bookie" proxy: - image: apachepulsar/pulsar:latest + image: lhotari/pulsar:3.0.9-b6beb90 container_name: proxy hostname: proxy restart: on-failure @@ -86,7 +86,7 @@ services: # Start broker 1 broker-1: - image: apachepulsar/pulsar:latest + image: lhotari/pulsar:3.0.9-b6beb90 container_name: broker-1 hostname: broker-1 restart: on-failure @@ -120,7 +120,7 @@ services: # Start broker 2 broker-2: - image: apachepulsar/pulsar:latest + image: lhotari/pulsar:3.0.9-b6beb90 container_name: broker-2 hostname: broker-2 restart: on-failure diff --git a/tests/oauth2/docker-compose.yml b/tests/oauth2/docker-compose.yml index 0ab818e8..b2c98311 100644 --- a/tests/oauth2/docker-compose.yml +++ b/tests/oauth2/docker-compose.yml @@ -23,7 +23,7 @@ networks: driver: bridge services: standalone: - image: apachepulsar/pulsar:latest + image: lhotari/pulsar:3.0.9-b6beb90 container_name: standalone hostname: local restart: "no"