From 8552c3033e6bdea7a7138077611f1778515e31e8 Mon Sep 17 00:00:00 2001 From: Tobias Bradtke Date: Fri, 1 Jan 2016 16:17:51 +0000 Subject: [PATCH] Some refactoring --- Dockerfile | 2 +- Dockerfile.build | 10 ++++++++++ Dockerfile_armhf | 9 --------- 3 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 Dockerfile.build delete mode 100644 Dockerfile_armhf diff --git a/Dockerfile b/Dockerfile index ea7539c..a668bcb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ENV CADDY_FEATURES "" RUN apk add --update curl \ && rm -rf /var/cache/apk/* -RUN curl -SL "http://caddyserver.com/download/build?os=linux&arch=amd64&features=$CADDY_FEATURES" \ +RUN curl -SL "https://caddyserver.com/download/build?os=linux&arch=arm&features=$CADDY_FEATURES" \ | tar -xz -C /usr/bin \ && chmod u+x /usr/bin/caddy diff --git a/Dockerfile.build b/Dockerfile.build new file mode 100644 index 0000000..b748aff --- /dev/null +++ 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"] diff --git a/Dockerfile_armhf b/Dockerfile_armhf deleted file mode 100644 index 344ec9d..0000000 --- a/Dockerfile_armhf +++ /dev/null @@ -1,9 +0,0 @@ -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 2015 -CMD ["caddy"]