You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by le...@apache.org on 2020/06/30 07:20:49 UTC
[incubator-dolphinscheduler] branch 1.3.1-release updated (3485f45
-> 24134f9)
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a change to branch 1.3.1-release
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.
from 3485f45 [feature] readme.md adds instructions for changing environment variables (#3031)
new 0f70873 Change favicon.ico icon introduction method and package compilation to increase version number (#3030)
new 24134f9 fix release for nginx not package config files, eg: zookeeper.properties (#3041)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/assembly/dolphinscheduler-nginx.xml | 22 ++++++++++-----------
dolphinscheduler-ui/build/config.js | 6 ++++--
dolphinscheduler-ui/{src/images => }/favicon.ico | Bin
dolphinscheduler-ui/src/view/home/index.html | 2 +-
dolphinscheduler-ui/src/view/login/index.html | 2 +-
5 files changed, 17 insertions(+), 15 deletions(-)
copy dolphinscheduler-ui/{src/images => }/favicon.ico (100%)
[incubator-dolphinscheduler] 01/02: Change favicon.ico icon
introduction method and package compilation to increase version number
(#3030)
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch 1.3.1-release
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 0f708737a8d2ef9218bbaa6ce2299fc5bcc393b1
Author: break60 <79...@qq.com>
AuthorDate: Tue Jun 30 14:34:11 2020 +0800
Change favicon.ico icon introduction method and package compilation to increase version number (#3030)
---
dolphinscheduler-ui/build/config.js | 6 ++++--
dolphinscheduler-ui/favicon.ico | Bin 0 -> 4286 bytes
dolphinscheduler-ui/src/view/home/index.html | 2 +-
dolphinscheduler-ui/src/view/login/index.html | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/dolphinscheduler-ui/build/config.js b/dolphinscheduler-ui/build/config.js
index b5db173..91d59a0 100644
--- a/dolphinscheduler-ui/build/config.js
+++ b/dolphinscheduler-ui/build/config.js
@@ -95,7 +95,7 @@ const rewriterPath = p => {
}
}
}
-
+const version = new Date().getTime();
const pages = glob.sync(['*/!(_*).html'], { cwd: viewDir }).map(p => {
let pagePath = `${path.join(viewDir, p)}`
let newPagePath = rewriterPath(pagePath)
@@ -109,7 +109,9 @@ const pages = glob.sync(['*/!(_*).html'], { cwd: viewDir }).map(p => {
filename: newPagePath || path.join('view', p),
template: `${path.join('src/view', p)}`,
cache: true,
+ favicon:'./favicon.ico',
inject: true,
+ hash: version,
chunks: chunks,
minify: minifierConfig
})
@@ -120,7 +122,7 @@ const baseConfig = {
output: {
path: distDir,
publicPath: '/',
- filename: 'js/[name].[chunkhash:7].js'
+ filename: 'js/[name].[chunkhash:7]'+version+'.js'
},
module: {
rules: [
diff --git a/dolphinscheduler-ui/favicon.ico b/dolphinscheduler-ui/favicon.ico
new file mode 100644
index 0000000..acf4cf7
Binary files /dev/null and b/dolphinscheduler-ui/favicon.ico differ
diff --git a/dolphinscheduler-ui/src/view/home/index.html b/dolphinscheduler-ui/src/view/home/index.html
index 2a18be2..b29d116 100644
--- a/dolphinscheduler-ui/src/view/home/index.html
+++ b/dolphinscheduler-ui/src/view/home/index.html
@@ -33,7 +33,7 @@
<meta name="theme-color" content="#4a8dee">
<meta name="msapplication-navbutton-color" content="#4a8dee">
<meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1">
- <link rel="shortcut icon" href="<%= PUBLIC_PATH %>/images/favicon.ico"/>
+
<title>DolphinScheduler</title>
</head>
<body>
diff --git a/dolphinscheduler-ui/src/view/login/index.html b/dolphinscheduler-ui/src/view/login/index.html
index df456f6..cd1243f 100644
--- a/dolphinscheduler-ui/src/view/login/index.html
+++ b/dolphinscheduler-ui/src/view/login/index.html
@@ -31,7 +31,7 @@
<meta name="theme-color" content="#4a8dee">
<meta name="msapplication-navbutton-color" content="#4a8dee">
<meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1">
- <link rel="shortcut icon" href="<%= PUBLIC_PATH %>/images/favicon.ico"/>
+
<title>Login - DolphinScheduler</title>
</head>
<body>
[incubator-dolphinscheduler] 02/02: fix release for nginx not
package config files, eg: zookeeper.properties (#3041)
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch 1.3.1-release
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 24134f9271af8e01fcd2667450a15a40faf02a3f
Author: liuhuijuan <67...@users.noreply.github.com>
AuthorDate: Thu Jun 25 14:50:31 2020 +0800
fix release for nginx not package config files, eg: zookeeper.properties (#3041)
* fix release for nginx bug
* add state (#3040)
Co-authored-by: mzjnumber1@163.com <mz...@163.com>
* [BUG_FIX]fix multi-threaded tests error. (#3044)
* fix test mock error
* fix test mock error
Co-authored-by: muzhongjiang <mu...@163.com>
Co-authored-by: mzjnumber1@163.com <mz...@163.com>
Co-authored-by: CalvinKirs <ac...@163.com>
---
.../src/main/assembly/dolphinscheduler-nginx.xml | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-nginx.xml b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-nginx.xml
index f4e403e..f41151c 100644
--- a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-nginx.xml
+++ b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-nginx.xml
@@ -98,25 +98,24 @@
</includes>
<outputDirectory>conf</outputDirectory>
</fileSet>
+
+
<fileSet>
- <directory>${basedir}/../dolphinscheduler-common/src/main/resources</directory>
+ <directory>${basedir}/../dolphinscheduler-dao/src/main/resources</directory>
<includes>
<include>**/*.properties</include>
<include>**/*.xml</include>
<include>**/*.json</include>
+ <include>**/*.yml</include>
</includes>
<outputDirectory>conf</outputDirectory>
</fileSet>
+ <!--server end-->
+
+
+ <!--service end-->
<fileSet>
- <directory>${basedir}/../dolphinscheduler-common/src/main/resources/bin</directory>
- <includes>
- <include>*.*</include>
- </includes>
- <directoryMode>755</directoryMode>
- <outputDirectory>bin</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${basedir}/../dolphinscheduler-dao/src/main/resources</directory>
+ <directory>${basedir}/../dolphinscheduler-service/src/main/resources</directory>
<includes>
<include>**/*.properties</include>
<include>**/*.xml</include>
@@ -125,7 +124,8 @@
</includes>
<outputDirectory>conf</outputDirectory>
</fileSet>
- <!--server end-->
+ <!--service end-->
+
<fileSet>
<directory>${basedir}/../dolphinscheduler-server/target/dolphinscheduler-server-${project.version}</directory>