From bb0191f22bae96c842bd8729ab8c958d90a46dad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Tue, 6 Jul 2021 09:29:55 +0300
Subject: [PATCH] dockerfile: get rid of make and env, see if that fixes builds

---
 Dockerfile          | 4 ++--
 Dockerfile.alltools | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c0243adc3..e76c5765b 100644
--- 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
diff --git a/Dockerfile.alltools b/Dockerfile.alltools
index 1a2689690..71f63b7a4 100644
--- 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
-- 
GitLab