Skip to content

Commit

Permalink
Fix up golang.org/x/net
Browse files Browse the repository at this point in the history
Signed-off-by: Jauder Ho <jauderho@users.noreply.github.com>
  • Loading branch information
jauderho committed Dec 19, 2024
1 parent 450a49a commit de26874
Show file tree
Hide file tree
Showing 21 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion age/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN test -n "${BUILD_VERSION}" \
&& update-ca-certificates \
&& git clone --depth 1 ${GIT_URL} --branch ${BUILD_VERSION} /go/src/github.com/FiloSottile/age \
&& cd /go/src/github.com/FiloSottile/age \
&& go get -u golang.org/x/crypto \
&& go get -u golang.org/x/crypto golang.org/x/net \
&& go mod tidy \
&& go build -o . -v -trimpath -ldflags="-s -w -X main.Version=${BUILD_VERSION}" filippo.io/age/cmd/...

Expand Down
2 changes: 1 addition & 1 deletion amass/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN test -n "${BUILD_VERSION}" \
&& curl -L "${ARCHIVE_URL}${BUILD_VERSION}.tar.gz" -o /tmp/amass.tar.gz \
&& tar xzf /tmp/amass.tar.gz --strip 1 -C /go/src/github.com/owasp/amass \
&& go get -u github.com/jackc/pgx/v5 google.golang.org/protobuf golang.org/x/net \
&& go get -u golang.org/x/crypto \
&& go get -u golang.org/x/crypto golang.org/x/net \
&& go mod tidy \
&& go build -v -trimpath -ldflags="-s -w" ./cmd/amass

Expand Down
2 changes: 1 addition & 1 deletion cloudflared/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +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 get -u golang.org/x/crypto golang.org/x/net \
&& go mod tidy \
&& go mod vendor \
&& go build -o cloudflared -v -trimpath -ldflags="-s -w -X main.Version=${BUILD_VERSION}" ./cmd/cloudflared/ \
Expand Down
2 changes: 1 addition & 1 deletion dnscrypt-proxy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN test -n "${BUILD_VERSION}" \
&& go mod download golang.org/x/sync \
&& go get -u golang.org/x/sys golang.org/x/tools \
&& go get -u google.golang.org/genproto \
&& go get -u golang.org/x/crypto \
&& go get -u golang.org/x/crypto golang.org/x/net \
&& go get -u ./... \
&& go mod tidy \
&& go mod vendor \
Expand Down
2 changes: 1 addition & 1 deletion dnsx/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN test -n "${BUILD_VERSION}" \
&& curl -L "${ARCHIVE_URL}${BUILD_VERSION}.tar.gz" -o /tmp/dnsx.tar.gz \
&& tar xzf /tmp/dnsx.tar.gz --strip 1 -C /go/src/github.com/projectdiscovery/dnsx \
&& go get -u github.com/quic-go/quic-go \
&& go get -u golang.org/x/crypto \
&& go get -u golang.org/x/crypto golang.org/x/net \
&& go mod tidy \
&& go build -o dnsx -v -trimpath -ldflags="-s -w" cmd/dnsx/dnsx.go

Expand Down
4 changes: 2 additions & 2 deletions driftctl/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ RUN test -n "${BUILD_VERSION}" \
#&& tar xzf /tmp/driftctl.tar.gz --strip 1 -C /go/src/github.com/snyk/driftctl \
&& git clone --depth 1 ${GIT_URL} /go/src/github.com/snyk/driftctl \
&& cd /go/src/github.com/snyk/driftctl \
#&& go get -u github.com/hashicorp/go-getter github.com/dgrijalva/jwt-go golang.org/x/net golang.org/x/crypto \
&& go get -u github.com/dgrijalva/jwt-go golang.org/x/crypto \
#&& go get -u github.com/hashicorp/go-getter github.com/dgrijalva/jwt-go golang.org/x/net golang.org/x/crypto golang.org/x/net \
&& go get -u github.com/dgrijalva/jwt-go golang.org/x/crypto golang.org/x/net \
#&& go mod tidy \
&& go build -v -trimpath -ldflags="-s -w -X github.com/snyk/driftctl/pkg/version.version=${BUILD_VERSION}" .

Expand Down
2 changes: 1 addition & 1 deletion dry/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN test -n "${BUILD_VERSION}" \
&& go get -u github.com/docker/docker@v25.0.6 github.com/docker/cli@v25.0.6 \
#&& go get -u github.com/docker/distribution \
&& go get -u golang.org/x/net \
&& go get -u golang.org/x/crypto \
&& go get -u golang.org/x/crypto golang.org/x/net \
#&& go get -u all \
&& go build -o dry-bin -v -trimpath -ldflags="-s -w"

Expand Down
2 changes: 1 addition & 1 deletion dsq/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN test -n "${BUILD_VERSION}" \
&& cd /go/src/github.com/multiprocessio/dsq \
&& go get -u google.golang.org/protobuf golang.org/x/net \
&& go get -u github.com/snowflakedb/gosnowflake \
&& go get -u golang.org/x/crypto \
&& go get -u golang.org/x/crypto golang.org/x/net \
&& go mod tidy \
&& go build -v -trimpath -ldflags="-s -w"

Expand Down
2 changes: 1 addition & 1 deletion fq/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN test -n "${BUILD_VERSION}" \
&& update-ca-certificates \
&& curl -L "${ARCHIVE_URL}${BUILD_VERSION}.tar.gz" -o /tmp/fq.tar.gz \
&& tar xzf /tmp/fq.tar.gz --strip 1 -C /go/src/github.com/wader/fq \
&& go get -u golang.org/x/crypto \
&& go get -u golang.org/x/crypto golang.org/x/net \
&& go build -o fq -v -trimpath -ldflags="-s -w -X main.version=${BUILD_VERSION}" .

