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

manage-dockerfile: use the original form of ENV/LABEL #134

Merged
merged 1 commit into from Feb 20, 2020

Conversation

nalind
Copy link
Member

@nalind nalind commented Feb 17, 2020

When rewriting the Dockerfile with our substitutions, we unconditionally insert = characters, even in cases where the original file didn't use them. They're syntactically important, though, so such changes can cause builds to fail. For ENV and LABEL instructions, just emit the original text.

Fixes openshift/origin#24151.

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Feb 17, 2020
When rewriting the Dockerfile with our substitutions, we unconditionally
insert `=` characters, even in cases where the original file didn't use
them.  They're syntactically important, though, so such changes can
cause builds to fail.  For ENV and LABEL instructions, just emit the
original text.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
@nalind
Copy link
Member Author

nalind commented Feb 18, 2020

Added unit tests.

@gabemontero
Copy link
Contributor

Fixing through simplification

LGTM

@nalind
Copy link
Member Author

nalind commented Feb 18, 2020

/test e2e-aws-builds

1 similar comment
@nalind
Copy link
Member Author

nalind commented Feb 19, 2020

/test e2e-aws-builds

Copy link
Contributor

@adambkaplan adambkaplan left a comment

Choose a reason for hiding this comment

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

/approve

Would like a second for lgtm. Do we want a BZ for this so we can land it in 4.4.0?

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 19, 2020
@adambkaplan
Copy link
Contributor

/lgtm

@gabemontero already gave it.

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 19, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: adambkaplan, nalind

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

Dockerfile build in OpenShift 4 fails but succeeds with docker
5 participants