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

[release-4.4] Bug 1821860: manage-dockerfile: use the original form of ENV/LABEL #148

Merged
merged 1 commit into from Apr 17, 2020
Merged

[release-4.4] Bug 1821860: manage-dockerfile: use the original form of ENV/LABEL #148

merged 1 commit into from Apr 17, 2020

Conversation

nalind
Copy link
Member

@nalind nalind commented Apr 7, 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.

Cherry-picked from #134.

@nalind
manage-dockerfile: use the original form of ENV/LABEL
a98f8a6 
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>
@openshift-ci-robot
Copy link
Contributor

@nalind: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

[release-4.4] manage-dockerfile: use the original form of ENV/LABEL

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@nalind
Copy link
Member Author

nalind commented Apr 7, 2020

/test e2e-aws-image-ecosystem

@nalind nalind changed the title [release-4.4] manage-dockerfile: use the original form of ENV/LABEL [release-4.4] Bug 1821860: manage-dockerfile: use the original form of ENV/LABEL Apr 7, 2020
@openshift-ci-robot openshift-ci-robot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Apr 7, 2020
@openshift-ci-robot
Copy link
Contributor

@nalind: This pull request references Bugzilla bug 1821860, which is invalid:

  • expected dependent Bugzilla bug 1821858 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is MODIFIED instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

[release-4.4] Bug 1821860: manage-dockerfile: use the original form of ENV/LABEL

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@nalind
Copy link
Member Author

nalind commented Apr 8, 2020

/bugzilla refresh

@openshift-ci-robot
Copy link
Contributor

@nalind: This pull request references Bugzilla bug 1821860, which is invalid:

  • expected dependent Bugzilla bug 1821858 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ON_QA instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/bugzilla refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@adambkaplan
Copy link
Contributor

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Apr 13, 2020
@openshift-ci-robot
Copy link
Contributor

@adambkaplan: This pull request references Bugzilla bug 1821860, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.4.0) matches configured target release for branch (4.4.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1821858 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1821858 targets the "4.5.0" release, which is one of the valid target releases: 4.5.0
  • bug has dependents

In response to this:

/bugzilla refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

adambkaplan
adambkaplan approved these changes Apr 13, 2020
View reviewed changes
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.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 13, 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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 13, 2020
@mrunalp mrunalp added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Apr 16, 2020
@nee1esh
Copy link

nee1esh commented Apr 16, 2020

/retest

1 similar comment
@nee1esh
Copy link

nee1esh commented Apr 16, 2020

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

2 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit a4bbc3f into openshift:release-4.4 Apr 17, 2020
@openshift-ci-robot
Copy link
Contributor

@nalind: All pull requests linked via external trackers have merged: openshift/builder#148. Bugzilla bug 1821860 has been moved to the MODIFIED state.

In response to this:

[release-4.4] Bug 1821860: manage-dockerfile: use the original form of ENV/LABEL

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@nalind nalind deleted the manage-env-quote-4.4 branch April 17, 2020 14:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adambkaplan adambkaplan adambkaplan approved these changes

@gabemontero gabemontero Awaiting requested review from gabemontero

Assignees

@adambkaplan adambkaplan

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@nalind @openshift-ci-robot @adambkaplan @nee1esh @openshift-bot @mrunalp @openshift-merge-robot