Skip to content

Commit 4f45670

Browse files
committed
Make the flavor configurable on the Docker build
1 parent fdbb634 commit 4f45670

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
FROM golang:alpine as golang
2+
23
RUN apk add -U --no-cache ca-certificates git make
34

45
COPY go.mod go.sum /src/
@@ -7,7 +8,9 @@ WORKDIR /src
78
RUN GOPROXY=direct go mod download
89

910
COPY . /src
10-
RUN FLAVOR=nightly CGO_ENABLED=0 GOPROXY=direct make
11+
12+
ARG flavor=custom
13+
RUN FLAVOR="$flavor" CGO_ENABLED=0 GOPROXY=direct make
1114

1215
FROM scratch
1316
COPY LICENSE BINARY_LICENSE THIRDPARTY /

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ artifacts: ## Create CloudFormation ar
6767
.PHONY: artifacts
6868

6969
docker: ## Build a Docker image, currently only supports x86 hosts
70-
docker build --platform=linux/amd64 --push -t $(DOCKER_IMAGE):$(DOCKER_IMAGE_VERSION) .
70+
docker build --build-arg flavor=$(FLAVOR) --platform=linux/amd64 --push -t $(DOCKER_IMAGE):$(DOCKER_IMAGE_VERSION) .
7171
.PHONY: docker
7272

7373
docker-login:

0 commit comments

Comments
 (0)