From 87cbeb4862bf85dbb25d7de1a8f82506a80652ed Mon Sep 17 00:00:00 2001 From: Anders Pitman Date: Tue, 14 Dec 2021 15:04:34 -0700 Subject: [PATCH] Finish removing go rice --- Dockerfile | 4 +--- README.md | 8 -------- release/Dockerfile | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7bcfe68..9522d51 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,13 @@ -FROM golang:1.15-alpine3.12 as builder +FROM golang:1.17-alpine3.15 as builder WORKDIR /build RUN apk add git -RUN go get github.com/GeertJohan/go.rice/rice COPY go.* ./ RUN go mod download COPY . . -RUN rice embed-go RUN cd cmd/boringproxy && CGO_ENABLED=0 go build -o boringproxy FROM scratch diff --git a/README.md b/README.md index f6a4917..ead9829 100644 --- a/README.md +++ b/README.md @@ -40,14 +40,6 @@ source $HOME/.bashrc go build ``` -To embed the web UI into the executable: - -```bash -go get github.com/GeertJohan/go.rice/rice -rice embed-go -go build -``` - # Running ## Server diff --git a/release/Dockerfile b/release/Dockerfile index 6504fa9..1c3a649 100644 --- a/release/Dockerfile +++ b/release/Dockerfile @@ -11,4 +11,3 @@ WORKDIR boringproxy RUN ./scripts/install_go.sh ENV PATH="${PATH}:/usr/local/go/bin" ENV PATH="${PATH}:/root/go/bin" -RUN go get github.com/GeertJohan/go.rice/rice