diff --git a/Cargo.toml b/Cargo.toml
index 9795cb68b445..351523d74c36 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,7 +20,7 @@ members = [
     "datafusion",
     "datafusion-cli",
     "datafusion-examples",
-	"benchmarks",
+    "benchmarks",
     "ballista/rust/client",
     "ballista/rust/core",
     "ballista/rust/executor",
diff --git a/datafusion-cli/Dockerfile b/datafusion-cli/Dockerfile
index 32bd38b9419d..2a8ab16a2554 100644
--- a/datafusion-cli/Dockerfile
+++ b/datafusion-cli/Dockerfile
@@ -15,14 +15,20 @@
 # specific language governing permissions and limitations
 # under the License.
 
-FROM rust:latest
+FROM rust:latest as builder
 
+COPY ./datafusion /usr/src/datafusion
 
-COPY ./datafusion ./usr/src/datafusion
-COPY ./datafusion-cli ./usr/src/datafusion-cli
+COPY ./datafusion-cli /usr/src/datafusion-cli
 
 WORKDIR /usr/src/datafusion-cli
-RUN cargo install --path .
 
+RUN cargo build --release
 
-CMD ["datafusion-cli", "--data-path", "/data"]
+FROM debian:buster-slim
+
+COPY --from=builder /usr/src/datafusion-cli/target/release/datafusion-cli /usr/local/bin
+
+ENTRYPOINT ["datafusion-cli"]
+
+CMD ["--data-path", "/data"]