clean up diagnostics server build

Signed-off-by: Justin Cormack <justin@specialbusservice.com>
This commit is contained in:
Justin Cormack 2016-09-10 17:46:49 +01:00 committed by Justin Cormack
parent d0c3e873f6
commit 168fdedace
3 changed files with 14 additions and 18 deletions

View File

@ -1,2 +1,2 @@
diagnostics-server
/vendor
files

View File

@ -1,13 +1,9 @@
FROM mobylinux/alpine-build-go:30067067003d565887d7efe533eba03ed46038d2
RUN mkdir -p /go/src/diagnostics
WORKDIR /go/src/diagnostics
COPY ./ /go/src/diagnostics-server/
COPY . /go/src/diagnostics
ARG GOARCH
ARG GOOS
WORKDIR /go/src/diagnostics-server
RUN go install --ldflags '-extldflags "-fno-PIC"'
RUN [ -f /go/bin/*/diagnostics ] && mv /go/bin/*/diagnostics /go/bin/ || true
CMD ["tar", "cf", "-", "-C", "/go/bin", "diagnostics-server"]

View File

@ -1,15 +1,15 @@
all: diagnostics-server
.PHONY: vendor
vendor:
mkdir -p ./vendor
cp -r ../vendor/* ./vendor/
files:
ls Dockerfile *.go > files
printf -- '-C\n..\n' >> files
(cd .. && find vendor) >> files
diagnostics-server: Dockerfile main.go vendor
docker build --build-arg GOOS=$(OS) --build-arg GOARCH=$(ARCH) -t diagnostics:build .
docker run --rm diagnostics:build cat /go/bin/diagnostics > diagnostics-server
chmod 755 diagnostics-server
diagnostics-server: Dockerfile $(wildcard *.go) ../vendor/manifest files
tar cf - -T files | docker build -t diagnostics-server:build -
docker run --rm diagnostics-server:build | tar xf -
clean:
rm -rf diagnostics-server vendor
docker images -q diagnostics:build | xargs docker rmi -f || true
rm -rf diagnostics-server files
.DELETE_ON_ERROR: