Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/go_modules/golang.org/x/sync-0.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
thepwagner authored Dec 9, 2024
2 parents b10901f + 96dc9cf commit 5921ddc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM alpine:3.20.3@sha256:1e42bbe2508154c9126d48c2b8a75420c3544343bf86fd041fb7527e017a4b4a
FROM alpine:3.21.0@sha256:21dc6063fd678b478f57c0e13f47560d0ea4eeba26dfc947b2a4f81f686b9f45
ENTRYPOINT ["/usr/bin/hansel"]
COPY hansel /usr/bin/hansel
4 changes: 2 additions & 2 deletions Dockerfile.test
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23.3 AS deb
FROM golang:1.23.4 AS deb
WORKDIR /app
COPY go.mod .
COPY go.sum .
Expand All @@ -9,7 +9,7 @@ RUN [ "go", "test", "-v", "./internal/cli/...", "-run", "TestGenerate_InstallDeb

# This line also determines the golang version used for GitHub Actions CI
# Use the qualified image name, so Dependabot treats this separate from "golang" above.
FROM docker.io/library/golang:1.23.3-alpine AS apk
FROM docker.io/library/golang:1.23.4-alpine AS apk
ENV CGO_ENABLED=0
WORKDIR /app
COPY go.mod .
Expand Down

0 comments on commit 5921ddc

Please sign in to comment.