Merged
Conversation
added 8 commits
July 10, 2020 19:49
* update wechat alert config replace placeholder from to {xx} because of the will be treat as env variable
* fix unit test of EnterpriseWeChatUtilsTest
* update values.yaml default config for helm deploy DS cluster
* update values.yaml default config for custom install
* update templates of helm for custom install
* update some name of env varibale, for example change from POSTGRESQL_HOST to DATABASE_HOST
* delele the redundancy requirements.yaml for heml
* update README* in the docker dir and subdir
* update startup scripts for support mysql as backend database
* remove the didn't need port mapping in postgresql & zookeeper & dolphinscheduler-api
khadgarmage
previously requested changes
Jul 16, 2020
docker/build/Dockerfile
Outdated
| #4. install pg | ||
| RUN apk add postgresql postgresql-contrib | ||
| #4. install database | ||
| RUN apk add postgresql postgresql-contrib mysql-client |
Contributor
There was a problem hiding this comment.
mysql's license can not meet the requirements of apache, pls remove it
| echo "Error: Can't connect to database...${v}" | ||
| exit 1 | ||
| echo "connect ${DATABASE_TYPE} service" | ||
| if [ ${DATABASE_TYPE} = "mysql" ]; then |
liwenhe1993
previously requested changes
Jul 16, 2020
Member
liwenhe1993
left a comment
There was a problem hiding this comment.
Please remove mysql-client in Dockerfile
|
Kudos, SonarCloud Quality Gate passed!
|
davidzollo
approved these changes
Jul 16, 2020
Contributor
|
@liwenhe1993 @khadgarmage , I see rockxsj has updated as you said , I will merge this PR |
rockxsj has updated as you said
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Tips
What is the purpose of the pull request
Brief change log
Modify ambari_plugin/common-services/DOLPHIN/1.2.1/package/scripts/params.py
Modify ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/params.py
Modify docker/build/Dockerfile
Modify docker/build/README.md
Modify docker/build/README_zh_CN.md
Modify docker/build/conf/dolphinscheduler/alert.properties.tpl
Modify docker/build/conf/dolphinscheduler/common.properties.tpl
Modify docker/build/conf/dolphinscheduler/datasource.properties.tpl
Modify docker/build/conf/dolphinscheduler/logback/logback-alert.xml
Modify docker/build/conf/dolphinscheduler/zookeeper.properties.tpl
Modify docker/build/startup-init-conf.sh
Modify docker/build/startup.sh
Modify docker/docker-swarm/docker-compose.yml
Modify docker/docker-swarm/docker-stack.yml
Modify docker/kubernetes/dolphinscheduler/Chart.yaml
Modify docker/kubernetes/dolphinscheduler/README.md
Modify docker/kubernetes/dolphinscheduler/requirements.yaml
Modify docker/kubernetes/dolphinscheduler/templates/NOTES.txt
Modify docker/kubernetes/dolphinscheduler/templates/_helpers.tpl
Modify docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-alert.yaml
Add docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-common.yaml
Modify docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-alert.yaml
Modify docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml
Modify docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-frontend.yaml
Modify docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-master.yaml
Modify docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml
Modify docker/kubernetes/dolphinscheduler/values.yaml
Modify dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtils.java
Modify dolphinscheduler-alert/src/main/resources/alert.properties
Modify dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtilsTest.java
Modify dolphinscheduler-ui/package.json
Modify script/dolphinscheduler-daemon.sh
Modify docker/docker-swarm/docker-compose.yml
Modify docker/docker-swarm/docker-stack.yml
Verify this pull request
This pull request is code cleanup without any test coverage.