From ce894180bc926f42abbeeda67bd8b30802b31820 Mon Sep 17 00:00:00 2001 From: Chenc Date: Mon, 15 Jul 2024 06:31:56 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.env.example?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index cc69926..ae28f32 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,4 @@ -IMAGE_BASE=registry.cn-hangzhou.aliyuncs.com/aix_chenc +IMAGE_BASE=opencode.jsaix.cn/chenc ################ Net Congfig ###################### NET_SUBNET=10.12.25 From 9b2d3a8dd3e2bad720676696448abe6ac7a1af5a Mon Sep 17 00:00:00 2001 From: Chenc Date: Tue, 16 Jul 2024 05:36:10 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20docker-compose.yaml.ex?= =?UTF-8?q?ample?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yaml.example | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docker-compose.yaml.example b/docker-compose.yaml.example index eed37aa..0639f86 100644 --- a/docker-compose.yaml.example +++ b/docker-compose.yaml.example @@ -14,7 +14,7 @@ networks: services: nodejs: - image: ${IMAGE_BASE}/nodejs:18.18.2 + image: ${IMAGE_BASE}/nodejs:${NODEJS_VERSION:-18.18.2} container_name: nodejs environment: - PACKAGE_PATH=${PACKAGE_PATH} @@ -29,7 +29,7 @@ services: ipv4_address: ${NET_SUBNET:-10.12.25}.200 java-gateway: - image: ${IMAGE_BASE}/java_gateway:1.0.1 + image: ${IMAGE_BASE}/java_gateway:${JAVAGATEWAY_VERSION:-1.0.1} container_name: java-gateway restart: always volumes: @@ -41,7 +41,7 @@ services: ipv4_address: ${NET_SUBNET:-10.12.25}.201 elasticsearch: - image: ${IMAGE_BASE}/elasticsearch:${ELK_VERSION:-7.17.7} + image: ${IMAGE_BASE}/elasticsearch:${ELK_VERSION:-7.17.22} container_name: elasticsearch restart: always environment: @@ -77,7 +77,7 @@ services: - redis openresty: - image: ${IMAGE_BASE}/openresty:1.21.4.1 + image: ${IMAGE_BASE}/openresty:${OPENRESTY_VERSION:-1.25.3.1} container_name: openresty restart: always ports: @@ -103,7 +103,7 @@ services: - net_raw redis: - image: ${IMAGE_BASE}/redis:7.2.2 + image: ${IMAGE_BASE}/redis:${REDIS_VERSION:-7.2.5} container_name: redis restart: always environment: @@ -126,7 +126,7 @@ services: ipv4_address: ${NET_SUBNET:-10.12.25}.3 php73: - image: ${IMAGE_BASE}/php:7.3.33 + image: ${IMAGE_BASE}/php:${PHP73_VERSION:-7.3.33} container_name: php73 restart: always volumes: @@ -156,7 +156,7 @@ services: - redis php74: - image: ${IMAGE_BASE}/php:7.4.33 + image: ${IMAGE_BASE}/php:${PHP74_VERSION:-7.4.33} container_name: php74 restart: always volumes: @@ -185,7 +185,7 @@ services: - redis php81: - image: ${IMAGE_BASE}/php:8.1.24 + image: ${IMAGE_BASE}/php:${PHP81_VERSION:-8.1.29} container_name: php81 restart: always volumes: @@ -215,7 +215,7 @@ services: condition: service_healthy php83: - image: ${IMAGE_BASE}/php:8.3.0 + image: ${IMAGE_BASE}/php:${PHP81_VERSION:-8.3.8} container_name: php83 restart: always volumes: From cf32d9198798b6b1fa5ee761b135a798ee64a3af Mon Sep 17 00:00:00 2001 From: Chenc Date: Tue, 16 Jul 2024 05:36:58 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.env.example?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.example | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.env.example b/.env.example index ae28f32..f3c31de 100644 --- a/.env.example +++ b/.env.example @@ -4,11 +4,19 @@ IMAGE_BASE=opencode.jsaix.cn/chenc NET_SUBNET=10.12.25 ################ Elasticsearch ###################### -ELK_VERSION=7.17.10 +ELK_VERSION=7.17.22 ELASTICSEARCH_HOST_HTTP_PORT=9200 -ELK_ELASTIC_PASSWD=qq1458513 +ELK_ELASTIC_PASSWD=hello321 + +JAVAGATEWAY_VERSION=1.0.1 +NODEJS_VERSION=18.18.2 +OPENRESTY_VERSION=1.25.3.1 +REDIS_VERSION=7.2.5 +PHP73_VERSION=7.3.33 +PHP74_VERSION=7.4.33 +PHP81_VERSION=8.1.29 +PHP83_VERSION=8.3.8 -################# WEB目录 ###################### WWWROOT_PATH="./www" ################# NodeJS ################## @@ -16,4 +24,4 @@ NODEJS_VERSION="18.17.0" PACKAGE_PATH="" ################# Redis ################## -REDIS_PASSWORD=qq1458513 \ No newline at end of file +REDIS_PASSWORD=hello321