diff --git a/.travis.yml b/.travis.yml
index 27f022d..744c7ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,7 @@
+sudo: required
+services:
+  - docker
+
 language: go
 
 notifications:
@@ -9,9 +13,19 @@ install:
   - go get github.com/golang/lint/golint
   - make deps
 
-script:
-  # TODO: Bring this back: - fgt golint
-  - make test
-
 go:
   - 1.4
+
+script:
+  # TODO: Bring this back: - fgt golint
+  # - make test
+  - CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags "-X main.buildCommit `git describe --long --tags --dirty --always`" ./cmd/ssh-chat
+  - ssh-keygen -f ~/.ssh/id_rsa -t rsa -N ''
+  - cp ~/.ssh/id_rsa id_rsa
+  - docker build -t "$DOCKER_USER"/ssh-chat:latest .
+
+deploy:
+  provider: script
+  script: deploy-docker.sh
+  on:
+    branch: master
diff --git a/Dockerfile b/Dockerfile
index 19253bc..d2228b6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,16 +3,13 @@
 # $ docker build -t ssh-chat .
 # $ docker run -d -p 0.0.0.0:(your host machine port):2022 --name ssh-chat ssh-chat
 #
-FROM golang:1.4
+FROM scratch
 MAINTAINER Alvin Lai <al@alvinlai.com>
 
-RUN apt-get update
-RUN apt-get install -y openssh-client
-
-RUN go get github.com/shazow/ssh-chat
-RUN ssh-keygen -f ~/.ssh/id_rsa -t rsa -N ''
+ADD ssh-chat ssh-chat
+ADD id_rsa id_rsa
 
 EXPOSE 2022
 
-CMD ["-i", "/root/.ssh/id_rsa", "-vv", "--bind", "\":2022\""]
-ENTRYPOINT ["ssh-chat"]
+CMD ["/ssh-chat", "-i", "id_rsa", "-vv", "--bind", "\":2022\""]
+# ENTRYPOINT ["ssh-chat"]
diff --git a/docker-deploy.sh b/docker-deploy.sh
new file mode 100755
index 0000000..e6e232c
--- /dev/null
+++ b/docker-deploy.sh
@@ -0,0 +1,3 @@
+#!/bin/bash -ex
+docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USER" -p="$DOCKER_PASS"
+docker push $DOCKER_USER/ssh-chat:latest