diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 1c5c522..a699a57 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -43,7 +43,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: "1.23.1" + go-version: "1.23.4" check-latest: true # Initializes the CodeQL tools for scanning. diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 22a7f8a..3effb38 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -17,7 +17,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: "1.23.2" + go-version: "1.23.4" check-latest: true - name: Test @@ -33,7 +33,7 @@ jobs: with: version: "2024.1.1" install-go: false - min-go-version: "1.23.2" + min-go-version: "1.23.4" - name: Run Gosec Security Scanner uses: securego/gosec@master diff --git a/Dockerfile b/Dockerfile index f4bc349..ae5ff6a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ -ARG GOLANG_VERSION="1.23.2" +ARG GOLANG_VERSION="1.23.4" FROM golang:${GOLANG_VERSION}-alpine AS builder ARG LDFLAGS WORKDIR /go/src/github.com/z0rr0/gsocks5 COPY . . RUN echo "LDFLAGS = $LDFLAGS" -RUN GOOS=linux go build -ldflags "$LDFLAGS" -o ./gsocks5 +RUN GOOS=linux GOARCH=amd64 go build -ldflags "$LDFLAGS" -o ./gsocks5 -FROM alpine:3.20 +FROM alpine:3.21 LABEL org.opencontainers.image.authors="me@axv.email" \ org.opencontainers.image.url="https://hub.docker.com/r/z0rr0/gsocks5" \ org.opencontainers.image.documentation="https://github.com/z0rr0/gsocks5" \ diff --git a/go.mod b/go.mod index fcedfdf..33937d2 100644 --- a/go.mod +++ b/go.mod @@ -4,5 +4,5 @@ go 1.23 require ( github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 - golang.org/x/net v0.29.0 + golang.org/x/net v0.32.0 ) diff --git a/go.sum b/go.sum index f14e5a0..e9205c1 100644 --- a/go.sum +++ b/go.sum @@ -2,3 +2,5 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= +golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI= +golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=