From d31c00939c28f1c85fe4514e6a44fb66cef80ab6 Mon Sep 17 00:00:00 2001
From: Dexter Lee <dexter@acryl.io>
Date: Thu, 2 Jun 2022 01:01:36 -0700
Subject: [PATCH] fix(docker): Fix mysql setup bug (#5071)

---
 docker/docker-compose-without-neo4j.override.yml                | 2 +-
 docker/docker-compose.override.yml                              | 2 +-
 docker/mysql-setup/Dockerfile                                   | 2 +-
 .../quickstart/docker-compose-without-neo4j-m1.quickstart.yml   | 2 +-
 docker/quickstart/docker-compose-without-neo4j.quickstart.yml   | 2 +-
 docker/quickstart/docker-compose.quickstart.yml                 | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker/docker-compose-without-neo4j.override.yml b/docker/docker-compose-without-neo4j.override.yml
index 9f9df9839336d1..e9891abde199ce 100644
--- a/docker/docker-compose-without-neo4j.override.yml
+++ b/docker/docker-compose-without-neo4j.override.yml
@@ -17,7 +17,7 @@ services:
     build:
       context: ../
       dockerfile: docker/mysql-setup/Dockerfile
-    image: acryldata/datahub-mysql-setup:head
+    image: acryldata/datahub-mysql-setup:${DATAHUB_VERSION:-head}
     env_file: mysql-setup/env/docker.env
     hostname: mysql-setup
     container_name: mysql-setup
diff --git a/docker/docker-compose.override.yml b/docker/docker-compose.override.yml
index c1947f1344dce1..b6a095d8836222 100644
--- a/docker/docker-compose.override.yml
+++ b/docker/docker-compose.override.yml
@@ -18,7 +18,7 @@ services:
     build:
       context: ../
       dockerfile: docker/mysql-setup/Dockerfile
-    image: acryldata/datahub-mysql-setup:head
+    image: acryldata/datahub-mysql-setup:${DATAHUB_VERSION:-head}
     env_file: mysql-setup/env/docker.env
     hostname: mysql-setup
     container_name: mysql-setup
diff --git a/docker/mysql-setup/Dockerfile b/docker/mysql-setup/Dockerfile
index 5b19e0ef405f13..1852b70207bd64 100644
--- a/docker/mysql-setup/Dockerfile
+++ b/docker/mysql-setup/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:3
 
 ENV DOCKERIZE_VERSION v0.6.1
-RUN apk add --no-cache mysql-client curl tar \
+RUN apk add --no-cache mysql-client curl tar bash \
     && curl -L https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz | tar -C /usr/local/bin -xzv
 
 COPY docker/mysql-setup/init.sql /init.sql
diff --git a/docker/quickstart/docker-compose-without-neo4j-m1.quickstart.yml b/docker/quickstart/docker-compose-without-neo4j-m1.quickstart.yml
index 605d3b90fe9e78..ed3a2465a772f8 100644
--- a/docker/quickstart/docker-compose-without-neo4j-m1.quickstart.yml
+++ b/docker/quickstart/docker-compose-without-neo4j-m1.quickstart.yml
@@ -153,7 +153,7 @@ services:
     - MYSQL_PASSWORD=datahub
     - DATAHUB_DB_NAME=datahub
     hostname: mysql-setup
-    image: acryldata/datahub-mysql-setup:head
+    image: acryldata/datahub-mysql-setup:${DATAHUB_VERSION:-head}
   schema-registry:
     container_name: schema-registry
     depends_on:
diff --git a/docker/quickstart/docker-compose-without-neo4j.quickstart.yml b/docker/quickstart/docker-compose-without-neo4j.quickstart.yml
index 11cf77968d961b..a7ecacf2acf54a 100644
--- a/docker/quickstart/docker-compose-without-neo4j.quickstart.yml
+++ b/docker/quickstart/docker-compose-without-neo4j.quickstart.yml
@@ -155,7 +155,7 @@ services:
     - MYSQL_PASSWORD=datahub
     - DATAHUB_DB_NAME=datahub
     hostname: mysql-setup
-    image: acryldata/datahub-mysql-setup:head
+    image: acryldata/datahub-mysql-setup:${DATAHUB_VERSION:-head}
   schema-registry:
     container_name: schema-registry
     depends_on:
diff --git a/docker/quickstart/docker-compose.quickstart.yml b/docker/quickstart/docker-compose.quickstart.yml
index 32c7b28b273fb5..435a69ecd0e0b8 100644
--- a/docker/quickstart/docker-compose.quickstart.yml
+++ b/docker/quickstart/docker-compose.quickstart.yml
@@ -161,7 +161,7 @@ services:
     - MYSQL_PASSWORD=datahub
     - DATAHUB_DB_NAME=datahub
     hostname: mysql-setup
-    image: acryldata/datahub-mysql-setup:head
+    image: acryldata/datahub-mysql-setup:${DATAHUB_VERSION:-head}
   neo4j:
     container_name: neo4j
     environment: