| Message ID | 20190110174516.21586-7-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | testing/next queue for travis and docker | expand |
On 1/10/19 6:45 PM, Alex Bennée wrote: > This avoids potential problems with duplicates. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > tests/docker/dockerfiles/travis.docker | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfiles/travis.docker > index 03ebfb0ef2..46cf367488 100644 > --- a/tests/docker/dockerfiles/travis.docker > +++ b/tests/docker/dockerfiles/travis.docker > @@ -2,7 +2,7 @@ FROM travisci/ci-garnet:packer-1512502276-986baf0 > ENV DEBIAN_FRONTEND noninteractive > ENV LANG en_US.UTF-8 > ENV LC_ALL en_US.UTF-8 > -RUN cat /etc/apt/sources.list | sed "s/# deb-src/deb-src/" >> /etc/apt/sources.list > +RUN sed -i "s/# deb-src/deb-src/" /etc/apt/sources.list Good! Do you mind fixing the other Debian Dockerfiles? $ git grep 'sed "' tests/docker/ tests/docker/dockerfiles/debian-bootstrap.docker:20:RUN cat /etc/apt/sources.list | sed "s/deb/deb-src/" >> /etc/apt/sources.list tests/docker/dockerfiles/debian-sid.docker:21:RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list tests/docker/dockerfiles/debian8.docker:15:RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list tests/docker/dockerfiles/debian9.docker:13:RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list tests/docker/dockerfiles/travis.docker:5:RUN cat /etc/apt/sources.list | sed "s/# deb-src/deb-src/" >> /etc/apt/sources.list Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > RUN apt-get update > RUN apt-get -y build-dep qemu > RUN apt-get -y install device-tree-compiler python2.7 python-yaml dh-autoreconf gdb strace lsof net-tools gcovr >
diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfiles/travis.docker index 03ebfb0ef2..46cf367488 100644 --- a/tests/docker/dockerfiles/travis.docker +++ b/tests/docker/dockerfiles/travis.docker @@ -2,7 +2,7 @@ FROM travisci/ci-garnet:packer-1512502276-986baf0 ENV DEBIAN_FRONTEND noninteractive ENV LANG en_US.UTF-8 ENV LC_ALL en_US.UTF-8 -RUN cat /etc/apt/sources.list | sed "s/# deb-src/deb-src/" >> /etc/apt/sources.list +RUN sed -i "s/# deb-src/deb-src/" /etc/apt/sources.list RUN apt-get update RUN apt-get -y build-dep qemu RUN apt-get -y install device-tree-compiler python2.7 python-yaml dh-autoreconf gdb strace lsof net-tools gcovr
This avoids potential problems with duplicates. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- tests/docker/dockerfiles/travis.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1