From 885a43709e863efb0b5dd2067215711f6474c950 Mon Sep 17 00:00:00 2001 From: sneak Date: Thu, 29 Oct 2020 06:44:47 -0700 Subject: [PATCH] install rice during docker build --- Dockerfile | 2 +- Makefile | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a7a5f1e..414be5e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ RUN go mod download COPY ./ ./ #RUN make lint -RUN make httpd +RUN make rice-install && make httpd RUN go mod vendor RUN tar -c . | bzip2 > /src.tbz2 diff --git a/Makefile b/Makefile index 976b1e9..58e06dc 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,9 @@ docker: cd ../.. && \ rice append -i ./httpserver --exec ./httpd -tools: +tools: rice-install go get -v github.com/golangci/golangci-lint/cmd/golangci-lint@v1.31.0 go get -v mvdan.cc/gofumpt/gofumports + +rice-install: go get -v github.com/GeertJohan/go.rice/rice