Skip to content

Commit 98ae13d

Browse files
authored
fix: Docker build used Go version from go.mod (#1416)
1 parent 39251f0 commit 98ae13d

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
gnumake
2424
less
2525
gnused # force Linux `sed` everywhere
26-
go_1_24
26+
go_1_24 # must match GO_VERSION in Dockerfile
2727
golangci-lint
2828
goreleaser
2929
nixfmt-rfc-style

src/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Build stage
2-
ARG GOVERSION=1.23
3-
FROM --platform=${BUILDPLATFORM} golang:${GOVERSION} AS builder
2+
ARG GO_VERSION=1.24
3+
FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS builder
44

55
# These two are automatically set by docker buildx
66
ARG TARGETARCH

src/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ PROTOS := protos/io/defang/v1/fabric.pb.go protos/io/defang/v1/defangv1connect/f
66
BINARY_NAME:=defang
77
GOFLAGS:=-ldflags "-X main.version=$(VERSION)"
88
GOSRC := $(shell find . -name '*.go')
9+
GO_VERSION := $(shell grep '^go ' go.mod | cut -d ' ' -f 2)
910

1011
$(BINARY_NAME): $(PROTOS) $(GOSRC) go.mod go.sum
1112
go build -o $@ $(GOFLAGS) ./cmd/cli
@@ -90,11 +91,11 @@ DOCKER_IMAGE_AMD64:=$(DOCKER_IMAGE_NAME):amd64-$(VERSION)
9091

9192
.PHONY: image-amd64
9293
image-amd64:
93-
docker build --platform linux/amd64 -t ${PROJECT_NAME} -t $(DOCKER_IMAGE_AMD64) --build-arg VERSION=$(VERSION) .
94+
docker build --platform linux/amd64 -t ${PROJECT_NAME} -t $(DOCKER_IMAGE_AMD64) --build-arg VERSION=$(VERSION) --build-arg GO_VERSION=$(GO_VERSION) .
9495

9596
.PHONY: image-arm64
9697
image-arm64:
97-
docker build --platform linux/arm64 -t ${PROJECT_NAME} -t $(DOCKER_IMAGE_ARM64) --build-arg VERSION=$(VERSION) .
98+
docker build --platform linux/arm64 -t ${PROJECT_NAME} -t $(DOCKER_IMAGE_ARM64) --build-arg VERSION=$(VERSION) --build-arg GO_VERSION=$(GO_VERSION) .
9899

99100
.PHONY: images
100101
images: image-amd64 image-arm64 ## Build all docker images and manifest

0 commit comments

Comments
 (0)