Merge pull request #235 from intelops/dockerfilechange

minor changes in script and dockerfile
intelops · Sep 15, 2023 · 03246c2 · 03246c2
2 parents 300681a + e604c5e
commit 03246c2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/dockerfiles/migration/Dockerfile b/dockerfiles/migration/Dockerfile
@@ -11,6 +11,7 @@ RUN chmod +x /workspace/script/wait-for-clickhouse.sh
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
 FROM golang:alpine
+RUN apk add --no-cache netcat-openbsd
 WORKDIR /
 COPY --from=builder /workspace/migration .
 COPY --from=builder /workspace/sql /sql

diff --git a/script/wait-for-clickhouse.sh b/script/wait-for-clickhouse.sh
@@ -7,7 +7,7 @@ MAX_RETRIES=60
 
 retry_count=0
 while [ $retry_count -lt $MAX_RETRIES ]; do
-  if clickhouse-client --host $CLICKHOUSE_HOST --port $CLICKHOUSE_PORT --query "SELECT 1"; then
+  if nc -z -v -w5 $CLICKHOUSE_HOST $CLICKHOUSE_PORT; then
     echo "ClickHouse is ready!"
     exit 0
   else