Sitelet https://github.com/Fantom-foundation/Sonic/commit/d47b8c7104527a97f2188cb97382d10d3a8f71d5
Skip to content

Commit d47b8c7

Browse files
rus-alexrus-alex
committed
try GOPROXY env
1 parent 41a0df6 commit d47b8c7

5 files changed

Lines changed: 27 additions & 3 deletions

File tree

‎Makefile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
.PHONY: all
22
all: opera
33

4+
GOPROXY ?= "https://proxy.golang.org,direct"
45
.PHONY: opera
56
opera:
7+
echo PROXY=$(go env | grep GOPROXY)
68
GIT_COMMIT=`git rev-list -1 HEAD 2>/dev/null || echo ""` && \
79
GIT_DATE=`git log -1 --date=short --pretty=format:%ct 2>/dev/null || echo ""` && \
810
go build \
911
-ldflags "-s -w -X github.com/Fantom-foundation/go-opera/cmd/opera/launcher.gitCommit=$${GIT_COMMIT} -X github.com/Fantom-foundation/go-opera/cmd/opera/launcher.gitDate=$${GIT_DATE}" \
1012
-o build/opera \
1113
./cmd/opera
1214

15+
1316
TAG ?= "latest"
1417
.PHONY: opera-image
1518
opera-image:
1619
docker build \
1720
--network=host \
18-
--build-arg GOPROXY=$(GOPROXY) \
1921
-f ./docker/Dockerfile.opera -t "opera:$(TAG)" .
2022

2123
.PHONY: test

‎docker/Dockerfile‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM fedora:34
2+
RUN dnf install -y git make gcc gcc-c++ which iproute iputils procps-ng vim-minimal tmux net-tools htop tar jq npm openssl-devel perl rust cargo golang
3+
4+
ADD https://github.com/Fantom-foundation/go-opera/archive/refs/tags/v1.1.0-rc.5.tar.gz /go-opera/
5+
RUN echo BEFORE && go env | grep GOPROXY
6+
ENV GOPROXY=
7+
RUN echo AFTER && go env | grep GOPROXY
8+
RUN cd /go-opera && tar -xvf * && cd ./go-opera-1.1.0-rc.5 && make opera && mv ./build/opera /usr/bin/opera

‎docker/Dockerfile.1‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM fedora:34
2+
RUN dnf install -y git make gcc gcc-c++ which iproute iputils procps-ng vim-minimal tmux net-tools htop tar jq npm openssl-devel perl rust cargo golang
3+
4+
WORKDIR /go-opera
5+
COPY . .
6+
ENV GOPROXY="https://proxy.golang.org,direct"
7+
RUN go env | grep GOPROXY
8+
RUN make opera

‎go.mod‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ require (
4444
gopkg.in/urfave/cli.v1 v1.20.0
4545
)
4646

47-
replace github.com/ethereum/go-ethereum => github.com/Fantom-foundation/go-ethereum v1.10.8-ftm-rc4
48-
4947
replace github.com/dvyukov/go-fuzz => github.com/guzenok/go-fuzz v0.0.0-20210103140116-f9104dfb626f
48+
49+
// replace github.com/ethereum/go-ethereum => github.com/Fantom-foundation/go-ethereum v1.10.8-ftm-rc4
50+
replace github.com/ethereum/go-ethereum => github.com/Fantom-foundation/go-ethereum v0.0.0-20220304144144-778b9501ac74
51+

‎go.sum‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbt
3434
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
3535
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
3636
github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
37+
github.com/Fantom-foundation/go-ethereum v0.0.0-20220304144144-778b9501ac74 h1:hEvuo/WjnMZFK9nqKxyv4J6iVXsqRYosRaHUSA1xU2A=
38+
github.com/Fantom-foundation/go-ethereum v0.0.0-20220304144144-778b9501ac74/go.mod h1:IeQDjWCNBj/QiWIPosfF6/kRC6pHPNs7W7LfBzjj+P4=
3739
github.com/Fantom-foundation/go-ethereum v1.10.8-ftm-rc4 h1:cbRQ6s/5eb/6r4juEm1K/GlzpVNdVYfQAQYp3ZsFnpw=
3840
github.com/Fantom-foundation/go-ethereum v1.10.8-ftm-rc4/go.mod h1:IeQDjWCNBj/QiWIPosfF6/kRC6pHPNs7W7LfBzjj+P4=
3941
github.com/Fantom-foundation/lachesis-base v0.0.0-20220103160934-6b4931c60582 h1:gDEbOynFwS7sp19XrtWnA1nEhSIXXO5DuAuT5h/nZgY=
@@ -119,6 +121,8 @@ github.com/docker/docker v1.13.1 h1:IkZjBSIc8hBjLpqeAbeE5mca5mNgeatLHBy3GO78BWo=
119121
github.com/docker/docker v1.13.1/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
120122
github.com/dop251/goja v0.0.0-20200721192441-a695b0cdd498 h1:Y9vTBSsV4hSwPSj4bacAU/eSnV3dAxVpepaghAdhGoQ=
121123
github.com/dop251/goja v0.0.0-20200721192441-a695b0cdd498/go.mod h1:Mw6PkjjMXWbTj+nnj4s3QPXq1jaT0s5pC0iFD4+BOAA=
124+
github.com/dvyukov/go-fuzz v0.0.0-20201127111758-49e582c6c23d h1:e1v4V9Heb+c4xQCCONROFvlzNs6Gq8aRZRwt+WzSEqY=
125+
github.com/dvyukov/go-fuzz v0.0.0-20201127111758-49e582c6c23d/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw=
122126
github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts=
123127
github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw=
124128
github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=

0 commit comments

Comments
 (0)