diff --git a/.goreleaser.yml b/.goreleaser.yml
index 2afb4f2215..0485f89ba1 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -40,7 +40,26 @@ builds:
     main: ./cmd/influx/
     ldflags: -s -w -X main.commit={{.Commit}}
     binary: influx
-
+  - goos:
+    - linux
+    - darwin
+    - windows
+    goarch:
+    - amd64
+    - 386
+    - arm
+    - arm64
+    goarm:
+    - 6
+    - 7
+    ignore:
+      - goos: darwin
+        goarch: 386
+      - goos: windows
+        goarch: 386
+    main: ./cmd/influxd/
+    ldflags: -s -w -X main.commit={{.Commit}}
+    binary: influxd
 
 archive:
   format: tar.gz
@@ -70,3 +89,9 @@ dockers:
     dockerfile: docker/flux/Dockerfile
     extra_files:
       - docker/flux/entrypoint.sh
+  -
+    binary: influxd
+    image: quay.io/influxdb/influx
+    dockerfile: docker/influxd/Dockerfile
+    extra_files:
+      - docker/influxd/entrypoint.sh
diff --git a/docker/influxd/Dockerfile b/docker/influxd/Dockerfile
new file mode 100644
index 0000000000..e1e302f542
--- /dev/null
+++ b/docker/influxd/Dockerfile
@@ -0,0 +1,8 @@
+FROM debian:stable-slim
+COPY influxd /usr/bin/influxd
+
+EXPOSE 9999
+
+COPY entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["influxd"]
diff --git a/docker/influxd/entrypoint.sh b/docker/influxd/entrypoint.sh
new file mode 100755
index 0000000000..5a4724fcc5
--- /dev/null
+++ b/docker/influxd/entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+if [ "${1:0:1}" = '-' ]; then
+    set -- influxd "$@"
+fi
+
+exec "$@"