From 5c87527516bef27010b76faa57bd85896513d324 Mon Sep 17 00:00:00 2001 From: Hunter Long Date: Fri, 29 Jun 2018 08:16:26 -0700 Subject: [PATCH] docker build --- .travis.yml | 2 +- .travis/build.sh | 4 ++-- Dockerfile | 2 +- database.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 020eb347..9645e0fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ services: env: global: - - VERSION=0.27.2 + - VERSION=0.27.3 - DB_HOST=localhost - DB_USER=travis - DB_PASS= diff --git a/.travis/build.sh b/.travis/build.sh index f41eb112..9cfcf660 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -12,12 +12,12 @@ xgo -go 1.10.x --targets=linux/386 --dest=build -ldflags="-X main.VERSION=$VERSI xgo -go 1.10.x --targets=windows-6.0/amd64 --dest=build -ldflags="-X main.VERSION=$VERSION" ./ xgo -go 1.10.x --targets=linux/arm-7 --dest=build -ldflags="-X main.VERSION=$VERSION" ./ xgo -go 1.10.x --targets=linux/arm64 --dest=build -ldflags="-X main.VERSION=$VERSION" ./ -CGO_ENABLED=0 GOOS=linux go build -ldflags="-X main.VERSION=$VERSION" -a -o build/$APP-linux-alpine . +xgo -go 1.10.x --targets=linux/amd64 --dest=build -ldflags="-X main.VERSION=$VERSION -linkmode external -extldflags -static" -out alpine ./ cd build ls -mv $APP-linux-alpine $APP +mv alpine-linux-amd64 $APP tar -czvf $APP-linux-alpine.tar.gz $APP && rm -f $APP mv $APP-darwin-10.6-amd64 $APP diff --git a/Dockerfile b/Dockerfile index b30056ef..adf80908 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:latest -ENV VERSION=v0.27 +ENV VERSION=v0.27.3 RUN apk --no-cache add libstdc++ ca-certificates RUN wget https://github.com/hunterlong/statup/releases/download/$VERSION/statup-linux-alpine.tar.gz && \ diff --git a/database.go b/database.go index 80104f55..8c943e48 100644 --- a/database.go +++ b/database.go @@ -2,13 +2,13 @@ package main import ( "fmt" + "github.com/hunterlong/statup/log" "time" "upper.io/db.v3" "upper.io/db.v3/lib/sqlbuilder" "upper.io/db.v3/mysql" "upper.io/db.v3/postgresql" "upper.io/db.v3/sqlite" - "github.com/hunterlong/statup/log" ) var (