Skip to content

Commit

Permalink
Upgrade pulsar image to 4.0.0 (#1304)
Browse files Browse the repository at this point in the history
  • Loading branch information
crossoverJie authored Nov 1, 2024
1 parent 310fb94 commit 8c193de
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 20 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ COPY --from=golang /usr/local/go /pulsar/go

ENV PATH /pulsar/go/bin:$PATH

RUN apt-get update && apt-get install -y git gcc
RUN apk add git gcc musl-dev

### Add pulsar config
COPY integration-tests/certs /pulsar/certs
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#

IMAGE_NAME = pulsar-client-go-test:latest
PULSAR_VERSION ?= 3.2.2
PULSAR_VERSION ?= 4.0.0
PULSAR_IMAGE = apachepulsar/pulsar:$(PULSAR_VERSION)
GO_VERSION ?= 1.22
CONTAINER_ARCH ?= $(shell uname -m | sed s/x86_64/amd64/)
Expand Down
12 changes: 6 additions & 6 deletions integration-tests/blue-green/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@ services:
environment:
- PULSAR_MEM=-Xms128m -Xmx128m -XX:MaxDirectMemorySize=56m
command: >
bin/pulsar initialize-cluster-metadata \
--cluster cluster-green \
--zookeeper green-zookeeper:2181 \
--configuration-store green-zookeeper:2181 \
--web-service-url http://green-broker-1:8080 \
--broker-service-url pulsar://green-broker-1:6650
bash -c "bin/pulsar initialize-cluster-metadata \
--cluster cluster-green \
--zookeeper green-zookeeper:2181 \
--configuration-store green-zookeeper:2181 \
--web-service-url http://green-broker-1:8080 \
--broker-service-url pulsar://green-broker-1:6650"
depends_on:
green-zookeeper:
condition: service_healthy
Expand Down
12 changes: 6 additions & 6 deletions integration-tests/clustered/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ services:
environment:
- PULSAR_MEM=-Xms128m -Xmx128m -XX:MaxDirectMemorySize=56m
command: >
bin/pulsar initialize-cluster-metadata \
--cluster cluster-a \
--zookeeper zookeeper:2181 \
--configuration-store zookeeper:2181 \
--web-service-url http://broker-1:8080 \
--broker-service-url pulsar://broker-1:6650
bash -c "bin/pulsar initialize-cluster-metadata \
--cluster cluster-a \
--zookeeper zookeeper:2181 \
--configuration-store zookeeper:2181 \
--web-service-url http://broker-1:8080 \
--broker-service-url pulsar://broker-1:6650"
depends_on:
zookeeper:
condition: service_healthy
Expand Down
12 changes: 6 additions & 6 deletions integration-tests/extensible-load-manager/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ services:
environment:
- PULSAR_MEM=-Xms128m -Xmx128m -XX:MaxDirectMemorySize=56m
command: >
bin/pulsar initialize-cluster-metadata \
--cluster cluster-a \
--zookeeper zookeeper:2181 \
--configuration-store zookeeper:2181 \
--web-service-url http://broker-1:8080 \
--broker-service-url pulsar://broker-1:6650
bash -c "bin/pulsar initialize-cluster-metadata \
--cluster cluster-a \
--zookeeper zookeeper:2181 \
--configuration-store zookeeper:2181 \
--web-service-url http://broker-1:8080 \
--broker-service-url pulsar://broker-1:6650"
depends_on:
zookeeper:
condition: service_healthy
Expand Down
1 change: 1 addition & 0 deletions scripts/run-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ set -e -x

scripts/pulsar-test-service-start.sh

export CGO_ENABLED=1
go test -race -coverprofile=/tmp/coverage -timeout=20m -v ./...
go tool cover -html=/tmp/coverage -o coverage.html

Expand Down

0 comments on commit 8c193de

Please sign in to comment.