From 93669669b445e25f299f606c30ccc34258887164 Mon Sep 17 00:00:00 2001 From: chris-sun-star <85611200+chris-sun-star@users.noreply.github.com> Date: Tue, 26 Mar 2024 10:39:23 +0800 Subject: [PATCH] set version of oceanbase-dashboard to 0.2.0 and build oceanbase-dashboard image using make command (#261) --- charts/oceanbase-dashboard/Chart.yaml | 4 ++-- make/dashboard.mk | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/charts/oceanbase-dashboard/Chart.yaml b/charts/oceanbase-dashboard/Chart.yaml index 37de09d9c..570a49e1a 100644 --- a/charts/oceanbase-dashboard/Chart.yaml +++ b/charts/oceanbase-dashboard/Chart.yaml @@ -15,10 +15,10 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: 0.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.1.0" \ No newline at end of file +appVersion: "0.2.0" diff --git a/make/dashboard.mk b/make/dashboard.mk index 9afd26f3c..d5df1cafd 100644 --- a/make/dashboard.mk +++ b/make/dashboard.mk @@ -4,7 +4,8 @@ PROJECT=oceanbase-dashboard PROCESSOR=4 PWD ?= $(shell pwd) -DASHBOARD_VERSION ?= 1.0.0 +DASHBOARD_VERSION ?= 0.2.0 +DASHBOARD_IMG ?= oceanbase/oceanbase-dashboard:${DASHBOARD_VERSION} COMMIT_HASH ?= $(shell git rev-parse --short HEAD) BUILD_TIMESTAMP ?= $(shell date '+%Y%m%d%H%M%S') INJECT_PACKAGE=github.com/oceanbase/ob-operator/internal/dashboard/handler @@ -45,3 +46,11 @@ dep-install: ## Install dependencies for oceanbase-dashboard .PHONY: dev-dashboard dev-dashboard: ## Run oceanbase-dashboard in dev mode go run $(BUILD_FLAG) ./cmd/dashboard/main.go + +.PHONY: dashboard-docker-build +dashboard-docker-build: ## build oceanbase-dashboard image + docker build -t ${DASHBOARD_IMG} -f build/Dockerfile.dashboard . + +.PHONY: dashboard-docker-push +dashboard-docker-push: ## push oceanbase-dashboard image + docker push ${DASHBOARD_IMG}