Skip to content

Commit 8c6c32b

Browse files
poupaspoupas
authored
Merge pull request #35 from Probely/modern-container-image
feat(docker): add modern image variant with updated base images
2 parents 93d731a + 7e335e1 commit 8c6c32b

File tree

10 files changed

+81
-70
lines changed

10 files changed

+81
-70
lines changed

‎Dockerfile‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1-
FROM --platform=$BUILDPLATFORM rust:1-bullseye AS rust_builder
1+
ARG RUST_BUILDER_BASE="rust:1-bullseye"
2+
ARG GO_BUILDER_BASE="golang:1.24-bullseye"
3+
ARG FINAL_BASE="debian:12.10-slim"
4+
ARG GCC_VERSION="10"
5+
6+
FROM --platform=$BUILDPLATFORM ${RUST_BUILDER_BASE} AS rust_builder
27
ENV moproxy_tag=v0.5.1
38
ENV udp_over_tcp_tag=v0.4.0
49
ARG TARGETARCH
10+
ARG GCC_VERSION
511
RUN set -eux \
612
&& { [ "${TARGETARCH}" = "arm64" ] && TARGETARCH="aarch64" || TARGETARCH="x86-64"; } \
713
&& RUST_TARGET="$(echo $TARGETARCH | tr '-' '_')" \
@@ -13,7 +19,7 @@ RUN set -eux \
1319
&& cd moproxy \
1420
&& git checkout -b tags/$moproxy_tag \
1521
&& rustup target add ${RUST_TARGET}-unknown-linux-gnu \
16-
&& env CARGO_TARGET_$(echo ${RUST_TARGET} | tr [:lower:] [:upper:])_UNKNOWN_LINUX_GNU_LINKER="${RUST_TARGET}-linux-gnu-gcc-10" cargo build --release --target ${RUST_TARGET}-unknown-linux-gnu \
22+
&& env CARGO_TARGET_$(echo ${RUST_TARGET} | tr [:lower:] [:upper:])_UNKNOWN_LINUX_GNU_LINKER="${RUST_TARGET}-linux-gnu-gcc-${GCC_VERSION}" cargo build --release --target ${RUST_TARGET}-unknown-linux-gnu \
1723
&& mkdir -p target/release \
1824
&& cp target/${RUST_TARGET}-unknown-linux-gnu/release/moproxy target/release \
1925
# udp-over-tcp \
@@ -23,14 +29,14 @@ RUN set -eux \
2329
&& git checkout -b tags/$udp_over_tcp_tag \
2430
&& rustup target add ${RUST_TARGET}-unknown-linux-gnu \
2531
&& env \
26-
CARGO_TARGET_$(echo ${RUST_TARGET} | tr [:lower:] [:upper:])_UNKNOWN_LINUX_GNU_LINKER="${RUST_TARGET}-linux-gnu-gcc-10" \
32+
CARGO_TARGET_$(echo ${RUST_TARGET} | tr [:lower:] [:upper:])_UNKNOWN_LINUX_GNU_LINKER="${RUST_TARGET}-linux-gnu-gcc-${GCC_VERSION}" \
2733
cargo build --release --target ${RUST_TARGET}-unknown-linux-gnu \
2834
--features env_logger --features clap --bins \
2935
&& mkdir -p target/release \
3036
&& cp target/${RUST_TARGET}-unknown-linux-gnu/release/udp2tcp target/release
3137

3238

33-
FROM --platform=$BUILDPLATFORM golang:1.24-bullseye AS go_builder
39+
FROM --platform=$BUILDPLATFORM ${GO_BUILDER_BASE} AS go_builder
3440
COPY ./farconn /build/farconn
3541
COPY ./farcaster-go /build/farcaster-go
3642
ARG TARGETARCH
@@ -50,7 +56,7 @@ RUN set -eux \
5056
&& cd -
5157

5258

53-
FROM debian:12.10-slim
59+
FROM ${FINAL_BASE}
5460
COPY ./scripts/. /farcaster/bin/
5561
COPY --from=go_builder /build/farconn/farconn /usr/local/bin
5662
COPY --from=go_builder /build/farcaster-go/bin/farcasterd /usr/local/bin
@@ -66,11 +72,9 @@ RUN set -eux \
6672
bash \
6773
libmnl0 \
6874
iptables \
69-
openresolv \
7075
iproute2 \
7176
dnsmasq \
7277
dnsutils \
73-
curl \
7478
wireguard-tools \
7579
ca-certificates \
7680
&& apt-get clean \

‎Makefile‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,21 @@ TAGS := -t $(REPO):v$(VER_MAJOR) \
1010
-t $(REPO):v$(VER_MAJOR).$(VER_MINOR) \
1111
-t $(REPO):v$(VERSION)
1212

13+
MODERN_TAGS := -t $(REPO):v$(VER_MAJOR)-modern \
14+
-t $(REPO):v$(VER_MAJOR).$(VER_MINOR)-modern \
15+
-t $(REPO):v$(VERSION)-modern
16+
1317
BUILDX_ARGS := --builder multiarch \
1418
--build-arg "VERSION=$(VERSION)"
1519

