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

sdn-cni-plugin built without openssl and cgo #62

Merged
merged 1 commit into from
Nov 1, 2019
Merged

sdn-cni-plugin built without openssl and cgo #62

merged 1 commit into from
Nov 1, 2019

Conversation

lsm5
Copy link
Member

@lsm5 lsm5 commented Nov 1, 2019

handle CGO conditional in Makefile itself and
not in Dockerfile.rhel

Signed-off-by: Lokesh Mandvekar lsm5@fedoraproject.org

@dougbtv @squeed PTAL

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 1, 2019
Copy link
Contributor

@knobunc knobunc left a comment

Choose a reason for hiding this comment

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

We are building the two pieces the same way... That's wrong.

Only sdn-cni-plugin should be built with CGO_ENABLED=0

So either we need to build the different targets separately, or do the whole build twice with different env set and just copy the right binary from the right build.

images/node/Dockerfile.rhel Show resolved Hide resolved
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
@openshift-ci-robot openshift-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 1, 2019
Copy link
Contributor

@knobunc knobunc left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 1, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: knobunc, lsm5

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 Nov 1, 2019
@openshift-merge-robot openshift-merge-robot merged commit 4372c22 into openshift:master Nov 1, 2019
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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants