You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2017/01/10 19:13:01 UTC
zeppelin git commit: [ZEPPELIN-1920] Fail to load app.js when
ZEPPELIN_SERVER_CONTEXT_PATH is set
Repository: zeppelin
Updated Branches:
refs/heads/master c59632d8b -> 99946e719
[ZEPPELIN-1920] Fail to load app.js when ZEPPELIN_SERVER_CONTEXT_PATH is set
### What is this PR for?
If user set env variable `ZEPPELIN_SERVER_CONTEXT_PATH`, web fails to load `app.xxxxx.js` because `webpack.config.js` configures root path to be `/`.
### What type of PR is it?
Bug Fix
### What is the Jira issue?
[ZEPPELIN-1920](https://issues.apache.org/jira/browse/ZEPPELIN-1920)
### How should this be tested?
1. open `conf/zeppelin-env.sh` and paste below:
```
export ZEPPELIN_SERVER_CONTEXT_PATH="/zeppelin/"
```
2. start zeppelin
3. see if you can load `localhost:8080/zeppelin` in browser
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: Mina Lee <mi...@apache.org>
Closes #1863 from minahlee/ZEPPELIN-1920 and squashes the following commits:
dbae64d [Mina Lee] Use '' instead of '/' for app script path
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/99946e71
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/99946e71
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/99946e71
Branch: refs/heads/master
Commit: 99946e719aa7b0b244a0d17fae6a81623cfb9fdf
Parents: c59632d
Author: Mina Lee <mi...@apache.org>
Authored: Sat Jan 7 18:12:26 2017 +0900
Committer: Lee moon soo <mo...@apache.org>
Committed: Tue Jan 10 11:12:52 2017 -0800
----------------------------------------------------------------------
zeppelin-web/src/app/home/home.css | 4 ++--
zeppelin-web/webpack.config.js | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99946e71/zeppelin-web/src/app/home/home.css
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/home/home.css b/zeppelin-web/src/app/home/home.css
index bf88e55..a0e4a6d 100644
--- a/zeppelin-web/src/app/home/home.css
+++ b/zeppelin-web/src/app/home/home.css
@@ -381,13 +381,13 @@ a.navbar-brand:hover {
}
.zeppelin {
- background: url('/assets/images/zepLogo.png') no-repeat right;
+ background: url('../assets/images/zepLogo.png') no-repeat right;
height: 380px;
opacity: 0.2;
}
.zeppelin2 {
- background: url('/assets/images/zepLogo.png') no-repeat right;
+ background: url('../assets/images/zepLogo.png') no-repeat right;
background-position-y: 12px;
height: 380px;
opacity: 0.2;
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99946e71/zeppelin-web/webpack.config.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/webpack.config.js b/zeppelin-web/webpack.config.js
index e168940..0efc721 100644
--- a/zeppelin-web/webpack.config.js
+++ b/zeppelin-web/webpack.config.js
@@ -98,7 +98,7 @@ module.exports = function makeWebpackConfig () {
// Output path from the view of the page
// Uses webpack-dev-server in development
- publicPath: isProd ? '/' : 'http://localhost:9000/',
+ publicPath: isProd ? '' : 'http://localhost:9000/',
// Filename for entry points
// Only adds hash in build mode