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

Use docker_bundle rule from new rules_docker repo #45248

Merged
merged 2 commits into from
May 3, 2017

Conversation

ixdy
Copy link
Member

@ixdy ixdy commented May 2, 2017

What this PR does / why we need it: switched to using the new docker_bundle rule from rules_docker instead of my patched docker_build rule. This also brings in some fixes for the docker rules that were missing from my fork.

Additionally, I switched out the git_repository rules for http_archive rules, since that seems to be recommended by the bazel docs (and might be faster).

Lastly, I updated the pkg_tar rules to use my patch, which doesn't prepend ./ to files inside the tarballs.
This one should likely be merged upstream in the near future.

I think this is the last of the changes necessary to have bazel run //:ci-artifacts working properly to support using bazel for e2e in CI.

Release note:

NONE

@k8s-reviewable
Copy link

This change is Reviewable

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 2, 2017
@ixdy
Copy link
Member Author

ixdy commented May 2, 2017

We should probably review/merge kubernetes/repo-infra#17 and update that WORKSPACE dependency before requesting top-level approval.

@ixdy
Copy link
Member Author

ixdy commented May 2, 2017

/assign @mikedanese @spxtr

@k8s-github-robot k8s-github-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. release-note-none Denotes a PR that doesn't merit a release note. labels May 2, 2017
@mikedanese
Copy link
Member

/assign @thockin

symlinks = {
# Some cluster startup scripts expect to find the binaries in /usr/local/bin,
# but the debs install the binaries into /usr/bin.
"/usr/local/bin/" + binary: "/usr/bin/" + binary,
},
) for binary, meta in DOCKERIZED_BINARIES.items()]

[docker_bundle(
name = binary,
images = {"gcr.io/google_containers/%s:{STABLE_DOCKER_TAG}" % binary: binary + "-internal"},
Copy link
Member

@mikedanese mikedanese May 2, 2017

Choose a reason for hiding this comment

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

{STABLE_DOCKER_TAG}??? Does that actually work? We need this for debs and rpms.

Copy link
Member Author

Choose a reason for hiding this comment

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

@mikedanese
Copy link
Member

delete build/foo.tar

@ixdy
Copy link
Member Author

ixdy commented May 2, 2017

ha, I have no idea how that even got there! :)

WORKSPACE Outdated
)

git_repository(
# This contains a patch to not prepend ./ to tarfiles produced by pkg_tar.
# When merged upstream, we'll no longer need to use ixdy's fork.
Copy link
Member

Choose a reason for hiding this comment

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

Can you link the CL that needs to merge here?

Copy link
Member Author

Choose a reason for hiding this comment

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

done

@thockin
Copy link
Member

thockin commented May 3, 2017

/approve

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 3, 2017
@mikedanese
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 3, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ixdy, mikedanese, thockin

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 45283, 45289, 45248, 44295)

@k8s-github-robot k8s-github-robot merged commit 99af041 into kubernetes:master May 3, 2017
@ixdy ixdy deleted the docker-bundle-rule branch May 15, 2018 23:36
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants