Dockerfile: switch to go1.17 and alpine3.14 (#2766)

This commit is contained in:
Alex Sharov 2021-10-04 08:04:38 +07:00 committed by GitHub
parent f70dd63a30
commit b890e973db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions

View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
FROM docker.io/library/golang:1.16-alpine3.13 AS builder
FROM docker.io/library/golang:1.17-alpine3.14 AS builder
RUN apk --no-cache add make gcc g++ linux-headers git bash ca-certificates libgcc libstdc++
@ -9,7 +9,7 @@ ADD . .
# expect that host run `git submodule update --init`
RUN make erigon rpcdaemon integration sentry
FROM docker.io/library/alpine:3.13
FROM docker.io/library/alpine:3.14
RUN apk add --no-cache ca-certificates libgcc libstdc++ tzdata
COPY --from=builder /app/build/bin/* /usr/local/bin/

View File

@ -47,8 +47,8 @@ Will add this part soon [tbd]
[x] Notify about new pending transactions - we sending more than need
[x] Handle "NewBlock" message with 200K transactions re-calculation - in under 50ms
[x] Add --txpool.globalslots, --txpool.globalqueue,--txpool.globalbasefeeeslots
[] Add --txpool.accountslots
[] Add --txpool.pricelimit
[x] Add --txpool.accountslots
[x] Add --txpool.pricelimit
[] Add way for simple introspection - where is tx and why
[] Hard-forks support (now rules are parsed ones on txPool start)
[] Add pool to docker-compose

View File

@ -40,7 +40,7 @@ services:
rpcdaemon:
image: thorax/erigon:latest
command: rpcdaemon --datadir=/home/erigon/.local/share/erigon --private.api.addr=erigon:9090 --http.addr=0.0.0.0 --http.vhosts=* --http.corsdomain=* --http.api=eth,debug,net
command: rpcdaemon --datadir=/home/erigon/.local/share/erigon --private.api.addr=erigon:9090 --http.addr=0.0.0.0 --http.vhosts=* --http.corsdomain=* --http.api=eth,debug,net --ws
pid: service:erigon # Use erigon's PID namespace. It's required to open Erigon's DB from another process (RPCDaemon local-mode)
volumes:
- ${XDG_DATA_HOME:-~/.local/share}/erigon:/home/erigon/.local/share/erigon

2
go.mod
View File

@ -37,7 +37,7 @@ require (
github.com/json-iterator/go v1.1.12
github.com/julienschmidt/httprouter v1.3.0
github.com/kevinburke/go-bindata v3.21.0+incompatible
github.com/ledgerwatch/erigon-lib v0.0.0-20211003025114-9e2553724f8d
github.com/ledgerwatch/erigon-lib v0.0.0-20211003063209-b50d5c185ce1
github.com/ledgerwatch/log/v3 v3.3.1
github.com/ledgerwatch/secp256k1 v0.0.0-20210626115225-cd5cd00ed72d
github.com/logrusorgru/aurora/v3 v3.0.0

4
go.sum
View File

@ -499,8 +499,8 @@ github.com/kylelemons/godebug v0.0.0-20170224010052-a616ab194758 h1:0D5M2HQSGD3P
github.com/kylelemons/godebug v0.0.0-20170224010052-a616ab194758/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c=
github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8=
github.com/ledgerwatch/erigon-lib v0.0.0-20211003025114-9e2553724f8d h1:nNiEzdwlaS+JC/ahIgK7lmcdyGD+HMGK2CBnSP9OYbQ=
github.com/ledgerwatch/erigon-lib v0.0.0-20211003025114-9e2553724f8d/go.mod h1:R65M7eqckpbB9f4+WG6ftXVgPX2U1RhgrKE8lYgLzPI=
github.com/ledgerwatch/erigon-lib v0.0.0-20211003063209-b50d5c185ce1 h1:jgltq2H08BuJn+tlt3fy7i3DEldTt+WGh0Ug7ciX2YI=
github.com/ledgerwatch/erigon-lib v0.0.0-20211003063209-b50d5c185ce1/go.mod h1:R65M7eqckpbB9f4+WG6ftXVgPX2U1RhgrKE8lYgLzPI=
github.com/ledgerwatch/log/v3 v3.3.1 h1:HmvLeTEvtCtqSvtu4t/a5MAdcLfeBcbIeowXbLYuzLc=
github.com/ledgerwatch/log/v3 v3.3.1/go.mod h1:S3VJqhhVX32rbp1JyyvhJou12twtFwNEPESBgpbNkRk=
github.com/ledgerwatch/secp256k1 v0.0.0-20210626115225-cd5cd00ed72d h1:/IKMrJdfRsoYNc36PXqP4xMH3vhW/8IQyBKGQbKZUno=