Merged hotfix/fixed_build into master

aacebedo · Mar 6, 2017 · 0b4903d · 0b4903d
2 parents 8d0d190 + c174240
commit 0b4903d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/Rockerfile b/Rockerfile
@@ -28,15 +28,14 @@
 {{$SRC_DIR:= (or .SRC_DIR ".")}}
 
 # build image
-FROM alpine
-
+FROM alpine:3.4
 RUN apk update
 RUN apk upgrade
 RUN apk add go>{{$GOLANG_VERSION}} go-tools>{{$GOLANG_VERSION}} git musl-dev
 
-ENV GOPATH /go
-ENV PATH ${PATH}:/go/bin
-ENV CGO_ENABLED 0
+ENV GOPATH=/go
+ENV PATH=${PATH}:/go/bin
+ENV CGO_ENABLED=0
 
 RUN go get -v github.com/tools/godep
 RUN go get -u github.com/golang/lint/golint

diff --git a/src/core/docker.go b/src/core/docker.go
@@ -1,4 +1,4 @@
-twitch/* docker.go
+/* docker.go
  *
  * Copyright (C) 2016 Alexandre ACEBEDO
  *