From 662144f6a0eacfdec5251789b2f308008c825c05 Mon Sep 17 00:00:00 2001
From: colinlyguo <colinlyguo@scroll.io>
Date: Tue, 4 Jun 2024 21:22:58 +0800
Subject: [PATCH] revert alpine changes

---
 Dockerfile                | 4 ++--
 Dockerfile.mockccc.alpine | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f5aa0e86be1f..2f9df0fc6ca0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,9 +35,9 @@ COPY --from=zkp-builder /app/target/release/libzkp.so $SCROLL_LIB_PATH
 COPY --from=zkp-builder /app/target/release/libzktrie.so $SCROLL_LIB_PATH
 
 ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SCROLL_LIB_PATH
-ENV CGO_LDFLAGS="-L$SCROLL_LIB_PATH -Wl,-rpath,$SCROLL_LIB_PATH"
+ENV CGO_LDFLAGS="-ldl,-L$SCROLL_LIB_PATH -Wl,-rpath,$SCROLL_LIB_PATH"
 
-RUN cd /go-ethereum && CGO_LDFLAGS="-ldl" env GO111MODULE=on go run build/ci.go install -buildtags circuit_capacity_checker ./cmd/geth
+RUN cd /go-ethereum && env GO111MODULE=on go run build/ci.go install -buildtags circuit_capacity_checker ./cmd/geth
 
 # Pull Geth into a second stage deploy alpine container
 FROM ubuntu:20.04
diff --git a/Dockerfile.mockccc.alpine b/Dockerfile.mockccc.alpine
index 39d27e5f7c82..77dde0b6c491 100644
--- a/Dockerfile.mockccc.alpine
+++ b/Dockerfile.mockccc.alpine
@@ -8,8 +8,6 @@ FROM golang:1.20-alpine as builder
 
 RUN apk add --no-cache gcc musl-dev linux-headers git
 
-ENV CGO_LDFLAGS="-ldl"
-
 ADD . /go-ethereum
 RUN cd /go-ethereum && go run build/ci.go install ./cmd/geth
 
@@ -17,9 +15,6 @@ RUN cd /go-ethereum && go run build/ci.go install ./cmd/geth
 FROM alpine:latest
 
 RUN apk add --no-cache ca-certificates
-
-ENV CGO_LDFLAGS="-ldl"
-
 COPY --from=builder /go-ethereum/build/bin/geth /usr/local/bin/
 
 EXPOSE 8545 8546 30303 30303/udp