From b86676a276298fc347df6fc96bdad8af573bcbf0 Mon Sep 17 00:00:00 2001 From: John Joyce Date: Thu, 3 Jun 2021 14:13:09 -0700 Subject: [PATCH 1/4] Removing debug flag --- docker/datahub-upgrade/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/datahub-upgrade/Dockerfile b/docker/datahub-upgrade/Dockerfile index 2b4c42a6c314e..2974a279f3910 100644 --- a/docker/datahub-upgrade/Dockerfile +++ b/docker/datahub-upgrade/Dockerfile @@ -27,4 +27,4 @@ FROM ${APP_ENV}-install as final RUN addgroup -S datahub && adduser -S datahub -G datahub USER datahub -ENTRYPOINT ["java", "-jar", "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005", "/datahub/datahub-upgrade/bin/datahub-upgrade.jar"] +ENTRYPOINT ["java", "-jar", "/datahub/datahub-upgrade/bin/datahub-upgrade.jar"] From a23dd5285e14e72d0fe15d7feced5d72e5ce364c Mon Sep 17 00:00:00 2001 From: John Joyce Date: Thu, 3 Jun 2021 14:36:28 -0700 Subject: [PATCH 2/4] Using head image version for datahub-upgrade --- docker/datahub-upgrade/datahub-upgrade.sh | 2 +- docs/advanced/no-code-upgrade.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/datahub-upgrade/datahub-upgrade.sh b/docker/datahub-upgrade/datahub-upgrade.sh index 698b5c2537a94..8cbe8f8fd27c3 100755 --- a/docker/datahub-upgrade/datahub-upgrade.sh +++ b/docker/datahub-upgrade/datahub-upgrade.sh @@ -1,4 +1,4 @@ #!/bin/bash DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -cd $DIR && docker pull acryldata/datahub-upgrade:latest && docker run --env-file ./env/docker.env --network="datahub_network" acryldata/datahub-upgrade:latest "$@" \ No newline at end of file +cd $DIR && docker pull acryldata/datahub-upgrade:head && docker run --env-file ./env/docker.env --network="datahub_network" acryldata/datahub-upgrade:latest "$@" \ No newline at end of file diff --git a/docs/advanced/no-code-upgrade.md b/docs/advanced/no-code-upgrade.md index e7ff4c4ec5395..c3d11ea2236e1 100644 --- a/docs/advanced/no-code-upgrade.md +++ b/docs/advanced/no-code-upgrade.md @@ -42,7 +42,7 @@ It is important that the following containers are pulled and deployed simultaneo From the `docker` directory: ```aidl -docker-compose down && docker-compose pull && docker-compose -p datahub up --force-recreate +docker-compose down --remove-orphans && docker-compose pull && docker-compose -p datahub up --force-recreate ``` #### Helm From be1e0f49d94910b4e5b68c22db9a63fd9ca0e468 Mon Sep 17 00:00:00 2001 From: John Joyce Date: Thu, 3 Jun 2021 14:37:57 -0700 Subject: [PATCH 3/4] Remove unnecessary change --- docker/datahub-upgrade/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/datahub-upgrade/Dockerfile b/docker/datahub-upgrade/Dockerfile index 2974a279f3910..2b4c42a6c314e 100644 --- a/docker/datahub-upgrade/Dockerfile +++ b/docker/datahub-upgrade/Dockerfile @@ -27,4 +27,4 @@ FROM ${APP_ENV}-install as final RUN addgroup -S datahub && adduser -S datahub -G datahub USER datahub -ENTRYPOINT ["java", "-jar", "/datahub/datahub-upgrade/bin/datahub-upgrade.jar"] +ENTRYPOINT ["java", "-jar", "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005", "/datahub/datahub-upgrade/bin/datahub-upgrade.jar"] From 3c9422134c0d73d146766ec81dec3496dc46fe3c Mon Sep 17 00:00:00 2001 From: John Joyce Date: Thu, 3 Jun 2021 14:42:08 -0700 Subject: [PATCH 4/4] Remove duplicate env var --- docker/datahub-upgrade/env/docker.env | 3 --- 1 file changed, 3 deletions(-) diff --git a/docker/datahub-upgrade/env/docker.env b/docker/datahub-upgrade/env/docker.env index 7f9915e7e12f0..462a6d851ad63 100644 --- a/docker/datahub-upgrade/env/docker.env +++ b/docker/datahub-upgrade/env/docker.env @@ -21,9 +21,6 @@ DATAHUB_GMS_PORT=8080 DATAHUB_MAE_CONSUMER_HOST=datahub-mae-consumer DATAHUB_MAE_CONSUMER_PORT=9091 -DATAHUB_MAE_CONSUMER_PORT=9091 -DATAHUB_MAE_CONSUMER_HOST=datahub-mae-consumer - # Uncomment and set these to support SSL connection to Elasticsearch # ELASTICSEARCH_USE_SSL= # ELASTICSEARCH_SSL_PROTOCOL=