[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 06/24] docker: create deb-src entry and setup Emd
|
From: |
Philippe Mathieu-Daudé |
|
Subject: |
[Qemu-devel] [PATCH v3 06/24] docker: create deb-src entry and setup Emdebian in the same layer |
|
Date: |
Sun, 21 May 2017 00:29:38 -0300 |
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
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
- [Qemu-devel] [PATCH v3 03/24] docker: rebuild image if 'extra files' checksum does not match, (continued)
- [Qemu-devel] [PATCH v3 02/24] docker: add --include-files argument to 'build' command, Philippe Mathieu-Daudé, 2017/05/20
- [Qemu-devel] [PATCH v3 04/24] docker: add 'apt-fake' script which generate fake debian packages, Philippe Mathieu-Daudé, 2017/05/20
- [Qemu-devel] [PATCH v3 05/24] docker: install ca-certificates package in base image, Philippe Mathieu-Daudé, 2017/05/20
- [Qemu-devel] [PATCH v3 06/24] docker: create deb-src entry and setup Emdebian in the same layer,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v3 10/24] docker: use eatmydata in debian arm64 image, Philippe Mathieu-Daudé, 2017/05/20
- [Qemu-devel] [PATCH v3 07/24] docker: use better regex to generate deb-src entries, Philippe Mathieu-Daudé, 2017/05/20
- [Qemu-devel] [PATCH v3 08/24] docker: use eatmydata, install common build packages in base image, Philippe Mathieu-Daudé, 2017/05/20
- [Qemu-devel] [PATCH v3 09/24] docker: use eatmydata in debian armhf image, Philippe Mathieu-Daudé, 2017/05/20
- [Qemu-devel] [PATCH v3 11/24] docker: add extra libs to armhf target to extend codebase coverage, Philippe Mathieu-Daudé, 2017/05/20