Skip to content

Commit df2b5ac

Browse files
committed
pkg(docker-engine): bump go to 1.24.4 and image variant to bookworm
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
1 parent 8532774 commit df2b5ac

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

pkg/docker-engine/Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@
1717
ARG XX_VERSION="1.6.1"
1818
ARG DEBIAN_FRONTEND="noninteractive"
1919

20-
# https://github.com/moby/moby/blob/master/Dockerfile#L178
21-
ARG GOWINRES_VERSION="v0.3.0"
20+
# https://github.com/moby/moby/blob/master/Dockerfile#L157
21+
ARG GOWINRES_VERSION="v0.3.1"
2222

2323
# common args
2424
ARG GO_IMAGE="golang"
25-
ARG GO_VERSION="1.21.3"
26-
ARG GO_IMAGE_VARIANT="bullseye"
27-
ARG PKG_RELEASE="debian11"
25+
ARG GO_VERSION="1.24.4"
26+
ARG GO_IMAGE_VARIANT="bookworm"
27+
ARG PKG_RELEASE="debian12"
2828
ARG PKG_TYPE="deb"
2929
ARG PKG_DISTRO="debian"
30-
ARG PKG_DISTRO_ID="11"
31-
ARG PKG_DISTRO_SUITE="bullseye"
32-
ARG PKG_BASE_IMAGE="debian:bullseye"
30+
ARG PKG_DISTRO_ID="12"
31+
ARG PKG_DISTRO_SUITE="bookworm"
32+
ARG PKG_BASE_IMAGE="debian:bookworm"
3333

3434
# stage used as named context that mounts common/scripts
3535
# see pkg target in docker-bake.hcl

pkg/docker-engine/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
include ../../common/vars.mk
1616

1717
# https://github.com/moby/moby/blob/master/Dockerfile#L3
18-
export GO_VERSION = 1.21.3
18+
export GO_VERSION = 1.24.4
1919

2020
DESTDIR ?= $(BASEDIR)/bin
2121
BAKE_DEFINITIONS ?= -f docker-bake.hcl -f ../../common/packages.hcl

pkg/docker-engine/docker-bake.hcl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ variable "GO_IMAGE" {
3434
default = "golang"
3535
}
3636
variable "GO_VERSION" {
37-
default = "1.21.3"
37+
default = "1.24.4"
3838
}
3939
variable "GO_IMAGE_VARIANT" {
40-
default = "bullseye"
40+
default = "bookworm"
4141
}
4242

4343
# Sets the pkg name.

0 commit comments

Comments
 (0)