From d4117f3137e9259d2e18ca8b3c19f5d0599dabb1 Mon Sep 17 00:00:00 2001 From: Cody Soyland Date: Fri, 20 Dec 2019 16:05:18 -0600 Subject: [PATCH] Vendor modules before building docker image so private modules can be downloaded --- Dockerfile | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1bcabbdab..01f3a0341 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG MAKE_FLAGS COPY . pilosa -RUN cd pilosa && CGO_ENABLED=0 make install FLAGS="-a ${BUILD_FLAGS}" ${MAKE_FLAGS} +RUN cd pilosa && CGO_ENABLED=0 make install FLAGS="-a -mod=vendor ${BUILD_FLAGS}" ${MAKE_FLAGS} FROM alpine:3.9.4 diff --git a/Makefile b/Makefile index 9d24ae75f..a4726b575 100644 --- a/Makefile +++ b/Makefile @@ -131,12 +131,12 @@ generate-proto-grpc: require-protoc require-protoc-gen-gofast generate: generate-protoc generate-stringer generate-pql # Create Docker image from Dockerfile -docker: +docker: vendor docker build --build-arg BUILD_FLAGS="${FLAGS}" -t "pilosa:$(VERSION)" . @echo Created docker image: pilosa:$(VERSION) # Create Docker image from Dockerfile (enterprise) -docker-enterprise: +docker-enterprise: vendor docker build --build-arg MAKE_FLAGS="ENTERPRISE=1" -t "pilosa-enterprise:$(VERSION)" . @echo Created docker image: pilosa-enterprise:$(VERSION)