From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56840) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEeQG-0006HU-5Y for qemu-devel@nongnu.org; Sat, 27 May 2017 12:18:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dEeQF-0005mw-6c for qemu-devel@nongnu.org; Sat, 27 May 2017 12:18:36 -0400 Received: from mail-oi0-x244.google.com ([2607:f8b0:4003:c06::244]:33924) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dEeQF-0005mT-1D for qemu-devel@nongnu.org; Sat, 27 May 2017 12:18:35 -0400 Received: by mail-oi0-x244.google.com with SMTP id w10so6038756oif.1 for ; Sat, 27 May 2017 09:18:34 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Sat, 27 May 2017 13:17:37 -0300 Message-Id: <20170527161755.7761-7-f4bug@amsat.org> In-Reply-To: <20170527161755.7761-1-f4bug@amsat.org> References: <20170527161755.7761-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v4 06/24] docker: create deb-src entry and setup Emdebian in the same layer List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Fam Zheng Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée --- tests/docker/dockerfiles/debian.docker | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfiles/debian.docker index d08def6a8d..33ba686892 100644 --- a/tests/docker/dockerfiles/debian.docker +++ b/tests/docker/dockerfiles/debian.docker @@ -13,13 +13,11 @@ FROM debian:stable-slim RUN apt update RUN apt install -yy aptitude ca-certificates curl -# Setup Emdebian -RUN echo "deb http://emdebian.org/tools/debian/ jessie main" >> /etc/apt/sources.list -RUN curl http://emdebian.org/tools/debian/emdebian-toolchain-archive.key | apt-key add - - -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/deb/deb-src/" >> /etc/apt/sources.list - # Install common build utilities RUN apt update RUN apt install -yy build-essential clang + +# Duplicate deb line as deb-src, setup Emdebian +RUN cat /etc/apt/sources.list | sed "s/deb/deb-src/" >> /etc/apt/sources.list && \ + echo "deb http://emdebian.org/tools/debian/ jessie main" >> /etc/apt/sources.list && \ + curl http://emdebian.org/tools/debian/emdebian-toolchain-archive.key | apt-key add - -- 2.11.0