Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature-docker][all-service] refactor the Dockerfile for smaller size #3291

Closed
wants to merge 2 commits into from

Conversation

rockxsj
Copy link
Contributor

@rockxsj rockxsj commented Jul 23, 2020

Tips

What is the purpose of the pull request

* run in docker only print logs to stdout
* refactor the Dockerfile and build script
* ignore some files and directory

Brief change log

 .dockerignore                                                                          |  29 ++++++++++++++++++++++++++
 .gitignore                                                                             |   4 +++-
 docker/build/Dockerfile                                                                | 107 +++++++++++++++++++++++++++++++++-------------------------------------------------------------
 docker/build/conf/dolphinscheduler/logback/logback-alert.xml                           |  16 --------------
 docker/build/conf/dolphinscheduler/logback/logback-api.xml                             |  21 -------------------
 docker/build/conf/dolphinscheduler/logback/logback-master.xml                          |  46 -----------------------------------------
 docker/build/conf/dolphinscheduler/logback/logback-worker.xml                          |  20 ------------------
 docker/build/hooks/build                                                               |  12 ++---------
 docker/build/startup.sh                                                                | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------
 docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-frontend.yaml |  25 ++++++++++++++++++++++
 script/dolphinscheduler-daemon.sh                                                      |  96 +++++++++++++++++++++++++++++++++++++++++++++---------------------------------------

Verify this pull request

(Please pick either of the following options)

This pull request is code cleanup without any test coverage.

* refactor the Dockerfile and build script
* ignore some files and directory
@@ -1,82 +1,49 @@
#
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why delete the license header?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added back

# docker build
echo -e "docker build --build-arg VERSION=${VERSION} -t $DOCKER_REPO:${VERSION} $(pwd)/docker/build/\n"
sudo docker build --build-arg VERSION=${VERSION} -t $DOCKER_REPO:${VERSION} $(pwd)/docker/build/
echo -e "docker build -f docker/build/Dockerfile -t $DOCKER_REPO:${VERSION} $(pwd)\n"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alter the path?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because of at the builder phase, copy src should from root path.

@CalvinKirs
Copy link
Member

Hi, please resolve the conflict.. If there is no update after 7 days, the PR will be closed, and you can reopen it when your problem is resolved.

davidzollo pushed a commit that referenced this pull request Jan 29, 2021
… nginx and improve log out (#4529)

* [Improvement][Docker] Reduce docker image size

* [Improvement][Docker] Improve log out

* [Improvement][Docker] Chmod +x to script files

* [Improvement][Docker] Remove frontend and fix docker statck deploy

* [Fix][Docker] Fix e2e test

* [Improvement][Docker] Revert log appender

* [Improvement][Docker] Remove stdout log appender
@davidzollo davidzollo closed this Jan 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants