Add --tag arg to docker/up.sh

docker-compose.seed.yml

@@ -1,7 +1,7 @@
 version: "3.7"
 services:
  seed_marquez:
- image: marquezproject/marquez:latest
+ image: "marquezproject/marquez:${TAG}"
  environment:
  - MARQUEZ_HOST=api
  - MARQUEZ_PORT=5000

docker-compose.yml

@@ -1,7 +1,7 @@
 version: "3.7"
 services:
  api:
- image: marquezproject/marquez:latest
+ image: "marquezproject/marquez:${TAG}"
  ports:
  - "5000:5000"
  - "5001:5001"
@@ -14,7 +14,7 @@ services:
  entrypoint: ["./wait-for-it.sh", "db:5432", "--", "./entrypoint.sh"]
 
  web:
- image: marquezproject/marquez-web:latest
+ image: "marquezproject/marquez-web:${TAG}"
  environment:
  - MARQUEZ_HOST=api
  - MARQUEZ_PORT=5000

docker/up.sh

@@ -12,12 +12,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Usage: $ ./up.sh [--build | --pull] [--seed]
+# Usage: $ ./up.sh [--tag TAG] [--build] [--seed]
 
 set -e
 
 usage() {
- echo "usage: ./$(basename -- ${0}) [--build | --pull] [--seed]"
+ echo "usage: ./$(basename -- ${0}) [--tag TAG] [--build] [--seed]"
+ echo
+ echo "A script used to run Marquez via Docker"
+ echo
+ echo "Examples:"
+ echo " # Build image from source"
+ echo " $ ./up.sh --build"
+ echo
+ echo " # Build image from source, then seed HTTP server with metadata"
+ echo " $ ./up.sh --build --seed"
+ echo
+ echo " # Build tagged image"
+ echo " ./up.sh --tag X.Y.X"
+ echo
+ echo " # Build tagged image, then seed HTTP server with metadata"
+ echo " ./up.sh --tag X.Y.X --seed"
+ echo
+ echo
+ echo "Arguments:"
+ echo " -t, --tag string image tag (default: latest)"
+ echo " -b, --build build image from source"
+ echo " -s, --seed seed HTTP server with metadata"
+ echo " -h, --help show help for script"
  exit 1
 }
 
@@ -28,14 +50,16 @@ cd "${project_root}"
 compose_files="-f docker-compose.yml"
 args="-V --force-recreate"
 
+TAG="latest"
 while [ $# -gt 0 ]; do
  case $1 in
+ '--tag'|-t)
+ shift
+ TAG="${1}"
+ ;;
  '--build'|-b)
  BUILD='true'
  ;;
- '--pull'|-p)
- PULL='true'
- ;;
  '--seed'|-s)
  SEED='true'
  ;;
@@ -53,12 +77,10 @@ done
 if [[ "${BUILD}" = "true" ]]; then
  compose_files+=" -f docker-compose.dev.yml"
  args+=" --build"
-elif [[ "${PULL}" = "true" ]]; then
- docker-compose pull
 fi
 
 if [[ "${SEED}" = "true" ]]; then
  compose_files+=" -f docker-compose.seed.yml"
 fi
 
-docker-compose $compose_files up $args
+TAG=${TAG} docker-compose $compose_files up $args