diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index e1292ea..b2291f1 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -6,7 +6,7 @@ on: pull_request: env: - GO_VERSION: "1.24" + GO_VERSION: "1.26" jobs: test: @@ -19,7 +19,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: "1.24" + go-version: "1.26" - uses: actions/cache@v4 with: @@ -48,7 +48,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: "1.24" + go-version: "1.26" - uses: golangci/golangci-lint-action@v7 with: @@ -64,7 +64,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: "1.24" + go-version: "1.26" - name: Install govulncheck run: go install golang.org/x/vuln/cmd/govulncheck@latest diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index c4df119..4476b8b 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: "1.24" + go-version: "1.26" - uses: actions/cache@v4 with: diff --git a/Dockerfile b/Dockerfile index 48f7b9e..9978b2e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # --- Stage 1: Builder --- -FROM golang:1.24-alpine3.21 AS builder +FROM golang:1.26-alpine3.23 AS builder RUN apk add --no-cache gcc musl-dev WORKDIR /app COPY go.mod go.sum ./ @@ -15,7 +15,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \ go build -trimpath -ldflags="-s -w -X main.version=${VERSION} -X main.commit=${COMMIT} -X main.date=${BUILD_DATE}" -o uptop ./cmd/uptop/main.go # --- Stage 2: Runner --- -FROM alpine:3.21 +FROM alpine:3.23 WORKDIR /app RUN apk add --no-cache ca-certificates openssh-client RUN mkdir /data diff --git a/go.mod b/go.mod index 06b6111..e28a302 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module gitea.lerkolabs.com/lerko/uptop -go 1.24.4 +go 1.26.3 require ( github.com/charmbracelet/bubbles v0.21.1-0.20250623103423-23b8fd6302d7 @@ -16,6 +16,7 @@ require ( github.com/mattn/go-sqlite3 v1.14.33 github.com/miekg/dns v1.1.72 github.com/prometheus-community/pro-bing v0.8.0 + gopkg.in/yaml.v3 v3.0.1 ) require ( @@ -57,5 +58,4 @@ require ( golang.org/x/sys v0.40.0 // indirect golang.org/x/text v0.33.0 // indirect golang.org/x/tools v0.40.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 17c3eca..ac19cd4 100644 --- a/go.sum +++ b/go.sum @@ -121,6 +121,7 @@ golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE= golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8= golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA= golang.org/x/tools v0.40.0/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=