Skip to content

Remove unnecessary intermediate layers in base-conda Dockerfile#5697

Merged
rohitgr7 merged 8 commits intoLightning-AI:masterfrom
sumanthratna:patch-1
Jan 29, 2021
Merged

Remove unnecessary intermediate layers in base-conda Dockerfile#5697
rohitgr7 merged 8 commits intoLightning-AI:masterfrom
sumanthratna:patch-1

Conversation

@sumanthratna
Copy link
Copy Markdown
Contributor

@sumanthratna sumanthratna commented Jan 28, 2021 •
edited by Borda
Loading

What does this PR do?

before this PR, the base-conda Dockerfile created 12 unnecessary intermediate layers (mostly from ENVs). If you all decide to merge this PR, I can create PRs for the other Dockerfiles (or I can fix the other Dockerfiles in this PR).

Please let me know if this is worth updating the changelog!

Before submitting

  • Was this discussed/approved via a GitHub issue? (not for typos and docs)
  • Did you read the contributor guideline, Pull Request section?
  • Did you make sure your PR does only one thing, instead of bundling different changes together?
  • Did you make sure to update the documentation with your changes? (if necessary)
  • Did you write any new necessary tests? (not for typos and docs)
  • Did you verify new and existing tests pass locally with your changes?
  • Did you update the CHANGELOG? (not for typos, docs, test updates, or internal minor changes/refactorings)

PR review

Anyone in the community is free to review the PR once the tests have passed.
Before you start reviewing make sure you have read Review guidelines. In short, see the following bullet-list:

  • Is this pull request ready for review? (if not, please submit in draft mode)
  • Check that all items from Before submitting are resolved
  • Make sure the title is self-explanatory and the description concisely explains the PR
  • Add labels and milestones (and optionally projects) to the PR so it can be classified
  • Check that target branch and milestone match!

Did you have fun?

Make sure you had fun coding 🙃

@codecov
Copy link
Copy Markdown

codecov Bot commented Jan 28, 2021 •
edited
Loading

Codecov Report

Merging #5697 (dc60878) into master (8cb2451) will not change coverage.
The diff coverage is n/a.

@@          Coverage Diff           @@
##           master   #5697   +/-   ##
======================================
  Coverage      93%     93%           
======================================
  Files         134     134           
  Lines       10055   10055           
======================================
  Hits         9388    9388           
  Misses        667     667

Borda
Borda previously approved these changes Jan 28, 2021
View reviewed changes
Copy link
Copy Markdown
Collaborator

@Borda Borda left a comment

Choose a reason for hiding this comment

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

cool, mind do it also for other Docker files within this PR?

@Borda Borda dismissed their stale review January 28, 2021 21:59

tests

@Borda Borda added the ci Continuous Integration label Jan 28, 2021
@sumanthratna sumanthratna requested a review from Borda January 28, 2021 22:15
@Borda
Copy link
Copy Markdown
Collaborator

Borda commented Jan 28, 2021

seems that all docker builds are failing now... :/

@sumanthratna
Copy link
Copy Markdown
Contributor Author

sumanthratna commented Jan 28, 2021

seems that all docker builds are failing now... :/

@Borda it should be better now!

@Borda Borda enabled auto-merge (squash) January 29, 2021 08:38
@Borda Borda added the ready to be merged PRs ready to be merged label Jan 29, 2021
@Borda Borda added this to the 1.1.x milestone Jan 29, 2021
@mergify mergify Bot requested a review from a team January 29, 2021 08:39
@Borda Borda disabled auto-merge January 29, 2021 08:41
@Borda Borda enabled auto-merge (squash) January 29, 2021 08:41
@rohitgr7
Copy link
Copy Markdown
Contributor

rohitgr7 commented Jan 29, 2021

I wonder why isn't it merged automatically.

@rohitgr7 rohitgr7 disabled auto-merge January 29, 2021 12:27
@rohitgr7 rohitgr7 merged commit 6d656d0 into Lightning-AI:master Jan 29, 2021
@Borda
Copy link
Copy Markdown
Collaborator

Borda commented Jan 29, 2021 •
edited
Loading

I wonder why isn't it merged automatically.

hard to tell you now when it is merged :P

@sumanthratna sumanthratna deleted the patch-1 branch January 29, 2021 13:45
tchaton pushed a commit that referenced this pull request Feb 5, 2021
@sumanthratna @Borda @tchaton
Remove unnecessary intermediate layers in base-conda Dockerfile (#5697)
4108a68 
* [docker][base-conda] Combine ENV+COPY instructions

* [docker][base-cuda] Combine ENV+COPY instructions

* [docker][base-xla] Combine ENV+COPY instructions

* [docker][base-cuda] Fix COPY instruction

* [docker][base-xla] Fix quote in ENV

* [docker][base-xla] Fix $PATH in ENV

* [docker][base-conda] Fix COPY instruction

* chlog

Co-authored-by: Jirka Borovec <jirka.borovec@seznam.cz>
Borda added a commit that referenced this pull request Feb 5, 2021
@sumanthratna @Borda
Remove unnecessary intermediate layers in base-conda Dockerfile (#5697)
a413711 
* [docker][base-conda] Combine ENV+COPY instructions

* [docker][base-cuda] Combine ENV+COPY instructions

* [docker][base-xla] Combine ENV+COPY instructions

* [docker][base-cuda] Fix COPY instruction

* [docker][base-xla] Fix quote in ENV

* [docker][base-xla] Fix $PATH in ENV

* [docker][base-conda] Fix COPY instruction

* chlog

Co-authored-by: Jirka Borovec <jirka.borovec@seznam.cz>
Borda added a commit that referenced this pull request Feb 5, 2021
@sumanthratna @Borda
Remove unnecessary intermediate layers in base-conda Dockerfile (#5697)
8732475 
* [docker][base-conda] Combine ENV+COPY instructions

* [docker][base-cuda] Combine ENV+COPY instructions

* [docker][base-xla] Combine ENV+COPY instructions

* [docker][base-cuda] Fix COPY instruction

* [docker][base-xla] Fix quote in ENV

* [docker][base-xla] Fix $PATH in ENV

* [docker][base-conda] Fix COPY instruction

* chlog

Co-authored-by: Jirka Borovec <jirka.borovec@seznam.cz>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Borda Borda Borda approved these changes

@SkafteNicki SkafteNicki SkafteNicki approved these changes

@tchaton tchaton Awaiting requested review from tchaton tchaton is a code owner

@carmocca carmocca Awaiting requested review from carmocca

@justusschock justusschock Awaiting requested review from justusschock justusschock is a code owner

@SeanNaren SeanNaren Awaiting requested review from SeanNaren

@williamFalcon williamFalcon Awaiting requested review from williamFalcon

+2 more reviewers

@awaelchli awaelchli awaelchli approved these changes

@rohitgr7 rohitgr7 rohitgr7 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

ci Continuous Integration ready to be merged PRs ready to be merged

Projects

None yet

Milestone

pl:1.1.x

Development

Successfully merging this pull request may close these issues.

5 participants

@sumanthratna @Borda @rohitgr7 @awaelchli @SkafteNicki