diff --git a/alpine/packages/vsudd/.gitignore b/alpine/packages/vsudd/.gitignore index 50802866b..03530f774 100644 --- a/alpine/packages/vsudd/.gitignore +++ b/alpine/packages/vsudd/.gitignore @@ -1,2 +1,2 @@ -/vsudd -/vendor \ No newline at end of file +vsudd +files diff --git a/alpine/packages/vsudd/Dockerfile b/alpine/packages/vsudd/Dockerfile index 05f84f184..0676ad8f6 100644 --- a/alpine/packages/vsudd/Dockerfile +++ b/alpine/packages/vsudd/Dockerfile @@ -1,13 +1,9 @@ FROM mobylinux/alpine-build-go:30067067003d565887d7efe533eba03ed46038d2 -RUN mkdir -p /go/src/vsudd +COPY ./ /go/src/vsudd/ + WORKDIR /go/src/vsudd -COPY . /go/src/vsudd/ - -ARG GOARCH -ARG GOOS - RUN go install --ldflags '-extldflags "-fno-PIC"' -RUN [ -f /go/bin/*/vsudd ] && mv /go/bin/*/vsudd /go/bin/ || true +CMD ["tar", "cf", "-", "-C", "/go/bin", "vsudd"] diff --git a/alpine/packages/vsudd/Makefile b/alpine/packages/vsudd/Makefile index 1a40be85b..b1e7a52d6 100644 --- a/alpine/packages/vsudd/Makefile +++ b/alpine/packages/vsudd/Makefile @@ -1,15 +1,15 @@ all: vsudd -.PHONY: vendor -vendor: - mkdir -p ./vendor - cp -r ../vendor/* ./vendor/ +files: + ls Dockerfile *.go > files + printf -- '-C\n..\n' >> files + (cd .. && find vendor) >> files -vsudd: Dockerfile main.go vendor - docker build --build-arg GOOS=$(OS) --build-arg GOARCH=$(ARCH) -t vsudd:build . - docker run --rm vsudd:build cat /go/bin/vsudd > vsudd - chmod 755 vsudd +vsudd: Dockerfile $(wildcard *.go) ../vendor/manifest files + tar cf - -T files | docker build -t vsudd:build - + docker run --rm vsudd:build | tar xf - clean: - rm -rf vsudd vendor - docker images -q vsudd:build | xargs docker rmi -f || true + rm -rf vsudd files + +.DELETE_ON_ERROR: