Skip to content

Uodate Go version, urunc dependencies and linter #411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cmainas wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Uodate Go version, urunc dependencies and linter #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64d7913
chore(go): Update Go version and depedencies
cmainas Jan 9, 2026
a9bfc8d
chore(linter): Update version and fix small issues
cmainas Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/linters/urunc-dict.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,3 +392,4 @@ Mallikopoulou
Medfouni
Khitem
unreviewed
gocyclo
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
go_version:
required: false
type: string
default: "1.24.6"
default: "1.25.4"

permissions:
contents: read
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: ./.github/workflows/build.yml
with:
ref: ${{ github.sha }}
go_version: "1.24.6"
go_version: "1.25.4"

upload:
name: Upload
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci_nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ jobs:
uses: ./.github/workflows/build.yml
with:
ref: ${{ github.sha }}
go_version: "1.24.6"
go_version: "1.25.4"

unit_test:
name: Unit tests
uses: ./.github/workflows/unit_test.yml
with:
ref: ${{ github.sha }}
go_version: "1.24.6"
go_version: "1.25.4"

vm_test:
needs: [build]
Expand All @@ -44,7 +44,7 @@ jobs:
crictl_version: 'v1.30.0'
firecracker_version: 'v1.7.0'
solo5_version: 'v0.9.3'
go_version: "1.24.6"
go_version: "1.25.4"

kind_test:
needs: [build]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ jobs:
go-version: ${{ inputs.go_version }}
cache: false
- name: golangci-lint
uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc # v3.7.0
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8
with:
version: v1.64
version: v2.7

# show only new issues if it's a pull request. The default value is `false`.
only-new-issues: true
65 changes: 51 additions & 14 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,54 @@
version: "2"

linters:
default: none
enable:
- errcheck
- gofmt
- goimports
- gosec
- gocritic
- misspell
- revive
- unused

- decorder
- dupword
- dupl
- errname
- gocritic
- gosec
- gocyclo
- ineffassign
- makezero
- misspell
- revive
- unused
- usestdlibvars
settings:
govet:
enable:
- nilness
- unusedwrite
staticcheck:
checks:
- all
exclusions:
generated: lax
presets:
- comments
- common-false-positives
- legacy
- std-error-handling
rules:
- path: _test\.go|tests/e2e/(nerdctl|docker|ctr)\.go
linters:
- dupl
paths:
- docs$
- dist$
- examples$
formatters:
enable:
- gofmt
- goimports
exclusions:
generated: lax
paths:
- docs$
- dist$
- examples$
issues:
uniq-by-line: false

run:
issues-exit-code: 1
timeout: 5m
max-issues-per-linter: 0
max-same-issues: 0
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ CNTR_OPTS ?= run --rm -it
# Linking variables
LINT_CNTR_OPTS ?= $(CNTR_OPTS) -v $(CURDIR):/app -w /app
#? LINT_CNTR_IMG The linter image to use (default: golangci/golangci-lint:v1.53.3)
LINT_CNTR_IMG ?= golangci/golangci-lint:v1.64
LINT_CNTR_IMG ?= golangci/golangci-lint:v2.7
LINT_CNTR_CMD ?= golangci-lint run -v --timeout=5m

