diff --git a/.circleci/config.yml b/.circleci/config.yml
index b5ce7f3423a..37cbf9a4835 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,7 +21,9 @@ jobs:
     working_directory: /go/src/github.com/influxdata/platform
     steps:
       - checkout
-      - run: make nightly
+      - run: |
+          docker login -u "$QUAY_USER" -p $QUAY_PASS quay.io
+          make nightly
 
 
 workflows:
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 30a81a845f2..2afb4f22154 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -62,3 +62,11 @@ s3:
     bucket: dl.influxdata.com
     region: us-east-1
     folder: "flux/nightlies/"
+
+dockers:
+  -
+    binary: fluxd
+    image: quay.io/influxdb/flux
+    dockerfile: docker/flux/Dockerfile
+    extra_files:
+      - docker/flux/entrypoint.sh
diff --git a/Makefile b/Makefile
index 75148cf8527..0769b0d6d5f 100644
--- a/Makefile
+++ b/Makefile
@@ -107,6 +107,7 @@ bench: all
 
 nightly: bin/$(GOOS)/goreleaser all
 	PATH=./bin/$(GOOS):${PATH} goreleaser --snapshot --rm-dist
+	docker push quay.io/influxdb/flux:nightly
 
 # Recursively clean all subdirs
 clean: $(SUBDIRS)
diff --git a/docker/flux/Dockerfile b/docker/flux/Dockerfile
new file mode 100644
index 00000000000..5e72640fcab
--- /dev/null
+++ b/docker/flux/Dockerfile
@@ -0,0 +1,8 @@
+FROM debian:stable-slim
+COPY fluxd /usr/bin/fluxd
+
+EXPOSE 8093
+
+COPY entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["fluxd"]
diff --git a/docker/flux/entrypoint.sh b/docker/flux/entrypoint.sh
new file mode 100755
index 00000000000..2af4476b4a7
--- /dev/null
+++ b/docker/flux/entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+if [ "${1:0:1}" = '-' ]; then
+    set -- fluxd "$@"
+fi
+
+exec "$@"