From dceebd433750e6943c0452f026224458148c943c Mon Sep 17 00:00:00 2001 From: Matthew Jaffee Date: Fri, 10 Sep 2021 12:15:34 -0500 Subject: [PATCH] add lattice files back in I think docker-build was failing not because those particular files weren't there, but because the submodule wasn't being fetched... giving that a try. --- Dockerfile | 3 +++ Makefile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fed4ef58b..2a4ef4b83 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,9 @@ ARG GO_VERSION=latest FROM moleculacorp/nodejs:latest as lattice-builder WORKDIR /lattice +COPY lattice/package.json ./ +COPY lattice/yarn.lock ./ + RUN yarn install COPY lattice ./ diff --git a/Makefile b/Makefile index 3dea75928..e7339a9e6 100644 --- a/Makefile +++ b/Makefile @@ -195,7 +195,7 @@ generate-proto-grpc: require-protoc require-protoc-gen-go generate: generate-protoc generate-statik generate-stringer generate-pql # Create Docker image from Dockerfile -docker: vendor +docker: vendor lattice docker build \ --build-arg GO_VERSION=$(GO_VERSION) \ --tag pilosa:$(VERSION) .