From 555f9aa43e916f32e1a3238ed97d7440261a6962 Mon Sep 17 00:00:00 2001 From: Jauder Ho Date: Sun, 15 Dec 2024 21:54:31 +0000 Subject: [PATCH] Fix golang.org/x/crypto part 1 Signed-off-by: Jauder Ho --- cloudflared/Dockerfile | 1 + lego/Dockerfile | 1 + rclone/Dockerfile | 1 + rdap/Dockerfile | 1 + subfinder/Dockerfile | 1 + tailscale/Dockerfile | 1 + terraform/Dockerfile | 1 + 7 files changed, 7 insertions(+) diff --git a/cloudflared/Dockerfile b/cloudflared/Dockerfile index af4913b0b31c..db182bf29c68 100644 --- a/cloudflared/Dockerfile +++ b/cloudflared/Dockerfile @@ -17,6 +17,7 @@ RUN test -n "${BUILD_VERSION}" \ && tar xzf /tmp/cloudflared.tar.gz --strip 1 -C /go/src/github.com/cloudflare/cloudflared \ && go get -u github.com/cloudflare/circl github.com/go-jose/go-jose/v3 github.com/quic-go/quic-go google.golang.org/protobuf \ && go get -u github.com/coredns/coredns \ + && go get -u golang.org/x/crypto \ && go mod tidy \ && go mod vendor \ && go build -o cloudflared -v -trimpath -ldflags="-s -w -X main.Version=${BUILD_VERSION}" ./cmd/cloudflared/ \ diff --git a/lego/Dockerfile b/lego/Dockerfile index fcd6733d80a2..9f16e3e30812 100644 --- a/lego/Dockerfile +++ b/lego/Dockerfile @@ -17,6 +17,7 @@ RUN test -n "${BUILD_VERSION}" \ && curl -L "${ARCHIVE_URL}${BUILD_VERSION}.tar.gz" -o /tmp/lego.tar.gz \ && tar xzf /tmp/lego.tar.gz --strip 1 -C /go/src/github.com/go-acme/lego \ && go get -u google.golang.org/grpc google.golang.org/protobuf \ + && go get -u golang.org/x/crypto \ && go mod tidy \ && make build \ && strip /go/src/github.com/go-acme/lego/dist/lego \ diff --git a/rclone/Dockerfile b/rclone/Dockerfile index 03a2a9ebca6d..1e4cb75aff9d 100644 --- a/rclone/Dockerfile +++ b/rclone/Dockerfile @@ -15,6 +15,7 @@ RUN test -n "${BUILD_VERSION}" \ && curl -L "${ARCHIVE_URL}${BUILD_VERSION}.tar.gz" -o /tmp/rclone.tar.gz \ && tar xzf /tmp/rclone.tar.gz --strip 1 -C /go/src/github.com/rclone/rclone \ && go get -u golang.org/x/net \ + && go get -u golang.org/x/crypto \ && go mod tidy \ && go build -o rclone -v -trimpath -ldflags="-s -w" diff --git a/rdap/Dockerfile b/rdap/Dockerfile index 0b7327ad8a2a..198f0d59f5cd 100644 --- a/rdap/Dockerfile +++ b/rdap/Dockerfile @@ -14,6 +14,7 @@ RUN test -n "${BUILD_VERSION}" \ && apk add --no-cache git ca-certificates \ && git clone --depth 1 ${GIT_URL} /go/src/github.com/openrdap/rdap \ && cd /go/src/github.com/openrdap/rdap \ + && go get -u golang.org/x/crypto \ && go get -u \ && go build -o rdap -v -trimpath -ldflags="-s -w" ./cmd/rdap diff --git a/subfinder/Dockerfile b/subfinder/Dockerfile index b6bae74dd9c7..e024985a479d 100644 --- a/subfinder/Dockerfile +++ b/subfinder/Dockerfile @@ -16,6 +16,7 @@ RUN test -n "${BUILD_VERSION}" \ && tar xzf /tmp/subfinder.tar.gz --strip 1 -C /go/src/github.com/projectdiscovery/subfinder \ && cd v2 \ && go get -u github.com/quic-go/quic-go \ + && go get -u golang.org/x/crypto \ && go mod tidy \ && go build -o subfinder -v -trimpath -ldflags="-s -w" cmd/subfinder/main.go diff --git a/tailscale/Dockerfile b/tailscale/Dockerfile index 9e49372c01cc..c66530293c49 100644 --- a/tailscale/Dockerfile +++ b/tailscale/Dockerfile @@ -18,6 +18,7 @@ RUN test -n "${BUILD_VERSION}" \ && curl -L "${ARCHIVE_URL}${BUILD_VERSION}.tar.gz" -o /tmp/tailscale.tar.gz \ && tar xzf /tmp/tailscale.tar.gz --strip 1 -C /go/src/github.com/tailscale/tailscale \ && go get -u golang.org/x/net \ + && go get -u golang.org/x/crypto \ && go mod tidy \ && go build -v -trimpath -tags xversion,ts_include_cli -ldflags="-s -w -X tailscale.com/version.Short=${BUILD_VERSION}" tailscale.com/cmd/tailscaled diff --git a/terraform/Dockerfile b/terraform/Dockerfile index 85ad6988fb62..4ae15c3fea20 100644 --- a/terraform/Dockerfile +++ b/terraform/Dockerfile @@ -18,6 +18,7 @@ RUN test -n "${BUILD_VERSION}" \ && tar xzf /tmp/terraform.tar.gz --strip 1 -C /go/src/github.com/hashicorp/terraform \ && go get -u github.com/hashicorp/go-getter github.com/cloudflare/circl google.golang.org/protobuf golang.org/x/net \ && go get -u go.opentelemetry.io/otel/sdk/trace \ + && go get -u golang.org/x/crypto \ && go mod tidy \ && go build -v -trimpath -ldflags="-s -w" \ && cp terraform /go/bin/terraform \