diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..95d7144 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,2 @@ +Dockerfile +.git/ diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index acaba64..0000000 --- a/.travis.yml +++ /dev/null @@ -1,23 +0,0 @@ -language: go - -env: -- GO111MODULE=on - -go: -- 1.11rc1 - -# no need to run go get -install: true - -script: -- go build -v -o bin/badgerodon-www . - -deploy: - provider: releases - skip_cleanup: true - api_key: - secure: BdE58O0et+vN/OF89RedLRrieqQul1/Z3tZQs5bcmZdDlVeKFTX6eb0JTXOOFZr/h8UFy3JAX29lH+ZLEUQXHXVhuiRrFFpM2sQ1tuqrTEaPkrOrv0ybaUif+eFDiUP512xMdC9tR6rkW9L2wXwaGkxr7Lp5fTnDjJxi1ylBmrkn+1QcgjDn3pb5JZKedCjkcvcdsllo6Mp0mYWlfDJpm0XS0dZMeGtUpr2k4wakdpXCeh2PrgEpOByFaHORBgKkxe/AzblQyF8RtWk6qLRrgGQfs3cB9hMm++ruEUGhHPk8fz/n8QJ8jy0JMfHn+mGOfDYlzy9F6NwcTYT1JOVE5IR+jiPDY0ze6xpRBXuX9Mij0XDDAoaj4TRPi0MUsB+C97FKxdO2FaO5EsP2awB1XzeZe72kH+ywPtDf7Yx7e7uwY6PjnN1ilwFRrLiIfsQDZt1+dDiodpTE6dfMrteMZz/lrs2BLjzGsY0POr5mR1rn7E6yelRpkgBqWB+psDoTX2g3x2yAmAnmR2gkGUcuvhtTYrOW6CjVo2zp5fWgCyJjVClvMUyN6UHCXNyAx4csZ8DVDkQmU3640b/8BhgRmOMX9jaloApBOp7GXdKHhc795Me9D/hMkNL6vjKM3NYpljrHAVJ0Cps1TDh+3+wB9IQn8c2PBDnXS4j47ChhPqs= - file: bin/badgerodon-www - on: - repo: badgerodon/www - tags: true diff --git a/Dockerfile b/Dockerfile index b364acb..909faaa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,21 @@ -FROM golang:1.9-alpine as builder -RUN apk --no-cache add musl-dev build-base -WORKDIR /go/src/app -COPY . . -RUN go build -o /bin/app . - -FROM alpine:3.6 -RUN apk --no-cache add ca-certificates -WORKDIR /root -COPY --from=0 /bin/app /root/app -COPY ./assets /root/assets -COPY ./tpl /root/tpl -CMD ["./app"] - -EXPOSE 80 +FROM golang:1.13-rc-alpine + +RUN apk add --update \ + build-base \ + ca-certificates \ + musl-dev \ + git \ + && rm -rf /var/cache/apk/* + +RUN echo "nobody:x:65534:65534:Nobody:/:" > /etc_passwd + +ENV GO111MODULE=on + +WORKDIR /go/src/github.com/badgerodon/www +COPY go.mod go.sum ./ +RUN go mod download + +COPY . ./ +RUN go install -ldflags='-s -w' -tags netgo -installsuffix netgo -v ./... + +CMD ["/go/bin/www"] diff --git a/build.dockerfile b/build.dockerfile deleted file mode 100644 index 83a1d35..0000000 --- a/build.dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM alpine:3.5 -RUN apk --no-cache add build-base go musl-dev git xz - -ENV GOPATH /root -WORKDIR /root/src/github.com/badgerodon/www -COPY assets assets -COPY tpl tpl -COPY vendor vendor -COPY main.go main.go - -RUN go build -o badgerodon-www . -RUN tar -cvJf /tmp/badgerodon-www.tar.xz ./tpl ./assets ./badgerodon-www -RUN ls /tmp diff --git a/build.sh b/build.sh deleted file mode 100755 index 9281b91..0000000 --- a/build.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -set -e - -mkdir -p dist - -docker build . -f build.dockerfile -t badgerodon-www-build -docker create --name extract badgerodon-www-build:latest -docker cp extract:/tmp/badgerodon-www.tar.xz dist/badgerodon-www.tar.xz -docker rm -f extract diff --git a/go.mod b/go.mod index 4a0c349..564325a 100644 --- a/go.mod +++ b/go.mod @@ -7,3 +7,5 @@ require ( github.com/badgerodon/statistics v0.0.0-20131221025257-85bdd4e56e4c golang.org/x/net v0.0.0-20170922011244-0744d001aa84 ) + +go 1.13 diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..6282eac --- /dev/null +++ b/go.sum @@ -0,0 +1,10 @@ +github.com/badgerodon/lalg v0.0.0-20131221025232-d98d02968c5b h1:DebipT/HrvmO+hGE6LPnphZ28+fe5dkTjOgxND+wDmM= +github.com/badgerodon/lalg v0.0.0-20131221025232-d98d02968c5b/go.mod h1:KJE7fIWVRfU1GQxeBHFJlUtrXsxboK2KxbyzTEjLWbo= +github.com/badgerodon/quadprog v0.0.0-20170722135126-99da70fa15d4 h1:Kd8/F1rpafyZ9qn/yumntlq6ugWIpm3rzeeMKim61K0= +github.com/badgerodon/quadprog v0.0.0-20170722135126-99da70fa15d4/go.mod h1:A9oxBime5oC2WvJ9fzaVUby/g6x+2AZDm6WvLthVRbs= +github.com/badgerodon/rbsa v0.0.0-20131221025205-465af9ff0d02 h1:jJFizI4pzr4IquL3NwesVpwi4pnyYOD89bpT4KW5CJU= +github.com/badgerodon/rbsa v0.0.0-20131221025205-465af9ff0d02/go.mod h1:YiazWXavVMpYvf5xqbaBt4LWzLlvk9B4RzhUGpJYIS4= +github.com/badgerodon/statistics v0.0.0-20131221025257-85bdd4e56e4c h1:znvoHaKfVLHRBbwrHapJkz4lQiTvtLOgZWQ4M2QrPac= +github.com/badgerodon/statistics v0.0.0-20131221025257-85bdd4e56e4c/go.mod h1:FRDUQ/ZQXLi/44kAf31FKJpcJklfxzTjbfiji+qA/iY= +golang.org/x/net v0.0.0-20170922011244-0744d001aa84 h1:FFXeeSR9Hq1BBmpYJonYmvi9cTbUHJnNAASHkdlc0Zs= +golang.org/x/net v0.0.0-20170922011244-0744d001aa84/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=