diff --git a/Dockerfile b/Dockerfile index 14c4106..a08ba1c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,8 +34,6 @@ RUN rm -rf /usr/local/go && \ tar -C /usr/local -xzf go*.linux-$(uname -m).tar.gz && \ echo 'export PATH=$PATH:/usr/local/go/bin' >> /etc/profile -RUN mkdir -p "$(go env GOMODCACHE)" && cd $(go env GOMODCACHE) && tar xvf /tmp/modcache.tar && rm /tmp/modcache.tar && cd /tmp - RUN \ go install -v google.golang.org/protobuf/cmd/protoc-gen-go@v1.28.1 && \ go install -v github.com/golangci/golangci-lint/cmd/golangci-lint@v1.50.1 && \ diff --git a/Makefile b/Makefile index 3fc842b..fd7286c 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ default: save clean: rm -v $(D)/*.tzst -build: deps/modcache.tar +build: docker build \ -t $(RN):$(GITREV) \ -t $(RN):latest \ @@ -42,6 +42,3 @@ push: docker push $(RN):$(GITREV) docker push $(RN):latest docker push $(RN):$(shell git branch --show-current) - -deps/modcache.tar: - cd $(shell go env GOMODCACHE)/ && tar -c . | pv > $(PWD)/deps/modcache.tar