Merge dependabot and deps upgrades

jwkohnen · Feb 13, 2024 · 952f776 · 952f776
5 parents 02252f1 + 3683606 + 724fa7d + e3681b9 + 32edf96
commit 952f776
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/.github/workflows/golangci-lint.yaml b/.github/workflows/golangci-lint.yaml
@@ -20,7 +20,7 @@ jobs:
           go-version: 1.18
       - uses: actions/checkout@v4
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v4
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
           version: latest

diff --git a/Dockerfile b/Dockerfile
@@ -1,12 +1,12 @@
-FROM	golang:1.21.5 as build
+FROM	golang:1.22.0 as build
 WORKDIR	/conntrack-stats-exporter
 COPY	go.mod go.sum ./
 RUN	go mod download
 COPY	. .
 RUN	go mod verify
 RUN	./build.sh
 
-FROM	alpine:3.19.0
+FROM	alpine:3.19.1
 COPY	--from=build /conntrack-stats-exporter/conntrack-stats-exporter /usr/local/sbin/
 RUN	apk update && \
 	apk --no-cache upgrade && \

diff --git a/Dockerfile-race b/Dockerfile-race
@@ -1,4 +1,4 @@
-FROM	golang:1.21.5 as build
+FROM	golang:1.22.0 as build
 WORKDIR	/conntrack-stats-exporter
 COPY	go.mod go.sum ./
 RUN	go mod download

diff --git a/go.mod b/go.mod
@@ -4,4 +4,4 @@ go 1.19
 
 require github.com/vishvananda/netns v0.0.4
 
-require golang.org/x/sys v0.15.0 // indirect
+require golang.org/x/sys v0.17.0 // indirect
diff --git a/go.sum b/go.sum
@@ -1,8 +1,4 @@
 github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8=
 github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
-golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
-golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@ go 1.19

		require github.com/vishvananda/netns v0.0.4

		require golang.org/x/sys v0.15.0 // indirect
		require golang.org/x/sys v0.17.0 // indirect