+3
-9
@@ -11,8 +11,7 @@ services:
|
|||||||
- ./composer.json:/app/composer.json
|
- ./composer.json:/app/composer.json
|
||||||
- data:/app/data
|
- data:/app/data
|
||||||
depends_on:
|
depends_on:
|
||||||
clickhouse:
|
- clickhouse
|
||||||
condition: service_healthy
|
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
nginx:
|
nginx:
|
||||||
@@ -42,8 +41,7 @@ services:
|
|||||||
- data:/app/data
|
- data:/app/data
|
||||||
- log_collect:/collect
|
- log_collect:/collect
|
||||||
depends_on:
|
depends_on:
|
||||||
clickhouse:
|
- clickhouse
|
||||||
condition: service_healthy
|
|
||||||
command: ["php", "bin/consume", "--daemon"]
|
command: ["php", "bin/consume", "--daemon"]
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
@@ -58,11 +56,7 @@ services:
|
|||||||
nofile:
|
nofile:
|
||||||
soft: 262144
|
soft: 262144
|
||||||
hard: 262144
|
hard: 262144
|
||||||
healthcheck:
|
|
||||||
test: ["CMD", "wget", "--spider", "-q", "http://localhost:8123/ping"]
|
|
||||||
interval: 5s
|
|
||||||
timeout: 3s
|
|
||||||
retries: 10
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
data:
|
data:
|
||||||
|
|||||||
@@ -2,16 +2,4 @@
|
|||||||
mkdir -p /app/data
|
mkdir -p /app/data
|
||||||
chmod -R 777 /app/data
|
chmod -R 777 /app/data
|
||||||
rm -f /app/data/*.lock
|
rm -f /app/data/*.lock
|
||||||
|
|
||||||
# Wait for ClickHouse to be ready
|
|
||||||
echo "Waiting for ClickHouse..."
|
|
||||||
for i in $(seq 1 30); do
|
|
||||||
if wget --spider -q http://clickhouse:8123/ping 2>/dev/null; then
|
|
||||||
echo "ClickHouse is ready"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
echo " attempt $i..."
|
|
||||||
sleep 1
|
|
||||||
done
|
|
||||||
|
|
||||||
exec docker-php-entrypoint "$@"
|
exec docker-php-entrypoint "$@"
|
||||||
Reference in New Issue
Block a user