16-
.PHONY: all build build-local clean prepare check-version
20+
21+
MODERN_BUILDX_ARGS = \
22+
--build-arg RUST_BUILDER_BASE=rust:1-bookworm \
23+
--build-arg GO_BUILDER_BASE=golang:1.24-bookworm \
24+
--build-arg FINAL_BASE=ubuntu:25.04 \
25+
--build-arg GCC_VERSION=12
26+
27+
.PHONY: all build build-local build-modern build-local-modern clean prepare check-version
1728

1829
all: build
1930

@@ -29,6 +40,18 @@ build-local: check-version prepare
2940
-t $(REPO):v$(VERSION) \
3041
--load .
3142

43+
build-modern: check-version prepare
44+
docker buildx build $(BUILDX_ARGS) $(MODERN_BUILDX_ARGS) \
45+
--platform $(PLATFORMS) \
46+
$(MODERN_TAGS) \
47+
--push .
48+
49+
build-local-modern: check-version prepare
50+
docker buildx build $(BUILDX_ARGS) $(MODERN_BUILDX_ARGS) \
51+
--platform linux/amd64 \
52+
-t $(REPO):v$(VERSION)-modern \
53+
--load .
54+
3255
clean:
3356
docker buildx --builder multiarch prune -f
3457

‎contrib/proxyprobe/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ go 1.24
44

55
require (
66
github.com/gorilla/websocket v1.5.3
7-
golang.org/x/crypto v0.36.0
8-
golang.org/x/net v0.38.0
7+
golang.org/x/crypto v0.37.0
8+
golang.org/x/net v0.39.0
99
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173
10-
gvisor.dev/gvisor v0.0.0-20250205023644-9414b50a5633
1110
)
1211

1312
require (
1413
github.com/google/btree v1.1.3 // indirect
15-
golang.org/x/sys v0.31.0 // indirect
16-
golang.org/x/text v0.23.0 // indirect
14+
golang.org/x/sys v0.32.0 // indirect
15+
golang.org/x/text v0.24.0 // indirect
1716
golang.org/x/time v0.11.0 // indirect
1817
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
18+
gvisor.dev/gvisor v0.0.0-20250205023644-9414b50a5633 // indirect
1919
)

‎contrib/proxyprobe/go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
22
github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
33
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
44
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
5-
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
6-
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
7-
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
8-
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
9-
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
10-
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
11-
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
12-
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
5+
golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
6+
golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
7+
golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
8+
golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
9+
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
10+
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
11+
golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
12+
golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
1313
golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
1414
golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
1515
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg=

‎contrib/proxyprobe/server/main.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,7 @@ func handleHTTP(w http.ResponseWriter, r *http.Request) {
286286
}
287287

