Fix merge conflict

webwurst · Jan 9, 2016 · 372b038 · 372b038
2 parents 6711fa4 + 8552c30
commit 372b038
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/Dockerfile.build b/Dockerfile.build
@@ -0,0 +1,10 @@
+FROM armhfbuild/golang:1.5
+# FROM hypriot/rpi-golang:1.5
+
+RUN go get github.com/mholt/caddy
+
+WORKDIR /
+# RUN printf "0.0.0.0\nbrowse /var/www" > /Caddyfile
+
+EXPOSE 80 443
+CMD ["caddy"]