From e79115a7bfd43d0c11322e6eca3242b65b145812 Mon Sep 17 00:00:00 2001 From: Gabe Kopley Date: Thu, 7 Jul 2016 12:01:55 -0700 Subject: [PATCH 1/2] Specify Ubuntu 14.04 in Dockerfile to ensure successful build (latest was pulling 16.04 which, while it successfully builds Release, yields an error building Debug: https://github.com/google/shaka-packager/issues/118 ) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 035320c8f4..884e5f37ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:latest +FROM ubuntu:14.04 ENV DEBIAN_FRONTEND noninteractive From c545c46053d36e27532603f21354f6b092a22577 Mon Sep 17 00:00:00 2001 From: Gabe Kopley Date: Thu, 7 Jul 2016 15:27:41 -0700 Subject: [PATCH 2/2] Add self to CONTRIBUTORS and Philo, Inc. to AUTHORS --- AUTHORS | 1 + CONTRIBUTORS | 1 + 2 files changed, 2 insertions(+) diff --git a/AUTHORS b/AUTHORS index 7e29e120bb..4818cd20d3 100644 --- a/AUTHORS +++ b/AUTHORS @@ -16,4 +16,5 @@ Anders Hasselqvist Google Inc. <*@google.com> Leandro Moreira +Philo Inc. <*@philo.com> The Chromium Authors <*@chromium.org> diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 0ae7db61eb..fabb1ab824 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -24,6 +24,7 @@ Anders Hasselqvist Bei Li +Gabe Kopley Jacob Trimble Joey Parrish Kongqun Yang