288288
body, err := io.ReadAll(r.Body)
289+
defer r.Body.Close()
289290
if err != nil {
290291
log.Printf("[ERROR] Failed to read request body from %s: %v", r.RemoteAddr, err)
291292
http.Error(w, "Failed to read request body", http.StatusInternalServerError)
@@ -302,6 +303,7 @@ func handleHTTP(w http.ResponseWriter, r *http.Request) {
302303
debugLog("Found matching response")
303304
}
304305

306+
w.Header().Set("Content-Type", "application/json")
305307
_, err = w.Write(response)
306308
if err != nil {
307309
log.Printf("[ERROR] Failed to write response to %s: %v", r.RemoteAddr, err)

‎farcaster-go/Dockerfile.build‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,14 @@
1-
FROM debian:12.10-slim
1+
FROM golang:1.24-bullseye
22

33
COPY . /build
44
WORKDIR /build
55

66
ARG VERSION
77

8-
ENV GOLANG_VERSION 1.24.2
9-
ENV GOLANG_SHA256SUM "238d9c065d09ff6af229d2e3b8b5e85e688318d69f4006fb85a96e41c216ea83"
10-
ENV GOPATH /go
11-
128
RUN set -eux \
139
&& apt-get update \
1410
&& apt-get dist-upgrade -y \
1511
&& apt-get install -y --no-install-recommends \
1612
make \
1713
ca-certificates \
18-
curl \
19-
&& rm -rf /var/lib/apt/lists/* \
20-
&& outfile="go.tar.gz" \
21-
&& curl -Lo ${outfile} "https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz" \
22-
&& echo "${GOLANG_SHA256SUM} ${outfile}" | sha256sum -c - \
23-
&& tar -C /usr/local -xzf ${outfile} \
24-
&& rm ${outfile} \
25-
&& export PATH="/usr/local/go/bin:$PATH" \
26-
&& mkdir -p ${GOPATH}/src ${GOPATH}/bin \
27-
go version
28-
29-
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
30-
31-
RUN set -eux \
3214
&& make linux

‎farcaster-go/go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ require (
66
github.com/Microsoft/go-winio v0.6.2
77
github.com/coder/websocket v1.8.13
88
github.com/google/gopacket v1.1.19
9-
github.com/miekg/dns v1.1.64
9+
github.com/miekg/dns v1.1.65
1010
github.com/mr-tron/base58 v1.2.0
1111
github.com/shirou/gopsutil v3.21.11+incompatible
1212
github.com/spf13/cobra v1.9.1
1313
go.uber.org/zap v1.27.0
14-
golang.org/x/crypto v0.36.0
15-
golang.org/x/net v0.38.0
16-
golang.org/x/sys v0.31.0
14+
golang.org/x/crypto v0.37.0
15+
golang.org/x/net v0.39.0
16+
golang.org/x/sys v0.32.0
1717
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173
1818
gopkg.in/natefinch/lumberjack.v2 v2.2.1
1919
gvisor.dev/gvisor v0.0.0-20250205023644-9414b50a5633
@@ -29,8 +29,8 @@ require (
2929
github.com/yusufpapurcu/wmi v1.2.4 // indirect
3030
go.uber.org/multierr v1.11.0 // indirect
3131
golang.org/x/mod v0.24.0 // indirect
32-
golang.org/x/sync v0.12.0 // indirect
32+
golang.org/x/sync v0.13.0 // indirect
3333
golang.org/x/time v0.11.0 // indirect
34-
golang.org/x/tools v0.31.0 // indirect
34+
golang.org/x/tools v0.32.0 // indirect
3535
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
3636
)

‎farcaster-go/go.sum‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF
1616
github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
1717
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
1818
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
19-
github.com/miekg/dns v1.1.64 h1:wuZgD9wwCE6XMT05UU/mlSko71eRSXEAm2EbjQXLKnQ=
20-
github.com/miekg/dns v1.1.64/go.mod h1:Dzw9769uoKVaLuODMDZz9M6ynFU6Em65csPuoi8G0ck=
19+
github.com/miekg/dns v1.1.65 h1:0+tIPHzUW0GCge7IiK3guGP57VAw7hoPDfApjkMD1Fc=
20+
github.com/miekg/dns v1.1.65/go.mod h1:Dzw9769uoKVaLuODMDZz9M6ynFU6Em65csPuoi8G0ck=
2121
github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
2222
github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
2323
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -45,31 +45,31 @@ go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
4545
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
4646
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
4747
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
48-
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
49-
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
48+
golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
49+
golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
5050
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
5151
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
5252
golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
5353
golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
5454
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
5555
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
56-
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
57-
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
56+
golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
57+
golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
5858
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
59-
golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
60-
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
59+
golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
60+
golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
6161
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
6262
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
6363
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
6464
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
65-
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
66-
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
65+
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
66+
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
6767
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
6868
golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
6969
golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
7070
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
71-
golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU=
72-
golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ=
71+
golang.org/x/tools v0.32.0 h1:Q7N1vhpkQv7ybVzLFtTjvQya2ewbwNDZzUgfXGqtMWU=
72+
golang.org/x/tools v0.32.0/go.mod h1:ZxrU41P/wAbZD8EDa6dDCa6XfpkhJ7HFMjHJXfBDu8s=
7373
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
7474
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg=
7575
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI=

‎farconn/go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/fatih/color v1.18.0
77
github.com/mr-tron/base58 v1.2.0
88
github.com/spf13/cobra v1.9.1
9-
golang.org/x/crypto v0.36.0
9+
golang.org/x/crypto v0.37.0
1010
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10
1111
)
1212

@@ -20,8 +20,8 @@ require (
2020
github.com/mdlayher/netlink v1.7.2 // indirect
2121
github.com/mdlayher/socket v0.5.1 // indirect
2222
github.com/spf13/pflag v1.0.6 // indirect
23-
golang.org/x/net v0.38.0 // indirect
24-
golang.org/x/sync v0.12.0 // indirect
25-
golang.org/x/sys v0.31.0 // indirect
23+
golang.org/x/net v0.39.0 // indirect
24+
golang.org/x/sync v0.13.0 // indirect
25+
golang.org/x/sys v0.32.0 // indirect
2626
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 // indirect
2727
)

‎farconn/go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
2626
github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
2727
github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
2828
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
29-
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
30-
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
31-
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
32-
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
33-
golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
34-
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
29+
golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
30+
golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
31+
golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
32+
golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
33+
golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
34+
golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
3535
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
36-
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
37-
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
36+
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
37+
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
3838
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 h1:/jFs0duh4rdb8uIfPMv78iAJGcPKDeqAFnaLBropIC4=
3939
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173/go.mod h1:tkCQ4FQXmpAgYVh++1cq16/dH4QJtmvpRv19DWGAHSA=
4040
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10 h1:3GDAcqdIg1ozBNLgPy4SLT84nfcBjr6rhGtXYtrkWLU=

0 commit comments

Comments
 (0)