From 4b024782105b62996382e0d71dd3ba7af3ff7a96 Mon Sep 17 00:00:00 2001 From: waseem Date: Tue, 15 Oct 2019 08:03:09 +0200 Subject: [PATCH] Use go mod to download dependencies --- Makefile | 3 +-- build/package/Dockerfile.build | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 5d31288..a27f5a7 100644 --- a/Makefile +++ b/Makefile @@ -13,14 +13,13 @@ VERSION=$(shell cat .version) BUILD= GOCMD = go -GLIDECMD = glide GOFLAGS ?= $(GOFLAGS:) LDFLAGS = default: build test install: - "$(GLIDECMD)" install --strip-vendor + "$(GOCMD)" mod download build: "$(GOCMD)" build ${GOFLAGS} ${LDFLAGS} -o "${BINARY}" diff --git a/build/package/Dockerfile.build b/build/package/Dockerfile.build index 1bfeb2c..70efd34 100644 --- a/build/package/Dockerfile.build +++ b/build/package/Dockerfile.build @@ -1,4 +1,4 @@ -FROM stakater/go-glide:1.12.6 +FROM golang:1.13.1-alpine MAINTAINER "Stakater Team" RUN apk update @@ -11,7 +11,7 @@ RUN apk -v --update \ ADD . "$GOPATH/src/github.com/stakater/Reloader" RUN cd "$GOPATH/src/github.com/stakater/Reloader" && \ - glide install --strip-vendor && \ + go mod download && \ CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a --installsuffix cgo --ldflags="-s" -o /Reloader COPY build/package/Dockerfile.run /