dockerfile: get rid of make and env, see if that fixes builds

bb0191f2 · Péter Szilágyi · c6195623 · bb0191f2 · bb0191f2
隐藏空白更改
内联并排

Showing with 4 addition and 4 deletion

Dockerfile Dockerfile +2 -2

Dockerfile.alltools Dockerfile.alltools +2 -2

未找到文件。
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,10 +6,10 @@ ARG BUILDNUM=""
 # Build Geth in a stock Go builder container
 FROM golang:1.16-alpine as builder

-RUN apk add --no-cache make gcc musl-dev linux-headers git
+RUN apk add --no-cache gcc musl-dev linux-headers git

 ADD . /go-ethereum
-RUN cd /go-ethereum && make geth
+RUN cd /go-ethereum && go run build/ci.go install ./cmd/geth

 # Pull Geth into a second stage deploy alpine container
 FROM alpine:latest

--- a/Dockerfile.alltools
+++ b/Dockerfile.alltools
@@ -6,10 +6,10 @@ ARG BUILDNUM=""
 # Build Geth in a stock Go builder container
 FROM golang:1.16-alpine as builder

-RUN apk add --no-cache make gcc musl-dev linux-headers git
+RUN apk add --no-cache gcc musl-dev linux-headers git

 ADD . /go-ethereum
-RUN cd /go-ethereum && make all
+RUN cd /go-ethereum && go run build/ci.go install

 # Pull all binaries into a second stage deploy alpine container
 FROM alpine:latest