Repository: zeppelin Updated Branches: refs/heads/master 0e1964877 -> 44b395f90
[MINOR][ZEPPELIN-2154] Enable work in the web dev mode if changing default server port ### What is this PR for? If user change `zeppelin.server.port` variable in zeppelin-site.xml, zeppelin doesn't work in web development. In order for user to run zeppelin correctly, so that user can add `SERVER_PORT` as an environment variable when running web application development mode. ### What type of PR is it? [Bug Fix | Improvement | Documentation] ### What is the Jira issue? * [ZEPPELIN-2154](https://issues.apache.org/jira/browse/ZEPPELIN-2154) ### How should this be tested? 1. Change `zeppelin.server.port` from 8080 to 8888 (or another port) in `zeppelin-site.xml` 2. Run zeppelin (`bin/zeppelin-daemon.sh start`) 3. Run web development mode under `zeppelin-web` folder such like `SERVER_PORT=8888 yarn run dev` 4. Connect `localhost:9000` ### Screenshots (if appropriate) [Before]  [After]  ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? Yes, added in README.md Author: soralee <sora0...@zepl.com> Closes #2097 from soralee/ZEPPELIN-2154_port_webDevMode and squashes the following commits: e6d1801 [soralee] modify typo 6b26cba [soralee] add README.md 394d3bb [soralee] add README.md bf22961 [soralee] enable custom server port in web dev mode Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/44b395f9 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/44b395f9 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/44b395f9 Branch: refs/heads/master Commit: 44b395f90dae05046d3dbf7a63ee5eff857328f8 Parents: 0e19648 Author: soralee <sora0...@zepl.com> Authored: Sun Mar 5 19:23:29 2017 +0900 Committer: ahyoungryu <ahyoung...@apache.org> Committed: Thu Mar 9 15:48:46 2017 +0900 ---------------------------------------------------------------------- zeppelin-web/README.md | 3 +++ zeppelin-web/src/components/baseUrl/baseUrl.service.js | 4 ++-- zeppelin-web/webpack.config.js | 9 ++++++++- 3 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/44b395f9/zeppelin-web/README.md ---------------------------------------------------------------------- diff --git a/zeppelin-web/README.md b/zeppelin-web/README.md index bb9cd18..11c26c5 100644 --- a/zeppelin-web/README.md +++ b/zeppelin-web/README.md @@ -31,6 +31,9 @@ $ yarn run build # you need to run zeppelin backend instance also $ yarn run dev +# If you are using a custom port, you must use the 'SERVER_PORT' variable to run the web application development mode +$ SERVER_PORT=8080 yarn run dev + # execute tests $ yarn run test ``` http://git-wip-us.apache.org/repos/asf/zeppelin/blob/44b395f9/zeppelin-web/src/components/baseUrl/baseUrl.service.js ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/components/baseUrl/baseUrl.service.js b/zeppelin-web/src/components/baseUrl/baseUrl.service.js index ff5e11b..f901157 100644 --- a/zeppelin-web/src/components/baseUrl/baseUrl.service.js +++ b/zeppelin-web/src/components/baseUrl/baseUrl.service.js @@ -24,8 +24,8 @@ function baseUrlSrv() { } } //Exception for when running locally via grunt - if (port === 3333 || port === 9000) { - port = 8080; + if (port === 9000) { + port = process.env.SERVER_PORT; } return port; }; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/44b395f9/zeppelin-web/webpack.config.js ---------------------------------------------------------------------- diff --git a/zeppelin-web/webpack.config.js b/zeppelin-web/webpack.config.js index f9aa0ed..d25166c 100644 --- a/zeppelin-web/webpack.config.js +++ b/zeppelin-web/webpack.config.js @@ -87,6 +87,12 @@ module.exports = function makeWebpackConfig () { app: './src/index.js' }; + var serverPort = 8080; + + if(process.env.SERVER_PORT) { + serverPort = process.env.SERVER_PORT; + } + /** * Output * Reference: http://webpack.github.io/docs/configuration.html#output @@ -211,7 +217,8 @@ module.exports = function makeWebpackConfig () { // Reference: https://webpack.github.io/docs/list-of-plugins.html#defineplugin new webpack.DefinePlugin({ 'process.env': { - HELIUM_BUNDLE_DEV: process.env.HELIUM_BUNDLE_DEV + HELIUM_BUNDLE_DEV: process.env.HELIUM_BUNDLE_DEV, + SERVER_PORT: serverPort } }) )
