Merge pull request #168 from wilhelmguo/feature/update_release_version

Update release version before release

Author: wilhelmguo

Makefile

@@ -2,18 +2,17 @@
 
 MAKEFLAGS += --warn-undefined-variables
 
-# Runtime/Dev variables (used in src/backend/conf/app.conf)
--include .env
-export
-
 # Build variables
+REGISTRY_URI :=360cloud
 RELEASE_VERSION :=$(shell git describe --always --tags)
 UI_BUILD_VERSION :=v1.0.0
 SERVER_BUILD_VERSION :=v1.0.0
 
 
-release: build-release-image push-image
+release: update-version build-release-image push-image
 
+update-version:
+	./hack/updateversion.sh
 
 # run module
 run-backend:
@@ -45,18 +44,18 @@ swagger-openapi:
 # release, requiring Docker 17.05 or higher on the daemon and client
 build-release-image:
 	@echo "version: $(RELEASE_VERSION)"
-	docker build --no-cache --build-arg RAVEN_DSN=$(RAVEN_DSN) -t 360cloud/wayne:$(RELEASE_VERSION) .
+	docker build --no-cache --build-arg RAVEN_DSN=$(RAVEN_DSN) -t $(REGISTRY_URI)/wayne:$(RELEASE_VERSION) .
 
 push-image:
-	docker push 360cloud/wayne:$(RELEASE_VERSION)
+	docker push $(REGISTRY_URI)/wayne:$(RELEASE_VERSION)
 
 
 ## server builder image
 build-server-image:
 	cd hack/build/server && docker build --no-cache \
-	-t 360cloud/wayne-server-builder:$(SERVER_BUILD_VERSION) .
+	-t $(REGISTRY_URI)/wayne-server-builder:$(SERVER_BUILD_VERSION) .
 
 ## ui builder image
 build-ui-image:
-	docker build -f hack/build/ui/Dockerfile -t 360cloud/wayne-ui-builder:$(UI_BUILD_VERSION) .
+	docker build -f hack/build/ui/Dockerfile -t $(REGISTRY_URI)/wayne-ui-builder:$(UI_BUILD_VERSION) .
 

bump.sh hack/bump.shbump.sh renamed to hack/bump.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+GO_MAIN=src/backend/main.go
+PACKAGE_JSON=src/frontend/package.json
+SWAGGER_VERSION_GO=src/backend/controllers/openapi/openapi.go
+
+VERSION=(`grep -Eo "v[0-9]+\.[0-9]+\.[0-9]+[a-z0-9\-]*" ${GO_MAIN}`)
+NEXT_VERSION=$(git describe --always --tags)
+
+echo "Project current version: [$VERSION], next_version:[$NEXT_VERSION] "
+
+sed -i "s/$VERSION/$NEXT_VERSION/" ${GO_MAIN}
+sed -i 's/\("version": "\)'$VERSION'/\1'$NEXT_VERSION'/' $PACKAGE_JSON
+sed -i 's/\(Version: \)'$VERSION'/\1'$NEXT_VERSION'/' $SWAGGER_VERSION_GO

hack/updateversion.sh

@@ -14,7 +14,7 @@
 //     Schemes: https
 //     Host: localhost
 //     BasePath: /openapi/v1/gateway/action
-//     Version: 1.1.0
+//     Version: v1.1.0
 //
 //     Consumes:
 //     - application/json

src/backend/controllers/openapi/openapi.go

@@ -4,7 +4,7 @@ import (
 	"github.com/Qihoo360/wayne/src/backend/cmd"
 )
 
-var Version string = "1.1.0"
+const Version = "v1.1.0"
 
 func main() {
 	cmd.Version = Version

src/backend/main.go

@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "1.1.0",
+  "version": "v1.1.0",
   "license": "MIT",
   "scripts": {
     "ng": "ng",