| Message ID | 20170521032956.27446-7-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
Philippe Mathieu-Daudé <f4bug@amsat.org> writes: > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > --- > 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 - -- Alex Bennée
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 -
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- tests/docker/dockerfiles/debian.docker | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)