Skip to content

Commit

Permalink
Merge pull request #55417 from justinsb/add_tee_to_busybox
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

busybox image: add symlink for /bin/tee

This makes the bazel image more similar to the bash build, which uses
the image from the docker registry.

tee is used by e.g. kops to send logs to both a /var/log file and to
stdout (which is then captured by docker).

```release-note
Add /bin/tee symlink to bazel build for busybox, so that CI builds have /bin/tee
```
  • Loading branch information
Kubernetes Submit Queue committed Nov 19, 2017
2 parents 712f5b8 + 61ff1db commit d400757
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions build/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ docker_build(
"/usr/bin/busybox": "/bin/busybox",
"/usr/sbin/busybox": "/bin/busybox",
"/sbin/busybox": "/bin/busybox",
# tee is used to send logs to /var/log and stdout, e.g. by kops
"/bin/tee": "/bin/busybox",
},
)

Expand Down

0 comments on commit d400757

Please sign in to comment.