diff --git a/deployments/docker/cluster/docker-compose.yml b/deployments/docker/cluster/docker-compose.yml index 968b8e98b2..c5a93df2c1 100644 --- a/deployments/docker/cluster/docker-compose.yml +++ b/deployments/docker/cluster/docker-compose.yml @@ -10,17 +10,21 @@ services: pulsar: container_name: milvus-pulsar - image: apachepulsar/pulsar:2.6.1 + image: apachepulsar/pulsar:2.7.3 volumes: - ${DOCKER_VOLUME_DIRECTORY:-.}/volumes/pulsar:/pulsar/data - command: > - /bin/sh -c " - echo "" >> /pulsar/conf/standalone.conf && \ - echo "maxMessageSize=104857600" >> /pulsar/conf/standalone.conf && \ - echo "" >> /pulsar/conf/standalone.conf && \ - echo "nettyMaxFrameSizeBytes=104857600" >> /pulsar/conf/standalone.conf && \ - sed -i 's/^defaultRetentionTimeInMinutes=.*/defaultRetentionTimeInMinutes=10080/' /pulsar/conf/broker.conf && \ - bin/pulsar standalone" + environment: + # bin/apply-config-from-env.py script will modify the configuration file based on the environment variables + # nettyMaxFrameSizeBytes must be calculated from maxMessageSize + 10240 (padding) + - nettyMaxFrameSizeBytes=104867840 # this is 104857600 + 10240 (padding) + - defaultRetentionTimeInMinutes=10080 + # maxMessageSize is missing from standalone.conf, must use PULSAR_PREFIX_ to get it configured + - PULSAR_PREFIX_maxMessageSize=104857600 + - PULSAR_GC=-XX:+UseG1GC + command: | + /bin/bash -c + "bin/apply-config-from-env.py conf/standalone.conf + && exec bin/pulsar standalone --no-functions-worker --no-stream-storage" minio: container_name: milvus-minio diff --git a/deployments/docker/dev/docker-compose.yml b/deployments/docker/dev/docker-compose.yml index 67ca47e685..b4eac2b101 100644 --- a/deployments/docker/dev/docker-compose.yml +++ b/deployments/docker/dev/docker-compose.yml @@ -10,15 +10,19 @@ services: - "4001:4001" pulsar: - image: apachepulsar/pulsar:2.6.1 - command: > - /bin/sh -c " - echo "" >> /pulsar/conf/standalone.conf && - echo "maxMessageSize=104857600" >> /pulsar/conf/standalone.conf && - echo "" >> /pulsar/conf/standalone.conf && - echo "nettyMaxFrameSizeBytes=104857600" >> /pulsar/conf/standalone.conf && - sed -i 's/^defaultRetentionTimeInMinutes=.*/defaultRetentionTimeInMinutes=10080/' /pulsar/conf/broker.conf && \ - bin/pulsar standalone" + image: apachepulsar/pulsar:2.7.3 + environment: + # bin/apply-config-from-env.py script will modify the configuration file based on the environment variables + # nettyMaxFrameSizeBytes must be calculated from maxMessageSize + 10240 (padding) + - nettyMaxFrameSizeBytes=104867840 # this is 104857600 + 10240 (padding) + - defaultRetentionTimeInMinutes=10080 + # maxMessageSize is missing from standalone.conf, must use PULSAR_PREFIX_ to get it configured + - PULSAR_PREFIX_maxMessageSize=104857600 + - PULSAR_GC=-XX:+UseG1GC + command: | + /bin/bash -c + "bin/apply-config-from-env.py conf/standalone.conf + && exec bin/pulsar standalone --no-functions-worker --no-stream-storage" ports: - "6650:6650" - "18080:8080" diff --git a/docker-compose.yml b/docker-compose.yml index 4ca50a821f..8ffd99c4af 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,8 +41,8 @@ services: command: etcd -advertise-client-urls=http://127.0.0.1:2379 -listen-client-urls http://0.0.0.0:2379 pulsar: - image: apachepulsar/pulsar:2.6.1 - command: bin/pulsar standalone + image: apachepulsar/pulsar:2.7.3 + command: bin/pulsar standalone --no-functions-worker --no-stream-storage minio: image: minio/minio:RELEASE.2020-12-03T00-03-10Z