Skip to content

Commit

Permalink
Alpine 3.11 (#8)
Browse files Browse the repository at this point in the history
* switch to alpine-3.11, remove metalinter

* update static ver

* add make
  • Loading branch information
umputun authored Dec 22, 2019
1 parent 2e8c8c8 commit b72e4bd
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 11 deletions.
10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
all: build_app build_go

build_app:
docker build --pull -t umputun/baseimage:app-latest base.alpine -f base.alpine/Dockerfile

build_go:
docker build --pull -t umputun/baseimage:buildgo-latest build.go -f build.go/Dockerfile


.PHONY: all
2 changes: 1 addition & 1 deletion base.alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.10
FROM alpine:3.11

LABEL maintainer="Umputun <[email protected]>"

Expand Down
11 changes: 2 additions & 9 deletions build.go/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ ENV \
CGO_ENABLED=0 \
GOOS=linux \
GOARCH=amd64 \
GOMETALINTER=2.0.12 \
GOVERALLS=0.0.2 \
GOVERALLS=0.0.4 \
GOLANGCI=1.21.0 \
STATIK=0.1.5
STATIK=0.1.6

RUN \
apk add --no-cache --update tzdata git bash curl && \
Expand All @@ -17,12 +16,6 @@ RUN \

RUN \
go version && \
go get -u -v github.com/alecthomas/gometalinter && \
cd /go/src/github.com/alecthomas/gometalinter && \
git checkout v${GOMETALINTER} && \
go install github.com/alecthomas/gometalinter && \
gometalinter --install && \
go get -u -v github.com/GoASTScanner/gas && \
go get -u -v github.com/golang/dep/cmd/dep && \
go get -u -v github.com/kardianos/govendor && \
go get -u -v github.com/jteeuwen/go-bindata/... && \
Expand Down
2 changes: 1 addition & 1 deletion build.go/git-rev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ if [[ ${e:0:1} == "<" ]]; then
ts=$(date -d "@${log_elems[5]}" +'%Y%m%dT%H:%M:%S')
fi

echo $head-$short_hash-$ts
echo "$head"-"$short_hash"-"$ts"

0 comments on commit b72e4bd

Please sign in to comment.