From 948ddf36c6dd0acec835c82747a2c9ea780e6ced Mon Sep 17 00:00:00 2001 From: Anuj359 Date: Fri, 21 Jul 2023 22:34:47 +0530 Subject: [PATCH] Fix/issue 12532 (#12550) * Updating Dockerfile with multistage * Updating reviewed changes * Docker Development changes * Docker workflow changes * Arguments update * Script path update * Arguments update * Resolving the reviewed suggestions * Issue-12532 and security-scan fix * Removing security-scan fix * Update Dockerfile * updating wget from curl --- docker/development/docker-compose-postgres.yml | 2 +- docker/development/docker-compose.yml | 2 +- .../docker-compose-openmetadata-postgres.yml | 2 +- .../docker-compose-openmetadata/docker-compose-openmetadata.yml | 2 +- docker/docker-compose-quickstart/docker-compose-postgres.yml | 2 +- docker/docker-compose-quickstart/docker-compose.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/development/docker-compose-postgres.yml b/docker/development/docker-compose-postgres.yml index 87876c4c01b..30398ebe98f 100644 --- a/docker/development/docker-compose-postgres.yml +++ b/docker/development/docker-compose-postgres.yml @@ -192,7 +192,7 @@ services: networks: - local_app_net healthcheck: - test: [ "CMD", "curl", "-f", "http://localhost:8586/healthcheck" ] + test: [ "CMD", "wget", "-q", "--spider", "http://localhost:8586/healthcheck" ] ingestion: build: diff --git a/docker/development/docker-compose.yml b/docker/development/docker-compose.yml index 7c9c3912512..34204673540 100644 --- a/docker/development/docker-compose.yml +++ b/docker/development/docker-compose.yml @@ -193,7 +193,7 @@ services: networks: - local_app_net healthcheck: - test: [ "CMD", "curl", "-f", "http://localhost:8586/healthcheck" ] + test: [ "CMD", "wget", "-q", "--spider", "http://localhost:8586/healthcheck" ] ingestion: build: diff --git a/docker/docker-compose-openmetadata/docker-compose-openmetadata-postgres.yml b/docker/docker-compose-openmetadata/docker-compose-openmetadata-postgres.yml index 34530fa444d..b81bf67e93d 100644 --- a/docker/docker-compose-openmetadata/docker-compose-openmetadata-postgres.yml +++ b/docker/docker-compose-openmetadata/docker-compose-openmetadata-postgres.yml @@ -163,7 +163,7 @@ services: networks: - app_net healthcheck: - test: [ "CMD", "curl", "-f", "http://localhost:8586/healthcheck" ] + test: [ "CMD", "wget", "-q", "--spider", "http://localhost:8586/healthcheck" ] networks: app_net: diff --git a/docker/docker-compose-openmetadata/docker-compose-openmetadata.yml b/docker/docker-compose-openmetadata/docker-compose-openmetadata.yml index ce59170ac04..6bccdb871cf 100644 --- a/docker/docker-compose-openmetadata/docker-compose-openmetadata.yml +++ b/docker/docker-compose-openmetadata/docker-compose-openmetadata.yml @@ -155,7 +155,7 @@ services: networks: - app_net healthcheck: - test: [ "CMD", "curl", "-f", "http://localhost:8586/healthcheck" ] + test: [ "CMD", "wget", "-q", "--spider", "http://localhost:8586/healthcheck" ] networks: app_net: diff --git a/docker/docker-compose-quickstart/docker-compose-postgres.yml b/docker/docker-compose-quickstart/docker-compose-postgres.yml index 49e8567b21a..0f3c52e9cda 100644 --- a/docker/docker-compose-quickstart/docker-compose-postgres.yml +++ b/docker/docker-compose-quickstart/docker-compose-postgres.yml @@ -208,7 +208,7 @@ services: networks: - app_net healthcheck: - test: [ "CMD", "curl", "-f", "http://localhost:8586/healthcheck" ] + test: [ "CMD", "wget", "-q", "--spider", "http://localhost:8586/healthcheck" ] ingestion: container_name: openmetadata_ingestion diff --git a/docker/docker-compose-quickstart/docker-compose.yml b/docker/docker-compose-quickstart/docker-compose.yml index 0d3e767ed88..0888f944d16 100644 --- a/docker/docker-compose-quickstart/docker-compose.yml +++ b/docker/docker-compose-quickstart/docker-compose.yml @@ -208,7 +208,7 @@ services: networks: - app_net healthcheck: - test: [ "CMD", "curl", "-f", "http://localhost:8586/healthcheck" ] + test: [ "CMD", "wget", "-q", "--spider", "http://localhost:8586/healthcheck" ] ingestion: container_name: openmetadata_ingestion