From 81c9fc30aa57945b7e183f343598019b75be67d5 Mon Sep 17 00:00:00 2001
From: John Joyce <john@acryl.io>
Date: Thu, 3 Jun 2021 16:25:17 -0700
Subject: [PATCH] feat(datahub-upgrade): Use the "head" image tag.  (#2641)

---
 docker/datahub-upgrade/datahub-upgrade.sh | 2 +-
 docker/datahub-upgrade/env/docker.env     | 3 ---
 docs/advanced/no-code-upgrade.md          | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/docker/datahub-upgrade/datahub-upgrade.sh b/docker/datahub-upgrade/datahub-upgrade.sh
index 698b5c2537..8cbe8f8fd2 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/docker/datahub-upgrade/env/docker.env b/docker/datahub-upgrade/env/docker.env
index 7f9915e7e1..462a6d851a 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=
diff --git a/docs/advanced/no-code-upgrade.md b/docs/advanced/no-code-upgrade.md
index e7ff4c4ec5..c3d11ea223 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