#? DOCS_CNTR_IMG The mkdocs image to use (default: harbor.nbfc.io/nubificus/urunc/mkdocs:test)
Expand Down
2 changes: 1 addition & 1 deletion cmd/urunc/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ func reexecUnikontainer(cmd *cli.Command) error {
// setup goes well and the socket was not cleaned up correctly,
// we execve the monitor and we rely on Go's close-on-exec feature in all file
// descriptors. THerefore, we might want to rethink this in future and not rely
// on Go, but this requires quite a a lot of changes.
// on Go, but this requires quite a lot of changes.
if awaitErr != nil {
awaitErr = fmt.Errorf("error waiting START message: %w", awaitErr)
err = errors.Join(awaitErr, cleanErr)
Expand Down
2 changes: 1 addition & 1 deletion deployment/urunc-deploy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ WORKDIR /artifacts
RUN cp /app/tenders/hvt/solo5-hvt /artifacts/ && \
cp /app/tenders/spt/solo5-spt /artifacts/

FROM golang:1.24.6-alpine3.21@sha256:50f8a10a46c0c26b5b816a80314f1999196c44c3e3571f41026b061339c29db6 AS urunc-builder
FROM golang:1.25.4-alpine3.21@sha256:3289aac2aac769e031d644313d094dbda745f28af81cd7a94137e73eefd58b33
RUN apk update && \
apk add --no-cache git make build-base linux-headers
WORKDIR /app
Expand Down
2 changes: 1 addition & 1 deletion docs/quickstart.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Then we need `urunc`:
```bash
sudo apt install -y git make
git clone https://github.com/urunc-dev/urunc.git
docker run --rm -ti -v $PWD/urunc:/urunc -w /urunc golang:1.24 bash -c "git config --global --add safe.directory /urunc && make"
docker run --rm -ti -v $PWD/urunc:/urunc -w /urunc golang:1.25 bash -c "git config --global --add safe.directory /urunc && make"
sudo make -C urunc install
```

Expand Down
2 changes: 1 addition & 1 deletion docs/variables/versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
versions:
go: "1.24.6"
go: "1.25.4"
nerdctl: "2.1.3"
docker: "28.3.3"
containerd: "2.1.3"
Expand Down
47 changes: 19 additions & 28 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,29 @@
module github.com/urunc-dev/urunc

go 1.24.2

toolchain go1.24.6
go 1.25.0

require (
github.com/BurntSushi/toml v1.5.0
github.com/BurntSushi/toml v1.6.0
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
github.com/cavaliergopher/cpio v1.0.1
github.com/containerd/containerd v1.7.29
github.com/containerd/containerd v1.7.30
github.com/creack/pty v1.1.24
github.com/elastic/go-seccomp-bpf v1.6.0
github.com/hashicorp/go-version v1.8.0
github.com/jackpal/gateway v1.1.1
github.com/moby/sys/mount v0.3.4
github.com/nubificus/hedge_cli v0.0.3
github.com/opencontainers/runc v1.2.8
github.com/opencontainers/runc v1.3.4
github.com/opencontainers/runtime-spec v1.2.1
github.com/prometheus-community/pro-bing v0.7.0
github.com/rs/zerolog v1.34.0
github.com/sirupsen/logrus v1.9.3
github.com/sirupsen/logrus v1.9.4
github.com/stretchr/testify v1.11.1
github.com/urfave/cli/v3 v3.6.1
github.com/urfave/cli/v3 v3.6.2
github.com/vishvananda/netlink v1.3.1
github.com/vishvananda/netns v0.0.5
golang.org/x/sys v0.39.0
k8s.io/cri-api v0.34.3
golang.org/x/sys v0.40.0
k8s.io/cri-api v0.35.0
)

require (
Expand All @@ -44,17 +42,16 @@ require (
github.com/containerd/platforms v0.2.1 // indirect
github.com/containerd/ttrpc v1.2.7 // indirect
github.com/containerd/typeurl/v2 v2.2.3 // indirect
github.com/coreos/go-systemd/v22 v22.6.0 // indirect
github.com/cyphar/filepath-securejoin v0.6.0 // indirect
github.com/coreos/go-systemd/v22 v22.7.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/docker/go-events v0.0.0-20250808211157-605354379745 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/godbus/dbus/v5 v5.2.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/klauspost/compress v1.18.1 // indirect
github.com/klauspost/compress v1.18.3 // indirect
github.com/mattn/go-colorable v0.1.14 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mdlayher/socket v0.5.1 // indirect
Expand All @@ -64,22 +61,16 @@ require (
github.com/moby/sys/userns v0.1.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.1 // indirect
github.com/opencontainers/selinux v1.13.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/rogpeppe/go-internal v1.14.1 // indirect
github.com/seccomp/libseccomp-golang v0.11.1 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/stretchr/objx v0.5.3 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/otel v1.38.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
golang.org/x/net v0.46.0 // indirect
golang.org/x/sync v0.18.0 // indirect
golang.org/x/text v0.30.0 // indirect
google.golang.org/genproto v0.0.0-20251103181224-f26f9409b101 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101 // indirect
google.golang.org/grpc v1.76.0 // indirect
google.golang.org/protobuf v1.36.10 // indirect
golang.org/x/net v0.49.0 // indirect
golang.org/x/sync v0.19.0 // indirect
golang.org/x/text v0.33.0 // indirect
google.golang.org/genproto v0.0.0-20260128011058-8636f8732409 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409 // indirect
google.golang.org/grpc v1.78.0 // indirect
google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading
Loading