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.

Sign up for GitHub

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

Jump to bottom

Take advantage of multi files COPY to simplify Dockerfile #219

Merged
merged 1 commit into from
Jan 27, 2021
Merged

Take advantage of multi files COPY to simplify Dockerfile #219

merged 1 commit into from
Jan 27, 2021

Conversation

elfosardo
Copy link
Member

Move scripts under scripts dir and config files under config dir,
then copy everything at the same time when possible.
Also no need to specify ./ with COPY, the default path is always
inside the context of the build.

@metal3-io-bot metal3-io-bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 10, 2020
@metal3-io-bot metal3-io-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 13, 2020
@elfosardo
Copy link
Member Author

/test-integration

@elfosardo
Copy link
Member Author

/assign @hardys @maelk

@elfosardo
Copy link
Member Author

@hardys @maelk any chance I can get review on this ?

@zaneb
Copy link
Member

zaneb commented Nov 24, 2020

/test-integration
/lgtm

@metal3-io-bot metal3-io-bot added the lgtm Indicates that a PR is ready to be merged. label Nov 24, 2020
zaneb
zaneb reviewed Nov 24, 2020
View reviewed changes
Copy link
Member

@zaneb zaneb left a comment

Choose a reason for hiding this comment

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

/lgtm cancel

Dockerfile Outdated Show resolved Hide resolved
@metal3-io-bot metal3-io-bot removed the lgtm Indicates that a PR is ready to be merged. label Nov 24, 2020
@elfosardo elfosardo requested a review from zaneb November 24, 2020 16:25
@metal3-io-bot metal3-io-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 24, 2020
@elfosardo
Copy link
Member Author

/test-integration

@zaneb
Copy link
Member

zaneb commented Nov 30, 2020

/lgtm

@metal3-io-bot metal3-io-bot added the lgtm Indicates that a PR is ready to be merged. label Nov 30, 2020
@metal3-io-bot metal3-io-bot removed the lgtm Indicates that a PR is ready to be merged. label Dec 1, 2020
@elfosardo
Copy link
Member Author

@zaneb hi! Can you please have another look? Thanks!

@elfosardo elfosardo force-pushed the reduce-enthropy branch 3 times, most recently from ce82e6e to 766848f Compare December 14, 2020 10:15
@elfosardo
Copy link
Member Author

@zaneb @hardys @maelk can you please give this another look? Thanks!

@dtantsur
Copy link
Member

/test-integration

@zaneb
Copy link
Member

zaneb commented Jan 14, 2021

/lgtm

@metal3-io-bot metal3-io-bot added the lgtm Indicates that a PR is ready to be merged. label Jan 14, 2021
@elfosardo
Copy link
Member Author

@zaneb @hardys @maelk can you please give this another look? Thanks!

@elfosardo
Take advantage of multi files COPY to simplify Dockerfile
5fac384 
Move scripts under scripts dir and config files under config dir,
then copy everything at the same time when possible.
Also no need to specify ./ with COPY, the default path is always
in the source dir.
@metal3-io-bot metal3-io-bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 25, 2021
zaneb
zaneb reviewed Jan 25, 2021
View reviewed changes
Dockerfile
COPY ./dualboot.ipxe /tmp/dualboot.ipxe
# TODO(dtantsur): remove scripts/runironic script when we stop supporting
# running both API and conductor processes via one entry point.
COPY scripts/ /bin/
Copy link
Member

Choose a reason for hiding this comment

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

Should this be scripts/*? This is correct syntax for rsync, but I can't find any indication in the Dockerfile docs that the COPY directives treats a source with a trailing slash differently, rsync-style.

Copy link
Member Author

Choose a reason for hiding this comment

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

from COPY Docker docs:
"If is a directory, the entire contents of the directory are copied, including filesystem metadata."

Copy link
Member

Choose a reason for hiding this comment

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

And right after that:

Note

The directory itself is not copied, just its contents.

Copy link
Member

Choose a reason for hiding this comment

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

You know I read that like 5 times, and each time my brain transposed the position of the not 🤦

@zaneb
Copy link
Member

zaneb commented Jan 25, 2021

/lgtm
/test-integration

@metal3-io-bot metal3-io-bot added the lgtm Indicates that a PR is ready to be merged. label Jan 25, 2021
@derekhiggins
Copy link
Member

/approved

@metal3-io-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dtantsur, elfosardo

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@metal3-io-bot metal3-io-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 27, 2021
@metal3-io-bot metal3-io-bot merged commit 83b4610 into metal3-io:master Jan 27, 2021
@elfosardo elfosardo mentioned this pull request Feb 1, 2021
Merged
elfosardo pushed a commit to elfosardo/ironic-image that referenced this pull request Oct 12, 2021
@openshift-merge-robot
Merge pull request metal3-io#219 from rhjanders/ironic-irmc-raid-fixes
7cc7783 
Bug 2011753: Ironic resumes clean before raid configuration job is actually completed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zaneb zaneb zaneb left review comments

@dtantsur dtantsur dtantsur approved these changes

Assignees

@hardys hardys

@maelk maelk

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@elfosardo @zaneb @dtantsur @derekhiggins @metal3-io-bot @hardys @maelk