asifdxtreme closed pull request #299: SCB-317 Merge frontend & service-center release URL: https://github.com/apache/incubator-servicecomb-service-center/pull/299
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/README.md b/README.md index e76ae142..57d0464a 100644 --- a/README.md +++ b/README.md @@ -31,12 +31,12 @@ You can download our latest release from [ServiceComb Website][github-release].W Windows(apache-incubator-servicecomb-service-center-XXX-windows-amd64.zip): ``` -start.bat +start-service-center.bat ``` Linux(apache-incubator-servicecomb-service-center-XXXX-linux-amd64.tar.gz): ```sh -./start.sh +./start-service-center.sh ``` Docker: ```sh diff --git a/frontend/Readme.md b/frontend/Readme.md index be1338c6..da89ec1f 100644 --- a/frontend/Readme.md +++ b/frontend/Readme.md @@ -5,19 +5,21 @@ Service-Center UI also offers a unique feature of testing the Schemas of their M ### QuickStart Guide -Easiest way to get started with Service-Center UI is to download the release from [here](https://dist.apache.org/repos/dist/dev/incubator/servicecomb/incubator-servicecomb-service-center/) and then untar/unzip it based on your OS and run start.sh/start.bat. +Easiest way to get started with Service-Center UI is to download the release from [here](https://dist.apache.org/repos/dist/dev/incubator/servicecomb/incubator-servicecomb-service-center/) and then untar/unzip it based on your OS and run start-frontend.sh/start-frontend.bat. This will bring up the Service-Center UI on [http://127.0.0.1:30103](http://127.0.0.1:30103). -Windows(apache-incubator-servicecomb-frontend-service-center-XXX-windows-amd64.zip): +Windows(apache-incubator-servicecomb-service-center-XXX-windows-amd64.zip): ``` -start.bat +start-frontend.bat ``` -Linux(apache-incubator-servicecomb-frontend-service-center-XXXX-linux-amd64.tar.gz): +Linux(apache-incubator-servicecomb-service-center-XXXX-linux-amd64.tar.gz): ```sh -./start.sh +./start-frontend.sh ``` +Note: By default frontend runs on 127.0.0.1, if you want to change this then you can change it in `conf/frontend.conf`. You can also change the the IP of Service-Center to which Frontend is connected over here `app/apiList/apiList.js` + ##### Running UI from source code However if you want to try our latest code then you can follow the below steps ``` @@ -56,7 +58,8 @@ We Welcome our community members to come forward and help us to build this UI to |5|Consumer List for MicroServices|Done| |6|Schema List for MicroServices|Done| |7|Test Schema for MicroServices|InProgress| -|8|Generate Client from Schema |TBD| -|9|Generate Server from Schema|TBD| +|8|Pact Broker Support|Done| +|9|Generate Client from Schema |TBD| +|10|Generate Server from Schema|TBD| Any Contribution(issues,PR,Documentation,Translation) will be highly appreciated. diff --git a/scripts/release/README.md b/scripts/release/README.md index 5e6e7dfa..64427c2e 100644 --- a/scripts/release/README.md +++ b/scripts/release/README.md @@ -30,17 +30,4 @@ bash -x scripts/release/make_release.sh linux 1.0.0 1.0.0-m1 bash -x scripts/release/make_release.sh windows 1.0.0 1.0.0-m1 ``` -#### Frontend Linux Release - -``` -# bash -x scripts/release/make_frontend_release.sh OS_NAME VERSION_NUMBER PACKAGE_NUMBER -bash -x scripts/release/make_frontend_release.sh linux 1.0.0 1.0.0-m1 -``` - -#### Frontend Windows Release - -``` -# bash -x scripts/release/make_frontend_release.sh OS_NAME VERSION_NUMBER PACKAGE_NUMBER -bash -x scripts/release/make_frontend_release.sh windows 1.0.0 1.0.0-m1 -``` diff --git a/scripts/release/make_frontend_release.sh b/scripts/release/make_frontend_release.sh deleted file mode 100644 index a2e397bf..00000000 --- a/scripts/release/make_frontend_release.sh +++ /dev/null @@ -1,137 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#!/usr/bin/env bash -## Get the Release Number -if [ $2 == "" ]; then - echo "Invalid version number....exiting...." - exit 1 -else - RELEASE=$2 -fi - -## Get the PACKAGE NUMBER -if [ $3 == "" ]; then - PACKAGE=RELEASE -else - PACKAGE=$3 -fi - -## Get the OS Version -case $1 in - linux ) - OSNAME=linux ;; - - windows ) - OSNAME=windows ;; - - all ) - OSNAME=all ;; - - * ) - echo "Wrong OS Version....exiting....." - exit 1 - -esac - -## Prepare the Configuration -prepare_conf() { - set +e - rm -rf tmp - - set -e - mkdir tmp - cp -r frontend/conf tmp/ -} - -# Build Linux Release -build_linux(){ - if [ $RELEASE == "" ] ; then - echo "Error in Making Linux Release.....Release Number not specified" - fi - if [ $PACKAGE = "" ]; then - echo "Error in Making Linux Release.....Package Number not specified" - fi - - set +e - rm -rf apache-incubator-servicecomb-frontend-service-center-$PACKAGE-linux-amd64 - rm -rf apache-incubator-servicecomb-frontend-service-center-$PACKAGE-linux-amd64.tar.gz - - set -e - mkdir -p apache-incubator-servicecomb-frontend-service-center-$PACKAGE-linux-amd64 - - export GOOS=linux - cd frontend - go build -o apache-incubator-serviceomb-frontend - cp -r apache-incubator-serviceomb-frontend ../apache-incubator-servicecomb-frontend-service-center-$PACKAGE-linux-amd64 - cd .. - prepare_conf - cp -r tmp/conf apache-incubator-servicecomb-frontend-service-center-$PACKAGE-linux-amd64/ - cp -r frontend/app apache-incubator-servicecomb-frontend-service-center-$PACKAGE-linux-amd64/ - echo "./apache-incubator-serviceomb-frontend > start-sc-frontend.log 2>&1 &" >> apache-incubator-servicecomb-frontend-service-center-$PACKAGE-linux-amd64/start.sh - echo "kill -9 \$(ps aux | grep 'apache-incubator-serviceomb-frontend' | awk '{print \$2}')" >> apache-incubator-servicecomb-frontend-service-center-$PACKAGE-linux-amd64/stop.sh - chmod +x apache-incubator-servicecomb-frontend-service-center-$PACKAGE-linux-amd64/start.sh - chmod +x apache-incubator-servicecomb-frontend-service-center-$PACKAGE-linux-amd64/stop.sh - cp -r LICENSE apache-incubator-servicecomb-frontend-service-center-$PACKAGE-linux-amd64/ - cp -r NOTICE apache-incubator-servicecomb-frontend-service-center-$PACKAGE-linux-amd64/ - cp -r DISCLAIMER apache-incubator-servicecomb-frontend-service-center-$PACKAGE-linux-amd64/ - cp -r frontend/Readme.md apache-incubator-servicecomb-frontend-service-center-$PACKAGE-linux-amd64/ - tar -czvf apache-incubator-servicecomb-frontend-service-center-$PACKAGE-linux-amd64.tar.gz apache-incubator-servicecomb-frontend-service-center-$PACKAGE-linux-amd64 - -} - -# Build Windows Release -build_windows(){ - if [ $RELEASE == "" ] ; then - echo "Error in Making Windows Release.....Release Number not specified" - fi - if [ $PACKAGE = "" ]; then - echo "Error in Making Windows Release.....Package Number not specified" - fi - - set +e - rm -rf apache-incubator-servicecomb-frontend-service-center-$PACKAGE-windows-amd64 - rm -rf apache-incubator-servicecomb-frontend-service-center-$PACKAGE-windows-amd64.zip - - set -e - mkdir -p apache-incubator-servicecomb-frontend-service-center-$PACKAGE-windows-amd64 - export GOOS=windows - cd frontend - go build -o apache-incubator-serviceomb-frontend.exe - cp -r apache-incubator-serviceomb-frontend.exe ../apache-incubator-servicecomb-frontend-service-center-$PACKAGE-windows-amd64 - cd .. - prepare_conf - cp -r tmp/conf apache-incubator-servicecomb-frontend-service-center-$PACKAGE-windows-amd64/ - cp -r frontend/app apache-incubator-servicecomb-frontend-service-center-$PACKAGE-windows-amd64/ - cp -r LICENSE apache-incubator-servicecomb-frontend-service-center-$PACKAGE-windows-amd64/ - cp -r NOTICE apache-incubator-servicecomb-frontend-service-center-$PACKAGE-windows-amd64/ - cp -r DISCLAIMER apache-incubator-servicecomb-frontend-service-center-$PACKAGE-windows-amd64/ - cp -r frontend/Readme.md apache-incubator-servicecomb-frontend-service-center-$PACKAGE-windows-amd64/ - echo "apache-incubator-serviceomb-frontend.exe" >> apache-incubator-servicecomb-frontend-service-center-$PACKAGE-windows-amd64/start.bat - tar -czvf apache-incubator-servicecomb-frontend-service-center-$PACKAGE-windows-amd64.tar.gz apache-incubator-servicecomb-frontend-service-center-$PACKAGE-windows-amd64 -} - -## Compile the binary -case $OSNAME in - linux ) - build_linux ;; - - windows ) - build_windows ;; - - all ) - build_linux - build_windows ;; - -esac diff --git a/scripts/release/make_release.sh b/scripts/release/make_release.sh index 75281463..df01cbba 100755 --- a/scripts/release/make_release.sh +++ b/scripts/release/make_release.sh @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +#!/usr/bin/env bash + ## Get the Release Number if [ $2 == "" ]; then echo "Invalid version number....exiting...." @@ -21,6 +23,9 @@ else RELEASE=$2 fi +#Package prefix for the release directory +PACKAGE_PREFIX=apache-incubator-servicecomb-service-center + ## Get the PACKAGE NUMBER if [ $3 == "" ]; then PACKAGE=RELEASE @@ -59,6 +64,14 @@ prepare_conf() { sed -i 's/manager_cluster = \"127.0.0.1:2379\"/# manager_cluster = \"127.0.0.1:2379\"/g' tmp/conf/app.conf #sed -i s@"manager_cluster.*=.*$"@"manager_name = \"sr-0\"\nmanager_addr = \"http://127.0.0.1:2380\"\nmanager_cluster = \"sr-0=http://127.0.0.1:2380\""@g tmp/conf/app.conf sed -i 's/registry_plugin = etcd/registry_plugin = embeded_etcd/g' tmp/conf/app.conf + + ## Prepare conf for frontend + set +e + rm -rf front-tmp + + set -e + mkdir front-tmp + cp -r frontend/conf front-tmp/ } # Build Linux Release @@ -71,31 +84,52 @@ build_linux(){ fi set +e - rm -rf apache-incubator-servicecomb-service-center-$PACKAGE-linux-amd64 - rm -rf apache-incubator-servicecomb-service-center-$PACKAGE-linux-amd64.tar.gz + rm -rf $PACKAGE_PREFIX-$PACKAGE-linux-amd64 + rm -rf $PACKAGE_PREFIX-$PACKAGE-linux-amd64.tar.gz set -e - mkdir -p apache-incubator-servicecomb-service-center-$PACKAGE-linux-amd64 + mkdir -p $PACKAGE_PREFIX-$PACKAGE-linux-amd64 + ## Build the Service-Center releases export GOOS=linux export GIT_COMMIT=$(git log --pretty=format:'%h' -n 1) export BUILD_NUMBER=$RELEASE GO_LDFLAGS="${GO_LDFLAGS} -X 'github.com/apache/incubator-servicecomb-service-center/version.BUILD_TAG=$(date +%Y%m%d%H%M%S).$BUILD_NUMBER.$GIT_COMMIT'" GO_LDFLAGS="${GO_LDFLAGS} -X 'github.com/apache/incubator-servicecomb-service-center/version.VERSION=$BUILD_NUMBER'" go build --ldflags "${GO_LDFLAGS}" -o apache-incubator-servicecomb-service-center - cp -r apache-incubator-servicecomb-service-center apache-incubator-servicecomb-service-center-$PACKAGE-linux-amd64 + cp -r apache-incubator-servicecomb-service-center $PACKAGE_PREFIX-$PACKAGE-linux-amd64 + + ## Build Frontend Release + cd frontend + go build -o apache-incubator-serviceomb-frontend + cp -r apache-incubator-serviceomb-frontend ../$PACKAGE_PREFIX-$PACKAGE-linux-amd64 + cd .. + prepare_conf - cp -r tmp/conf apache-incubator-servicecomb-service-center-$PACKAGE-linux-amd64/ - echo "./apache-incubator-servicecomb-service-center > start-sc.log 2>&1 &" >> apache-incubator-servicecomb-service-center-$PACKAGE-linux-amd64/start.sh - echo "kill -9 \$(ps aux | grep 'apache-incubator-servicecomb-service-center' | awk '{print \$2}')" >> apache-incubator-servicecomb-service-center-$PACKAGE-linux-amd64/stop.sh - chmod +x apache-incubator-servicecomb-service-center-$PACKAGE-linux-amd64/start.sh - chmod +x apache-incubator-servicecomb-service-center-$PACKAGE-linux-amd64/stop.sh - cp -r scripts/release/LICENSE apache-incubator-servicecomb-service-center-$PACKAGE-linux-amd64/ - cp -r scripts/release/licenses apache-incubator-servicecomb-service-center-$PACKAGE-linux-amd64/ - cp -r scripts/release/NOTICE apache-incubator-servicecomb-service-center-$PACKAGE-linux-amd64/ - cp -r DISCLAIMER apache-incubator-servicecomb-service-center-$PACKAGE-linux-amd64/ - cp -r README.md apache-incubator-servicecomb-service-center-$PACKAGE-linux-amd64/ - tar -czvf apache-incubator-servicecomb-service-center-$PACKAGE-linux-amd64.tar.gz apache-incubator-servicecomb-service-center-$PACKAGE-linux-amd64 + + ## Copy the Service-Center Releases + cp -r tmp/conf $PACKAGE_PREFIX-$PACKAGE-linux-amd64/ + echo "./apache-incubator-servicecomb-service-center > start-sc.log 2>&1 &" >> $PACKAGE_PREFIX-$PACKAGE-linux-amd64/start-service-center.sh + echo "kill -9 \$(ps aux | grep 'apache-incubator-servicecomb-service-center' | awk '{print \$2}')" >> $PACKAGE_PREFIX-$PACKAGE-linux-amd64/stop-service-center.sh + chmod +x $PACKAGE_PREFIX-$PACKAGE-linux-amd64/start-service-center.sh + chmod +x $PACKAGE_PREFIX-$PACKAGE-linux-amd64/stop-service-center.sh + cp -r scripts/release/LICENSE $PACKAGE_PREFIX-$PACKAGE-linux-amd64/ + cp -r scripts/release/licenses $PACKAGE_PREFIX-$PACKAGE-linux-amd64/ + cp -r scripts/release/NOTICE $PACKAGE_PREFIX-$PACKAGE-linux-amd64/ + cp -r DISCLAIMER $PACKAGE_PREFIX-$PACKAGE-linux-amd64/ + cp -r README.md $PACKAGE_PREFIX-$PACKAGE-linux-amd64/ + + ## Copy the frontend releases + cp -r front-tmp/conf/app.conf $PACKAGE_PREFIX-$PACKAGE-linux-amd64/conf/frontend.conf + cp -r frontend/app $PACKAGE_PREFIX-$PACKAGE-linux-amd64/ + echo "./apache-incubator-serviceomb-frontend > start-sc-frontend.log 2>&1 &" >> $PACKAGE_PREFIX-$PACKAGE-linux-amd64/start-frontend.sh + echo "kill -9 \$(ps aux | grep 'apache-incubator-serviceomb-frontend' | awk '{print \$2}')" >> $PACKAGE_PREFIX-$PACKAGE-linux-amd64/stop-frontend.sh + chmod +x $PACKAGE_PREFIX-$PACKAGE-linux-amd64/start-frontend.sh + chmod +x $PACKAGE_PREFIX-$PACKAGE-linux-amd64/stop-frontend.sh + cp -r frontend/Readme.md $PACKAGE_PREFIX-$PACKAGE-linux-amd64/frontend-Readme.md + + ## Archive the release + tar -czvf $PACKAGE_PREFIX-$PACKAGE-linux-amd64.tar.gz $PACKAGE_PREFIX-$PACKAGE-linux-amd64 } @@ -109,27 +143,46 @@ build_windows(){ fi set +e - rm -rf apache-incubator-servicecomb-service-center-$PACKAGE-windows-amd64 - rm -rf apache-incubator-servicecomb-service-center-$PACKAGE-windows-amd64.zip + rm -rf $PACKAGE_PREFIX-$PACKAGE-windows-amd64 + rm -rf $PACKAGE_PREFIX-$PACKAGE-windows-amd64.zip set -e - mkdir -p apache-incubator-servicecomb-service-center-$PACKAGE-windows-amd64 + mkdir -p $PACKAGE_PREFIX-$PACKAGE-windows-amd64 + + ## Build Service-Center Release export GOOS=windows export GIT_COMMIT=$(git log --pretty=format:'%h' -n 1) export BUILD_NUMBER=$RELEASE GO_LDFLAGS="${GO_LDFLAGS} -X 'github.com/apache/incubator-servicecomb-service-center/version.BUILD_TAG=$(date +%Y%m%d%H%M%S).$BUILD_NUMBER.$GIT_COMMIT'" GO_LDFLAGS="${GO_LDFLAGS} -X 'github.com/apache/incubator-servicecomb-service-center/version.VERSION=$BUILD_NUMBER'" go build --ldflags "${GO_LDFLAGS}" -o apache-incubator-servicecomb-service-center.exe - cp -r apache-incubator-servicecomb-service-center.exe apache-incubator-servicecomb-service-center-$PACKAGE-windows-amd64 + cp -r apache-incubator-servicecomb-service-center.exe $PACKAGE_PREFIX-$PACKAGE-windows-amd64 + + ## Build Frontend release + cd frontend + go build -o apache-incubator-serviceomb-frontend.exe + cp -r apache-incubator-serviceomb-frontend.exe ../$PACKAGE_PREFIX-$PACKAGE-windows-amd64 + cd .. + prepare_conf - cp -r tmp/conf apache-incubator-servicecomb-service-center-$PACKAGE-windows-amd64/ - echo "apache-incubator-servicecomb-service-center.exe" >> apache-incubator-servicecomb-service-center-$PACKAGE-windows-amd64/start.bat - cp -r scripts/release/LICENSE apache-incubator-servicecomb-service-center-$PACKAGE-windows-amd64/ - cp -r scripts/release/licenses apache-incubator-servicecomb-service-center-$PACKAGE-windows-amd64/ - cp -r scripts/release/NOTICE apache-incubator-servicecomb-service-center-$PACKAGE-windows-amd64/ - cp -r DISCLAIMER apache-incubator-servicecomb-service-center-$PACKAGE-windows-amd64/ - cp -r README.md apache-incubator-servicecomb-service-center-$PACKAGE-windows-amd64/ - tar -czvf apache-incubator-servicecomb-service-center-$PACKAGE-windows-amd64.tar.gz apache-incubator-servicecomb-service-center-$PACKAGE-windows-amd64 + + ## Copy the service-center releases + cp -r tmp/conf $PACKAGE_PREFIX-$PACKAGE-windows-amd64/ + echo "apache-incubator-servicecomb-service-center.exe" >> $PACKAGE_PREFIX-$PACKAGE-windows-amd64/start-service-center.bat + cp -r scripts/release/LICENSE $PACKAGE_PREFIX-$PACKAGE-windows-amd64/ + cp -r scripts/release/licenses $PACKAGE_PREFIX-$PACKAGE-windows-amd64/ + cp -r scripts/release/NOTICE $PACKAGE_PREFIX-$PACKAGE-windows-amd64/ + cp -r DISCLAIMER $PACKAGE_PREFIX-$PACKAGE-windows-amd64/ + cp -r README.md $PACKAGE_PREFIX-$PACKAGE-windows-amd64/ + + ## Copy the Frontend releases + cp -r front-tmp/conf $PACKAGE_PREFIX-$PACKAGE-windows-amd64/conf/frontend.conf + cp -r frontend/app $PACKAGE_PREFIX-$PACKAGE-windows-amd64/ + cp -r frontend/Readme.md $PACKAGE_PREFIX-$PACKAGE-windows-amd64/frontendReadme.md + echo "apache-incubator-serviceomb-frontend.exe" >> $PACKAGE_PREFIX-$PACKAGE-windows-amd64/start-frontend.bat + + ## Archive the Release + tar -czvf $PACKAGE_PREFIX-$PACKAGE-windows-amd64.tar.gz $PACKAGE_PREFIX-$PACKAGE-windows-amd64 } ## Compile the binary ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
