diff --git a/docker/datahub-upgrade/README.md b/docker/datahub-upgrade/README.md index 67d157e2a53f2a..c9305e9a0c07e9 100644 --- a/docker/datahub-upgrade/README.md +++ b/docker/datahub-upgrade/README.md @@ -71,7 +71,7 @@ DATAHUB_MAE_CONSUMER_PORT=9091 2. Pull (or build) & execute the `datahub-upgrade` container: ```aidl -docker pull acryldata/datahub-upgrade && docker run --env-file *path-to-custom-env-file.env* acryldata/datahub-upgrade:latest -u NoCodeDataMigration +docker pull acryldata/datahub-upgrade:head && docker run --env-file *path-to-custom-env-file.env* acryldata/datahub-upgrade:head -u NoCodeDataMigration ``` ## Arguments @@ -88,7 +88,7 @@ For example, to run the migration named "NoCodeDataMigration", you would do exec OR ```aidl -docker pull acryldata/datahub-upgrade && docker run --env-file env/docker.env acryldata/datahub-upgrade:latest -u NoCodeDataMigration +docker pull acryldata/datahub-upgrade:head && docker run --env-file env/docker.env acryldata/datahub-upgrade:head -u NoCodeDataMigration ``` In addition to the required `-u` argument, each upgrade may require specific arguments. You can provide arguments to individual @@ -104,5 +104,5 @@ To specify these, you can use a combination of `-a` arguments and of the form *a OR ```aidl -docker pull acryldata/datahub-upgrade && docker run --env-file env/docker.env acryldata/datahub-upgrade:latest -u NoCodeDataMigration -a batchSize=500 -a batchDelayMs=1000 +docker pull acryldata/datahub-upgrade:head && docker run --env-file env/docker.env acryldata/datahub-upgrade:head -u NoCodeDataMigration -a batchSize=500 -a batchDelayMs=1000 ``` \ No newline at end of file diff --git a/docker/datahub-upgrade/datahub-upgrade.sh b/docker/datahub-upgrade/datahub-upgrade.sh index 41cded663313b7..d7acfd0da31929 100755 --- a/docker/datahub-upgrade/datahub-upgrade.sh +++ b/docker/datahub-upgrade/datahub-upgrade.sh @@ -2,4 +2,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" IMAGE=acryldata/datahub-upgrade:head -cd $DIR && docker pull ${IMAGE} && docker run --env-file ./env/docker.env --network="datahub_network" ${IMAGE} "$@" \ No newline at end of file +cd $DIR && docker pull ${IMAGE} && docker run --env-file ./env/docker.env --network="datahub_network" ${IMAGE} "$@" diff --git a/docker/ingestion/ingestion.sh b/docker/ingestion/ingestion.sh index 2ac49f6e7eddfb..6d88b395d759b9 100755 --- a/docker/ingestion/ingestion.sh +++ b/docker/ingestion/ingestion.sh @@ -1,4 +1,5 @@ #!/bin/bash DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +export DATAHUB_VERSION=${DATAHUB_VERSION:-head} cd $DIR && docker-compose pull && docker-compose -p datahub up diff --git a/docker/quickstart-ember.sh b/docker/quickstart-ember.sh index 351ead05323c5f..df4ff0106a93b1 100755 --- a/docker/quickstart-ember.sh +++ b/docker/quickstart-ember.sh @@ -2,6 +2,7 @@ # Quickstarts an Ember-serving variant of DataHub by pulling all images from dockerhub and then running the containers locally. DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +export DATAHUB_VERSION=${DATAHUB_VERSION:-head} cd $DIR && docker-compose -f docker-compose.yml -f docker-compose.override.yml -f docker-compose.ember.yml pull && docker-compose -p datahub \ -f docker-compose.yml \ -f docker-compose.override.yml \ diff --git a/docker/quickstart.sh b/docker/quickstart.sh index c602bc1b49848d..acb48d2cdd68c6 100755 --- a/docker/quickstart.sh +++ b/docker/quickstart.sh @@ -1,7 +1,8 @@ #!/bin/bash # Quickstarts DataHub by pulling all images from dockerhub and then running the containers locally. No images are -# built locally. Note: by default this pulls the latest version; you can change this to a specific version by setting +# built locally. Note: by default this pulls the latest (head) version; you can change this to a specific version by setting # the DATAHUB_VERSION environment variable. +export DATAHUB_VERSION=${DATAHUB_VERSION:-head} DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -cd $DIR && docker-compose pull && docker-compose -p datahub up \ No newline at end of file +cd $DIR && docker-compose pull && docker-compose -p datahub up