fix for #78, dockerfile compiles again

This commit is contained in:
Stefan Majer 2020-02-05 21:42:04 +01:00 committed by Dave Anderson
parent e107dcd254
commit 68743c67a6

View File

@ -1,6 +1,6 @@
FROM alpine:3.6 FROM alpine:3.11
MAINTAINER David Anderson <dave@natulte.net> LABEL MAINTAINER David Anderson <dave@natulte.net>
ARG PIXIECORE_SANDBOX=/tmp/sandbox ARG PIXIECORE_SANDBOX=/tmp/sandbox
ARG PIXIECORE_CONTEXT="$PIXIECORE_SANDBOX"/context ARG PIXIECORE_CONTEXT="$PIXIECORE_SANDBOX"/context
@ -15,7 +15,6 @@ RUN set -x;
apk add --virtual .build-deps \ apk add --virtual .build-deps \
git \ git \
go \ go \
glide \
musl-dev; \ musl-dev; \
\ \
# Pixiecore assets \ # Pixiecore assets \
@ -23,8 +22,6 @@ RUN set -x;
REPO=netboot; \ REPO=netboot; \
PKG=cmd/pixiecore; \ PKG=cmd/pixiecore; \
\ \
export GOPATH="$PIXIECORE_SANDBOX"/go; \
export GLIDE_HOME="$PIXIECORE_SANDBOX"; \
\ \
NAMESPACE_PATH="$GOPATH/src/$NAMESPACE"; \ NAMESPACE_PATH="$GOPATH/src/$NAMESPACE"; \
REPO_PATH="$NAMESPACE_PATH/$REPO"; \ REPO_PATH="$NAMESPACE_PATH/$REPO"; \
@ -40,8 +37,6 @@ RUN set -x;
\ \
go get -v -d "$NAMESPACE/$REPO/$PKG"; \ go get -v -d "$NAMESPACE/$REPO/$PKG"; \
cd "$REPO_PATH"; \ cd "$REPO_PATH"; \
glide install; \
go test $(glide nv); \
GOBIN=/usr/local/bin go install -ldflags -s ./"$PKG"; \ GOBIN=/usr/local/bin go install -ldflags -s ./"$PKG"; \
\ \
apk del --purge .build-deps; \ apk del --purge .build-deps; \