Merge dependabot upgrades

jwkohnen · Jul 8, 2024 · 297a4f7 · 297a4f7
5 parents 420458b + 42019e0 + 731af22 + fbb58e1 + c866dcc
commit 297a4f7
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -17,7 +17,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           platforms: linux/amd64,linux/arm64
           push: false
diff --git a/.github/workflows/golangci-lint.yaml b/.github/workflows/golangci-lint.yaml
@@ -20,7 +20,7 @@ jobs:
           go-version: 1.22
       - uses: actions/checkout@v4
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v5
+        uses: golangci/golangci-lint-action@v6
         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: v1.51.1

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -41,7 +41,7 @@ jobs:
 
       - name: Build & Push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           platforms: linux/amd64,linux/arm64
           push: true

diff --git a/Dockerfile b/Dockerfile
@@ -1,12 +1,12 @@
-FROM	golang:1.22.2 as build
+FROM	golang:1.22.5 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.1
+FROM	alpine:3.20.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.22.2 as build
+FROM	golang:1.22.5 as build
 WORKDIR	/conntrack-stats-exporter
 COPY	go.mod go.sum ./
 RUN	go mod download