Skip to content

Commit

Permalink
Merge dependabot updates
Browse files Browse the repository at this point in the history
  • Loading branch information
jwkohnen committed Dec 12, 2023
5 parents 09259ff + 9f63e74 + 7d162de + 44e5337 + 34efc26 commit f45cf6c
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: docker/setup-buildx-action@v3

- name: Build
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
platforms: linux/amd64,linux/arm64
push: false
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: 1.18
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Build & Push
id: docker_build
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
platforms: linux/amd64,linux/arm64
push: true
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM golang:1.21.2 as build
FROM golang:1.21.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.18.4
FROM alpine:3.19.0
COPY --from=build /conntrack-stats-exporter/conntrack-stats-exporter /usr/local/sbin/
RUN apk update && \
apk --no-cache upgrade && \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-race
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21.2 as build
FROM golang:1.21.5 as build
WORKDIR /conntrack-stats-exporter
COPY go.mod go.sum ./
RUN go mod download
Expand Down

0 comments on commit f45cf6c

Please sign in to comment.