diff --git a/DockerComposeShells/docker-compose-init.yml b/DockerComposeShells/docker-compose-init.yml index 89597ce..70529ea 100644 --- a/DockerComposeShells/docker-compose-init.yml +++ b/DockerComposeShells/docker-compose-init.yml @@ -50,7 +50,7 @@ services: resources: limits: cpus: "2" - memory: 2g + memory: 4g command: > /bin/bash -c "bin/apply-config-from-env.py conf/bookkeeper.conf && @@ -79,7 +79,7 @@ services: resources: limits: cpus: "2" - memory: 2g + memory: 4g command: > /bin/bash -c "bin/apply-config-from-env.py conf/broker.conf && bin/pulsar broker" @@ -209,8 +209,8 @@ services: deploy: resources: limits: - cpus: "2.0" - memory: 2g + cpus: "1.0" + memory: 1g ports: - "${REDIS_PORT}:6379" volumes: @@ -292,7 +292,7 @@ services: resources: limits: cpus: "1.0" - memory: 2g + memory: 200mb ports: - "${ADMIN_WEB_PORT}:8080" stdin_open: true diff --git a/DockerComposeShells/docker-compose.yml b/DockerComposeShells/docker-compose.yml index 9a8f04a..c4de8d6 100644 --- a/DockerComposeShells/docker-compose.yml +++ b/DockerComposeShells/docker-compose.yml @@ -191,11 +191,9 @@ services: volumes: - ./mysql/log:/var/log/mysql - ./mysql/data:/var/lib/mysql - - ./mysql/init:/docker-entrypoint-initdb.d command: - --character-set-server=utf8mb4 - --collation-server=utf8mb4_unicode_ci - - --user=mysql # 确保MySQL以mysql用户运行 deploy: resources: limits: @@ -245,7 +243,7 @@ services: resources: limits: cpus: "1.0" - memory: 500mb + memory: 200mb ports: - "${ADMIN_WEB_PORT}:8080" stdin_open: true