From e68027843d91a754c9c95b76aec620c9e81f6154 Mon Sep 17 00:00:00 2001 From: sneak Date: Sun, 20 Sep 2020 16:11:00 -0700 Subject: [PATCH] might go faster now, who knows --- Dockerfile | 18 ++++++++++++------ Makefile | 8 ++++---- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9428210..346aa55 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,21 @@ +## build image: FROM golang:1.15 as builder -RUN mkdir /build -ADD . /build/ -WORKDIR /build +RUN mkdir -p /go/src/git.eeqj.de/sneak/formless +WORKDIR /go/src/git.eeqj.de/sneak/formless + +COPY go.mod . +COPY go.sum . +RUN go mod download + +ADD . /go/src/git.eeqj.de/sneak/formless/ RUN make build - +## output image: FROM scratch -COPY --from=builder /build/formless /app/formless -COPY --from=builder /go /goarchive +COPY --from=builder /go/src/git.eeqj.de/sneak/formless/formless /app/formless +COPY --from=builder /go /go.archive WORKDIR /app diff --git a/Makefile b/Makefile index c55806d..9b30eea 100644 --- a/Makefile +++ b/Makefile @@ -59,22 +59,22 @@ test: lint build-docker-image is_uncommitted: git diff --exit-code >/dev/null 2>&1 -docker-build: +docker: docker build -t $(IMAGENAME) . build-docker-image-dist: is_uncommitted clean docker build -t $(IMAGENAME):$(VERSION) -t $(IMAGENAME):latest -t $(IMAGENAME):$(BUILDTIMETAG) . -dist: lint docker-build +dist: lint docker -mkdir -p ./output docker run --rm --entrypoint cat $(IMAGENAME) /bin/$(FN) > output/$(FN) docker save $(IMAGENAME) | bzip2 > output/$(BUILDTIMEFILENAME).$(FN).tbz2 hub: upload-docker-image -upload-docker-image: docker-build +upload-docker-image: docker docker push $(IMAGENAME):$(VERSION) docker push $(IMAGENAME):$(BUILDTIMETAG) docker push $(IMAGENAME):latest -.PHONY: build fmt test is_uncommitted docker-build dist hub upload-docker-image clean run rundebug default build-docker-image-dist +.PHONY: build fmt test is_uncommitted docker dist hub upload-docker-image clean run rundebug default build-docker-image-dist