# Validation check
Expand Down
2 changes: 1 addition & 1 deletion headscale/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN test -n "${BUILD_VERSION}" \
&& curl -L "${ARCHIVE_URL}${BUILD_VERSION}.tar.gz" -o /tmp/headscale.tar.gz \
&& tar xzf /tmp/headscale.tar.gz --strip 1 -C /go/src/github.com/juanfont/headscale \
&& go get -u github.com/jackc/pgx/v5 github.com/go-jose/go-jose/v3 google.golang.org/grpc google.golang.org/genproto google.golang.org/protobuf \
&& go get -u golang.org/x/crypto \
&& go get -u golang.org/x/crypto golang.org/x/net \
&& go mod tidy \
&& go build -o ./headscale -v -trimpath -ldflags="-s -w -X github.com/juanfont/headscale/cmd/headscale/cli.Version=${BUILD_VERSION}" ./cmd/headscale

Expand Down
2 changes: 1 addition & 1 deletion httpie-go/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN test -n "${BUILD_VERSION}" \
&& apk add --no-cache git gcc musl-dev \
&& git clone --depth 1 ${GIT_URL} --branch ${BUILD_VERSION} /go/src/github.com/nojima/httpie-go \
&& cd /go/src/github.com/nojima/httpie-go \
&& go get -u golang.org/x/crypto \
&& go get -u golang.org/x/crypto golang.org/x/net \
&& go mod tidy \
&& go build -v -trimpath -ldflags="-s -w" ./cmd/ht

Expand Down
2 changes: 1 addition & 1 deletion httpx/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN test -n "${BUILD_VERSION}" \
&& curl -L "${ARCHIVE_URL}${BUILD_VERSION}.tar.gz" -o /tmp/httpx.tar.gz \
&& tar xzf /tmp/httpx.tar.gz --strip 1 -C /go/src/github.com/projectdiscovery/httpx \
&& go get -u github.com/quic-go/quic-go \
&& go get -u golang.org/x/crypto \
&& go get -u golang.org/x/crypto golang.org/x/net \
&& go mod tidy \
&& go build -o httpx -v -trimpath -ldflags="-s -w" cmd/httpx/httpx.go

Expand Down
2 changes: 1 addition & 1 deletion lego/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +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 get -u golang.org/x/crypto golang.org/x/net \
&& go mod tidy \
&& make build \
&& strip /go/src/github.com/go-acme/lego/dist/lego \
Expand Down
2 changes: 1 addition & 1 deletion logmepwn/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN test -n "${BUILD_VERSION}" \
&& update-ca-certificates \
&& curl -L "${ARCHIVE_URL}${BUILD_VERSION}.tar.gz" -o /tmp/logmepwn.tar.gz \
&& tar xzf /tmp/logmepwn.tar.gz --strip 1 -C /go/src/github.com/0xInfection/logmepwn \
&& go get -u golang.org/x/crypto github.com/valyala/fasthttp \
&& go get -u golang.org/x/crypto golang.org/x/net github.com/valyala/fasthttp \
&& go build -o lmp -v -trimpath -ldflags="-s -w" .

# Validation check
Expand Down
2 changes: 1 addition & 1 deletion ntfy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN test -n "${BUILD_VERSION}" \
&& mkdir server/site \
&& touch server/site/dummy \
&& go get -u golang.org/x/net \
&& go get -u golang.org/x/crypto \
&& go get -u golang.org/x/crypto golang.org/x/net \
&& go get -u github.com/golang-jwt/jwt/v4 \
&& go mod tidy \
&& CGO_CFLAGS="-D_LARGEFILE64_SOURCE" go build -o ntfy -v -trimpath -ldflags="-s -w -X main.version=${BUILD_VERSION}" .
Expand Down
2 changes: 1 addition & 1 deletion opentofu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ RUN test -n "${BUILD_VERSION}" \
&& cd /go/src/github.com/opentofu/opentofu \
#&& 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 get -u golang.org/x/crypto golang.org/x/net \
#&& go mod tidy \
&& go generate ./... \
&& go run ./tools/protobuf-compile . \
Expand Down
2 changes: 1 addition & 1 deletion rclone/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +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 get -u golang.org/x/crypto golang.org/x/net \
&& go mod tidy \
&& go build -o rclone -v -trimpath -ldflags="-s -w"

Expand Down
2 changes: 1 addition & 1 deletion rdap/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +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 golang.org/x/crypto golang.org/x/net \
&& go get -u \
&& go build -o rdap -v -trimpath -ldflags="-s -w" ./cmd/rdap

Expand Down
2 changes: 1 addition & 1 deletion subfinder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +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 get -u golang.org/x/crypto golang.org/x/net \
&& go mod tidy \
&& go build -o subfinder -v -trimpath -ldflags="-s -w" cmd/subfinder/main.go

Expand Down
2 changes: 1 addition & 1 deletion tailscale/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +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 get -u golang.org/x/crypto golang.org/x/net \
&& 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

Expand Down
2 changes: 1 addition & 1 deletion terraform/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +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 get -u golang.org/x/crypto golang.org/x/net \
#&& go mod tidy \
&& go build -v -trimpath -ldflags="-s -w" \
&& cp terraform /go/bin/terraform \
Expand Down

0 comments on commit de26874

Please sign in to comment.