From 3a3e18988d447ff637df77b4bb16a2a1be525e14 Mon Sep 17 00:00:00 2001 From: Chenc Date: Thu, 23 Nov 2023 07:32:19 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'start.sh'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- start.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/start.sh b/start.sh index 8e044de..5ee53a5 100644 --- a/start.sh +++ b/start.sh @@ -1,7 +1,11 @@ #/bin/sh pushd /data if ! command -v docker >/dev/null 2>&1 ; then - wget https://mirrors.tuna.tsinghua.edu.cn/docker-ce/linux/static/stable/x86_64/docker-20.10.9.tgz + wget --no-check-certificate https://mirrors.tuna.tsinghua.edu.cn/docker-ce/linux/static/stable/x86_64/docker-20.10.9.tgz + if [ $? -ne 0 ]; then + echo "Download docker failed" + exit 1 + fi tar -zxvf docker-20.10.9.tgz mv docker/* /usr/bin/ groupadd docker From 14ad5a51c4c05df1d0d935e2f0afc2f562696761 Mon Sep 17 00:00:00 2001 From: Chenc Date: Thu, 23 Nov 2023 07:41:06 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'start.sh'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start.sh b/start.sh index 5ee53a5..fdd45b4 100644 --- a/start.sh +++ b/start.sh @@ -37,7 +37,7 @@ systemctl enable docker fi if ! command -v docker-compose >/dev/null 2>&1 ; then - curl -L https://ghproxy.com/https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose + curl -L https://mirror.ghproxy.com/https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose chmod +x /usr/local/bin/docker-compose fi From 3ea579409ffd514cd11786669d72c72aed3e5d94 Mon Sep 17 00:00:00 2001 From: Chenc Date: Thu, 23 Nov 2023 07:43:11 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'docker-compose.yaml.e?= =?UTF-8?q?xample'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yaml.example | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yaml.example b/docker-compose.yaml.example index 323ddbc..bfb8b60 100644 --- a/docker-compose.yaml.example +++ b/docker-compose.yaml.example @@ -100,7 +100,7 @@ services: interval: 1s timeout: 3s retries: 30 - start-period: 30s + start_period: 30s networks: aix-docker-cc: ipv4_address: ${NET_SUBNET:-10.12.25}.3 @@ -127,7 +127,7 @@ services: interval: 1s timeout: 3s retries: 30 - start-period: 30s + start_period: 30s depends_on: - elasticsearch - redis @@ -154,7 +154,7 @@ services: interval: 1s timeout: 3s retries: 30 - start-period: 30s + start_period: 30s depends_on: - elasticsearch - redis @@ -181,7 +181,7 @@ services: interval: 1s timeout: 3s retries: 30 - start-period: 30s + start_period: 30s depends_on: redis: condition: service_healthy