Skip to content

Commit d081c93

Browse files
authored
Merge pull request #23167 from karalabe/docker-nomake
dockerfile: get rid of make and env, see if that fixes builds
2 parents c619562 + bb0191f commit d081c93

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ ARG BUILDNUM=""
66
# Build Geth in a stock Go builder container
77
FROM golang:1.16-alpine as builder
88

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

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

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

Dockerfile.alltools

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ ARG BUILDNUM=""
66
# Build Geth in a stock Go builder container
77
FROM golang:1.16-alpine as builder
88

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

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

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

0 commit comments

Comments
 (0)