Skip to content

Commit 1639e54

Browse files
committed
unify to BUILD_VERSION
Signed-off-by: Dan <[email protected]>
1 parent e812b97 commit 1639e54

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ else
4242
endif
4343

4444
.PHONY: build/web
45-
build/web: PIPECD_VERSION ?= $(shell git describe --tags --always --dirty --abbrev=7 --match 'v[0-9]*.*')
45+
build/web: BUILD_VERSION ?= $(shell git describe --tags --always --dirty --abbrev=7 --match 'v[0-9]*.*')
4646
build/web:
47-
PIPECD_VERSION=$(PIPECD_VERSION) yarn --cwd web build
47+
BUILD_VERSION=$(BUILD_VERSION) yarn --cwd web build
4848

4949
.PHONY: build/chart
5050
build/chart: VERSION ?= $(shell git describe --tags --always --dirty --abbrev=7 --match 'v[0-9]*.*')
@@ -156,10 +156,9 @@ run/pipecd: BUILD_DATE ?= $(shell date -u '+%Y%m%d-%H%M%S')
156156
run/pipecd: BUILD_LDFLAGS_PREFIX := -X github.com/pipe-cd/pipecd/pkg/version
157157
run/pipecd: BUILD_OPTS ?= -ldflags "$(BUILD_LDFLAGS_PREFIX).version=$(BUILD_VERSION) $(BUILD_LDFLAGS_PREFIX).gitCommit=$(BUILD_COMMIT) $(BUILD_LDFLAGS_PREFIX).buildDate=$(BUILD_DATE) -w"
158158
run/pipecd: CONTROL_PLANE_VALUES ?= ./quickstart/control-plane-values.yaml
159-
run/pipecd: PIPECD_VERSION ?= $(shell git describe --tags --always --dirty --abbrev=7 --match 'v[0-9]*.*')
160159
run/pipecd:
161160
@echo "Building docker image and pushing it to local registry..."
162-
docker build -f cmd/pipecd/Dockerfile -t localhost:5001/pipecd:$(BUILD_VERSION) --build-arg BUILD_VERSION=$(PIPECD_VERSION) .
161+
docker build -f cmd/pipecd/Dockerfile -t localhost:5001/pipecd:$(BUILD_VERSION) --build-arg BUILD_VERSION=$(BUILD_VERSION) .
163162
docker push localhost:5001/pipecd:$(BUILD_VERSION)
164163

165164
@echo "Installing Control Plane in kind..."

0 commit comments

Comments
 (0)