Skip to content

Commit

Permalink
Merge pull request #163 from crazy-max/docker-24.0_bump-go
Browse files Browse the repository at this point in the history
[docker/24.0] bump go
  • Loading branch information
crazy-max committed Aug 8, 2023
2 parents bb13ceb + 1508ce3 commit ac7d9fc
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion common/vars.mk
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export BASEDIR ?= $(CURDIR)

# go base image
export GO_IMAGE ?= golang
export GO_VERSION ?= 1.20.3
export GO_VERSION ?= 1.20.7
export GO_IMAGE_VARIANT ?= bullseye

# if set, ony build matching the local platform
Expand Down
2 changes: 1 addition & 1 deletion pkg/docker-cli/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ARG GOVERSIONINFO_VERSION="v1.3.0"

# common args
ARG GO_IMAGE="golang"
ARG GO_VERSION="1.20.3"
ARG GO_VERSION="1.20.5"
ARG GO_IMAGE_VARIANT="bullseye"
ARG PKG_RELEASE="debian11"
ARG PKG_TYPE="deb"
Expand Down
2 changes: 1 addition & 1 deletion pkg/docker-cli/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
include ../../common/vars.mk

# https://github.com/docker/cli/blob/master/Dockerfile#L4
export GO_VERSION = 1.20.3
export GO_VERSION = 1.20.5

DESTDIR ?= $(BASEDIR)/bin
BAKE_DEFINITIONS ?= -f docker-bake.hcl -f ../../common/packages.hcl
Expand Down
2 changes: 1 addition & 1 deletion pkg/docker-cli/docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ variable "GO_IMAGE" {
default = "golang"
}
variable "GO_VERSION" {
default = "1.20.3"
default = "1.20.5"
}
variable "GO_IMAGE_VARIANT" {
default = "bullseye"
Expand Down
2 changes: 1 addition & 1 deletion pkg/docker-engine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ARG GOWINRES_VERSION="v0.3.0"

# common args
ARG GO_IMAGE="golang"
ARG GO_VERSION="1.20.3"
ARG GO_VERSION="1.20.5"
ARG GO_IMAGE_VARIANT="bullseye"
ARG PKG_RELEASE="debian11"
ARG PKG_TYPE="deb"
Expand Down
2 changes: 1 addition & 1 deletion pkg/docker-engine/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
include ../../common/vars.mk

# https://github.com/moby/moby/blob/master/Dockerfile#L3
export GO_VERSION = 1.20.3
export GO_VERSION = 1.20.5

DESTDIR ?= $(BASEDIR)/bin
BAKE_DEFINITIONS ?= -f docker-bake.hcl -f ../../common/packages.hcl
Expand Down
2 changes: 1 addition & 1 deletion pkg/docker-engine/docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ variable "GO_IMAGE" {
default = "golang"
}
variable "GO_VERSION" {
default = "1.20.3"
default = "1.20.5"
}
variable "GO_IMAGE_VARIANT" {
default = "bullseye"
Expand Down

0 comments on commit ac7d9fc

Please sign in to comment.