From ffb4d771ca61bdf02718fea7b9a9b90e1196aba9 Mon Sep 17 00:00:00 2001 From: KongQun Yang Date: Fri, 11 Jun 2021 11:05:46 -0700 Subject: [PATCH] Update Dockerfile due to depot_tools update Change-Id: Iaf2415a2fb954a3f2473233eb0522edc211b4a9b --- Dockerfile | 2 ++ packager/testing/dockers/Alpine_Dockerfile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index e8e3ea37c4..98c45eaef1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,6 +19,8 @@ ENV GYP_DEFINES='clang=0 use_experimental_allocator_shim=0 use_allocator=none mu # by default. Disable python3 explicitly for now. # See https://github.com/google/shaka-packager/issues/763 for details. ENV GCLIENT_PY3=0 +# Bypass VPYTHON included by depot_tools, which no longer works in Alpine. +ENV VPYTHON_BYPASS="manually managed python not supported by chrome operations" # Build shaka-packager WORKDIR shaka_packager diff --git a/packager/testing/dockers/Alpine_Dockerfile b/packager/testing/dockers/Alpine_Dockerfile index 5a0aa2b3f8..5e245661b6 100644 --- a/packager/testing/dockers/Alpine_Dockerfile +++ b/packager/testing/dockers/Alpine_Dockerfile @@ -20,6 +20,8 @@ ENV GYP_DEFINES='clang=0 use_experimental_allocator_shim=0 use_allocator=none mu # by default. Disable python3 explicitly for now. # See https://github.com/google/shaka-packager/issues/763 for details. ENV GCLIENT_PY3=0 +# Bypass VPYTHON included by depot_tools, which no longer works in Alpine. +ENV VPYTHON_BYPASS="manually managed python not supported by chrome operations" # Build and run this docker by mapping shaka-packager with # -v "shaka-packager:/shaka-packager".