diff --git a/docker-compose.yaml.example b/docker-compose.yaml.example index 323ddbc..bbbb5ab 100644 --- a/docker-compose.yaml.example +++ b/docker-compose.yaml.example @@ -43,7 +43,7 @@ services: # - discovery.seed_hosts= # - cluster.initial_master_nodes=cc-docker-node - discovery.type=single-node - - ELASTIC_PASSWD=${ELK_ELASTIC_PASSWD:-qq1458513} + - ELASTIC_PASSWORD=${ELK_ELASTIC_PASSWD:-qq1458513} volumes: - "./elasticsearch/data/${ELK_VERSION:-7.17.7}:/usr/share/elasticsearch/data:rw" - "./elasticsearch/plugins/${ELK_VERSION:-7.17.7}:/usr/share/elasticsearch/plugins" @@ -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 @@ -166,6 +166,7 @@ services: volumes: - "${WWWROOT_PATH}:/data/wwwroot" - "./php/php81/etc:/usr/local/etc" + - "./php/php81/supervisord.d:/etc/supervisord.d" working_dir: /data/wwwroot/ networks: aix-docker-cc: @@ -181,7 +182,7 @@ services: interval: 1s timeout: 3s retries: 30 - start-period: 30s + start_period: 30s depends_on: redis: condition: service_healthy diff --git a/start.sh b/start.sh index 8e044de..5f4f950 100644 --- a/start.sh +++ b/start.sh @@ -33,7 +33,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://gh-proxy.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