From a742b5555b27afdf43bfddc687d84a096d4946fa Mon Sep 17 00:00:00 2001 From: Sun-ZhenXing <1006925066@qq.com> Date: Fri, 12 Jun 2026 15:02:32 +0800 Subject: [PATCH] chore: update versions --- src/elasticsearch/.env.example | 2 +- src/elasticsearch/docker-compose.yaml | 2 +- src/kafka/.env.example | 2 +- src/kafka/docker-compose.yaml | 4 +-- src/mongodb-replicaset-single/.env.example | 2 +- .../docker-compose.yaml | 4 ++- src/mongodb-replicaset/.env.example | 2 +- src/mongodb-replicaset/docker-compose.yaml | 8 ++++- src/mongodb-standalone/.env.example | 2 +- src/mongodb-standalone/docker-compose.yaml | 4 ++- src/mysql/.env.example | 2 +- src/mysql/docker-compose.yaml | 2 +- src/nginx/.env.example | 2 +- src/nginx/docker-compose.yaml | 2 +- src/otel-host-agent/.env.example | 9 +++++ src/otel-host-agent/docker-compose.yaml | 36 ++++++++++++++----- src/postgres/.env.example | 2 +- src/postgres/docker-compose.yaml | 2 +- src/redis/.env.example | 4 +-- src/redis/docker-compose.yaml | 2 +- 20 files changed, 66 insertions(+), 29 deletions(-) diff --git a/src/elasticsearch/.env.example b/src/elasticsearch/.env.example index 9c559e6..5ff6463 100644 --- a/src/elasticsearch/.env.example +++ b/src/elasticsearch/.env.example @@ -1,5 +1,5 @@ # Elasticsearch version -ELASTICSEARCH_VERSION=9.3.0 +ELASTICSEARCH_VERSION=9.4.2 # Timezone TZ=UTC diff --git a/src/elasticsearch/docker-compose.yaml b/src/elasticsearch/docker-compose.yaml index 5746ff1..554cf42 100644 --- a/src/elasticsearch/docker-compose.yaml +++ b/src/elasticsearch/docker-compose.yaml @@ -9,7 +9,7 @@ x-defaults: &defaults services: elasticsearch: <<: *defaults - image: docker.elastic.co/elasticsearch/elasticsearch-wolfi:${ELASTICSEARCH_VERSION:-9.3.0} + image: docker.elastic.co/elasticsearch/elasticsearch-wolfi:${ELASTICSEARCH_VERSION:-9.4.2} ports: - '${ELASTICSEARCH_HTTP_PORT_OVERRIDE:-9200}:9200' - '${ELASTICSEARCH_TRANSPORT_PORT_OVERRIDE:-9300}:9300' diff --git a/src/kafka/.env.example b/src/kafka/.env.example index 5727b6e..4dd2a2b 100644 --- a/src/kafka/.env.example +++ b/src/kafka/.env.example @@ -1,5 +1,5 @@ # Kafka version (Confluent Platform version) -KAFKA_VERSION=7.8.0 +KAFKA_VERSION=8.2.0 # Timezone TZ=UTC diff --git a/src/kafka/docker-compose.yaml b/src/kafka/docker-compose.yaml index aceeb39..093a03b 100644 --- a/src/kafka/docker-compose.yaml +++ b/src/kafka/docker-compose.yaml @@ -10,7 +10,7 @@ services: # Zookeeper for Kafka coordination zookeeper: <<: *defaults - image: ${GLOBAL_REGISTRY:-}confluentinc/cp-zookeeper:${KAFKA_VERSION:-7.8.0} + image: ${GLOBAL_REGISTRY:-}confluentinc/cp-zookeeper:${KAFKA_VERSION:-8.2.0} ports: - '${ZOOKEEPER_CLIENT_PORT_OVERRIDE:-2181}:2181' volumes: @@ -43,7 +43,7 @@ services: # Kafka broker kafka: <<: *defaults - image: ${GLOBAL_REGISTRY:-}confluentinc/cp-kafka:${KAFKA_VERSION:-7.8.0} + image: ${GLOBAL_REGISTRY:-}confluentinc/cp-kafka:${KAFKA_VERSION:-8.2.0} depends_on: zookeeper: condition: service_healthy diff --git a/src/mongodb-replicaset-single/.env.example b/src/mongodb-replicaset-single/.env.example index ce6b8ed..0daf205 100644 --- a/src/mongodb-replicaset-single/.env.example +++ b/src/mongodb-replicaset-single/.env.example @@ -2,7 +2,7 @@ TZ=UTC # MongoDB Version -MONGO_VERSION=8.2.3 +MONGO_VERSION=8.3.3 # MongoDB root credentials MONGO_INITDB_ROOT_USERNAME=root diff --git a/src/mongodb-replicaset-single/docker-compose.yaml b/src/mongodb-replicaset-single/docker-compose.yaml index d96506a..a4b8db1 100644 --- a/src/mongodb-replicaset-single/docker-compose.yaml +++ b/src/mongodb-replicaset-single/docker-compose.yaml @@ -8,7 +8,7 @@ x-defaults: &defaults x-mongo: &mongo <<: *defaults - image: ${GLOBAL_REGISTRY:-}mongo:${MONGO_VERSION:-8.2.3} + image: ${GLOBAL_REGISTRY:-}mongo:${MONGO_VERSION:-8.3.3} environment: TZ: ${TZ:-UTC} MONGO_INITDB_ROOT_USERNAME: ${MONGO_INITDB_ROOT_USERNAME:-root} @@ -47,6 +47,7 @@ services: - '${MONGO_PORT_OVERRIDE_1:-27017}:27017' volumes: - mongo_data:/data/db + - mongo_configdb:/data/configdb - ./secrets/rs0.key:/data/rs0.key:ro mongo-init: @@ -110,3 +111,4 @@ services: volumes: mongo_data: + mongo_configdb: diff --git a/src/mongodb-replicaset/.env.example b/src/mongodb-replicaset/.env.example index 8e4ab14..f27f116 100644 --- a/src/mongodb-replicaset/.env.example +++ b/src/mongodb-replicaset/.env.example @@ -1,5 +1,5 @@ # MongoDB Version -MONGO_VERSION=8.2.3 +MONGO_VERSION=8.3.3 # MongoDB root credentials MONGO_INITDB_ROOT_USERNAME=root diff --git a/src/mongodb-replicaset/docker-compose.yaml b/src/mongodb-replicaset/docker-compose.yaml index 54e8477..3632d08 100644 --- a/src/mongodb-replicaset/docker-compose.yaml +++ b/src/mongodb-replicaset/docker-compose.yaml @@ -8,7 +8,7 @@ x-defaults: &defaults x-mongo: &mongo <<: *defaults - image: ${GLOBAL_REGISTRY:-}mongo:${MONGO_VERSION:-8.2.3} + image: ${GLOBAL_REGISTRY:-}mongo:${MONGO_VERSION:-8.3.3} environment: TZ: ${TZ:-UTC} MONGO_INITDB_ROOT_USERNAME: ${MONGO_INITDB_ROOT_USERNAME:-root} @@ -47,6 +47,7 @@ services: - '${MONGO_PORT_OVERRIDE_1:-27017}:27017' volumes: - mongo1_data:/data/db + - mongo1_configdb:/data/configdb - ./secrets/rs0.key:/data/rs0.key:ro mongo2: @@ -55,6 +56,7 @@ services: - '${MONGO_PORT_OVERRIDE_2:-27018}:27017' volumes: - mongo2_data:/data/db + - mongo2_configdb:/data/configdb - ./secrets/rs0.key:/data/rs0.key:ro mongo3: @@ -63,6 +65,7 @@ services: - '${MONGO_PORT_OVERRIDE_3:-27019}:27017' volumes: - mongo3_data:/data/db + - mongo3_configdb:/data/configdb - ./secrets/rs0.key:/data/rs0.key:ro mongo-init: @@ -134,5 +137,8 @@ services: volumes: mongo1_data: + mongo1_configdb: mongo2_data: + mongo2_configdb: mongo3_data: + mongo3_configdb: diff --git a/src/mongodb-standalone/.env.example b/src/mongodb-standalone/.env.example index 69a2796..807c886 100644 --- a/src/mongodb-standalone/.env.example +++ b/src/mongodb-standalone/.env.example @@ -1,5 +1,5 @@ # MongoDB Version -MONGO_VERSION=8.2.3 +MONGO_VERSION=8.3.3 # MongoDB root credentials MONGO_INITDB_ROOT_USERNAME=root diff --git a/src/mongodb-standalone/docker-compose.yaml b/src/mongodb-standalone/docker-compose.yaml index 643d090..35cf192 100644 --- a/src/mongodb-standalone/docker-compose.yaml +++ b/src/mongodb-standalone/docker-compose.yaml @@ -9,7 +9,7 @@ x-defaults: &defaults services: mongo: <<: *defaults - image: ${GLOBAL_REGISTRY:-}mongo:${MONGO_VERSION:-8.2.3} + image: ${GLOBAL_REGISTRY:-}mongo:${MONGO_VERSION:-8.3.3} environment: TZ: ${TZ:-UTC} MONGO_INITDB_ROOT_USERNAME: ${MONGO_INITDB_ROOT_USERNAME:-root} @@ -19,6 +19,7 @@ services: - '${MONGO_PORT_OVERRIDE:-27017}:27017' volumes: - mongo_data:/data/db + - mongo_configdb:/data/configdb healthcheck: test: [CMD, mongosh, --eval, "db.adminCommand('ping')"] interval: 30s @@ -36,3 +37,4 @@ services: volumes: mongo_data: + mongo_configdb: diff --git a/src/mysql/.env.example b/src/mysql/.env.example index 6805052..5c7763a 100644 --- a/src/mysql/.env.example +++ b/src/mysql/.env.example @@ -1,5 +1,5 @@ # MySQL Version -MYSQL_VERSION=9.4.0 +MYSQL_VERSION=9.7.0 # Root password for MySQL MYSQL_ROOT_PASSWORD=password diff --git a/src/mysql/docker-compose.yaml b/src/mysql/docker-compose.yaml index 362ce9e..cb0be0e 100644 --- a/src/mysql/docker-compose.yaml +++ b/src/mysql/docker-compose.yaml @@ -9,7 +9,7 @@ x-defaults: &defaults services: mysql: <<: *defaults - image: ${GLOBAL_REGISTRY:-}mysql:${MYSQL_VERSION:-9.4.0} + image: ${GLOBAL_REGISTRY:-}mysql:${MYSQL_VERSION:-9.7.0} ports: - '${MYSQL_PORT_OVERRIDE:-3306}:3306' volumes: diff --git a/src/nginx/.env.example b/src/nginx/.env.example index 29da92c..9c7f8f7 100644 --- a/src/nginx/.env.example +++ b/src/nginx/.env.example @@ -1,5 +1,5 @@ # Nginx version -NGINX_VERSION=1.28.2-alpine3.22 +NGINX_VERSION=1.29.3-alpine3.23 # Timezone TZ=UTC diff --git a/src/nginx/docker-compose.yaml b/src/nginx/docker-compose.yaml index 7eaa5b9..cda8dde 100644 --- a/src/nginx/docker-compose.yaml +++ b/src/nginx/docker-compose.yaml @@ -9,7 +9,7 @@ x-defaults: &defaults services: nginx: <<: *defaults - image: ${GLOBAL_REGISTRY:-}nginx:${NGINX_VERSION:-1.28.2-alpine3.22} + image: ${GLOBAL_REGISTRY:-}nginx:${NGINX_VERSION:-1.29.3-alpine3.23} ports: - '${NGINX_HTTP_PORT_OVERRIDE:-80}:80' - '${NGINX_HTTPS_PORT_OVERRIDE:-443}:443' diff --git a/src/otel-host-agent/.env.example b/src/otel-host-agent/.env.example index 7ad5eea..4c93e9b 100644 --- a/src/otel-host-agent/.env.example +++ b/src/otel-host-agent/.env.example @@ -1,3 +1,6 @@ +# Global registry prefix for images (e.g., docker.io/, ghcr.io/, or private registry) +GLOBAL_REGISTRY= + # OpenTelemetry Collector Contrib image version OTEL_COLLECTOR_VERSION=0.153.0 @@ -6,3 +9,9 @@ DEPLOY_ENV=production # OTLP HTTP exporter endpoint (your OTel backend, e.g. OpenObserve, Grafana Tempo, Jaeger) OTEL_EXPORTER_ENDPOINT=http://localhost:4318 + +# Resource limits +OTEL_COLLECTOR_CPU_LIMIT=1.0 +OTEL_COLLECTOR_MEMORY_LIMIT=2G +OTEL_COLLECTOR_CPU_RESERVATION=0.1 +OTEL_COLLECTOR_MEMORY_RESERVATION=512M diff --git a/src/otel-host-agent/docker-compose.yaml b/src/otel-host-agent/docker-compose.yaml index 60c0b5a..255a634 100644 --- a/src/otel-host-agent/docker-compose.yaml +++ b/src/otel-host-agent/docker-compose.yaml @@ -1,7 +1,15 @@ +x-defaults: &defaults + restart: unless-stopped + logging: + driver: json-file + options: + max-size: 10m + max-file: '3' + services: collection-agent: - image: otel/opentelemetry-collector-contrib:${OTEL_COLLECTOR_VERSION:-0.153.0} - restart: unless-stopped + <<: *defaults + image: ${GLOBAL_REGISTRY:-}otel/opentelemetry-collector-contrib:${OTEL_COLLECTOR_VERSION:-0.153.0} user: '0:0' network_mode: host environment: @@ -14,10 +22,20 @@ services: deploy: resources: limits: - cpus: '1.0' - memory: 2G - logging: - driver: json-file - options: - max-size: 10m - max-file: '3' + cpus: ${OTEL_COLLECTOR_CPU_LIMIT:-1.0} + memory: ${OTEL_COLLECTOR_MEMORY_LIMIT:-2G} + reservations: + cpus: ${OTEL_COLLECTOR_CPU_RESERVATION:-0.1} + memory: ${OTEL_COLLECTOR_MEMORY_RESERVATION:-512M} + healthcheck: + test: + - CMD + - wget + - --no-verbose + - --tries=1 + - --spider + - 'http://localhost:13133/' + interval: 30s + timeout: 10s + retries: 3 + start_period: 30s diff --git a/src/postgres/.env.example b/src/postgres/.env.example index 6fdeb47..b2ec960 100644 --- a/src/postgres/.env.example +++ b/src/postgres/.env.example @@ -1,5 +1,5 @@ # PostgreSQL Version -POSTGRES_VERSION=17.6 +POSTGRES_VERSION=17.10 # Database user POSTGRES_USER=postgres diff --git a/src/postgres/docker-compose.yaml b/src/postgres/docker-compose.yaml index 5e2e896..ba48aa7 100644 --- a/src/postgres/docker-compose.yaml +++ b/src/postgres/docker-compose.yaml @@ -9,7 +9,7 @@ x-defaults: &defaults services: postgres: <<: *defaults - image: ${GLOBAL_REGISTRY:-}postgres:${POSTGRES_VERSION:-17.6} + image: ${GLOBAL_REGISTRY:-}postgres:${POSTGRES_VERSION:-17.10} environment: TZ: ${TZ:-UTC} POSTGRES_USER: ${POSTGRES_USER:-postgres} diff --git a/src/redis/.env.example b/src/redis/.env.example index ec8431a..9b672e6 100644 --- a/src/redis/.env.example +++ b/src/redis/.env.example @@ -2,7 +2,7 @@ GLOBAL_REGISTRY= # Redis version -REDIS_VERSION=8.2.1-alpine3.22 +REDIS_VERSION=8.4.0-alpine3.23 # Password for Redis authentication (leave empty for no password) REDIS_PASSWORD= @@ -22,4 +22,4 @@ REDIS_CPU_RESERVATION=0.1 # Memory limits REDIS_MEMORY_LIMIT=256M -REDIS_MEMORY_RESERVATION=128M \ No newline at end of file +REDIS_MEMORY_RESERVATION=128M diff --git a/src/redis/docker-compose.yaml b/src/redis/docker-compose.yaml index 4502c4e..f0ca588 100644 --- a/src/redis/docker-compose.yaml +++ b/src/redis/docker-compose.yaml @@ -9,7 +9,7 @@ x-defaults: &defaults services: redis: <<: *defaults - image: ${GLOBAL_REGISTRY:-}redis:${REDIS_VERSION:-8.2.1-alpine3.22} + image: ${GLOBAL_REGISTRY:-}redis:${REDIS_VERSION:-8.4.0-alpine3.23} ports: - '${REDIS_PORT_OVERRIDE:-6379}:6379' volumes: