File tree Expand file tree Collapse file tree 3 files changed +6
-5
lines changed Expand file tree Collapse file tree 3 files changed +6
-5
lines changed Original file line number Diff line number Diff line change 23
23
gnumake
24
24
less
25
25
gnused # force Linux `sed` everywhere
26
- go_1_24
26
+ go_1_24 # must match GO_VERSION in Dockerfile
27
27
golangci-lint
28
28
goreleaser
29
29
nixfmt-rfc-style
Original file line number Diff line number Diff line change 1
1
# 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
4
4
5
5
# These two are automatically set by docker buildx
6
6
ARG TARGETARCH
Original file line number Diff line number Diff line change @@ -6,6 +6,7 @@ PROTOS := protos/io/defang/v1/fabric.pb.go protos/io/defang/v1/defangv1connect/f
6
6
BINARY_NAME: =defang
7
7
GOFLAGS: =-ldflags "-X main.version=$(VERSION ) "
8
8
GOSRC := $(shell find . -name '* .go')
9
+ GO_VERSION := $(shell grep '^go ' go.mod | cut -d ' ' -f 2)
9
10
10
11
$(BINARY_NAME ) : $(PROTOS ) $(GOSRC ) go.mod go.sum
11
12
go build -o $@ $(GOFLAGS ) ./cmd/cli
@@ -90,11 +91,11 @@ DOCKER_IMAGE_AMD64:=$(DOCKER_IMAGE_NAME):amd64-$(VERSION)
90
91
91
92
.PHONY : image-amd64
92
93
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 ) .
94
95
95
96
.PHONY : image-arm64
96
97
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 ) .
98
99
99
100
.PHONY : images
100
101
images : image-amd64 image-arm64 # # Build all docker images and manifest
You can’t perform that action at this time.
0 commit comments