From a529d4677d86924230885f4c2783f857ab1d601f Mon Sep 17 00:00:00 2001
From: KongQun Yang <kqyang@google.com>
Date: Thu, 20 Dec 2018 13:26:10 -0800
Subject: [PATCH] Add pssh tool in docker image

Issue #550.

Change-Id: Id3fc6317789609b5d31cc671b2a361f8a8739f77
---
 Dockerfile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 01420e960a..5eeb2ae9c4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,7 +25,12 @@ RUN cd src && ninja -C out/Release
 
 # Copy only result binaries to our final image.
 FROM alpine:3.8
-RUN apk add --no-cache libstdc++
+RUN apk add --no-cache libstdc++ python
 COPY --from=builder /shaka_packager/src/out/Release/packager \
                     /shaka_packager/src/out/Release/mpd_generator \
+                    /shaka_packager/src/out/Release/pssh-box.py \
                     /usr/bin/
+# Copy pyproto directory, which is needed by pssh-box.py script. This line
+# cannot be combined with the line above as Docker's copy command skips the
+# directory itself. See https://github.com/moby/moby/issues/15858 for details.
+COPY --from=builder /shaka_packager/src/out/Release/pyproto /usr/bin/pyproto