[v2] docker: update Ubuntu and Fedora images, deprecate old ones

[Qemu-devel] [PATCH v2 4/8] docker: do not use Trusty APT source in Xenial

Posted by Philippe Mathieu-Daudé 8 years ago

probably missed in 7fc581c29518

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 tests/docker/dockerfiles/ubuntu.docker | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker
index dabbf2a8a4..686d90ae8c 100644
--- a/tests/docker/dockerfiles/ubuntu.docker
+++ b/tests/docker/dockerfiles/ubuntu.docker
@@ -1,6 +1,4 @@
 FROM ubuntu:16.04
-RUN echo "deb http://archive.ubuntu.com/ubuntu/ trusty universe multiverse" >> \
-    /etc/apt/sources.list
 RUN apt-get update
 ENV PACKAGES flex bison \
     libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev libncursesw5-dev \
-- 
2.15.1

Re: [Qemu-devel] [PATCH v2 4/8] docker: do not use Trusty APT source in Xenial

Posted by Alex Bennée 8 years ago

Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> probably missed in 7fc581c29518
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  tests/docker/dockerfiles/ubuntu.docker | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker
> index dabbf2a8a4..686d90ae8c 100644
> --- a/tests/docker/dockerfiles/ubuntu.docker
> +++ b/tests/docker/dockerfiles/ubuntu.docker
> @@ -1,6 +1,4 @@
>  FROM ubuntu:16.04
> -RUN echo "deb http://archive.ubuntu.com/ubuntu/ trusty universe multiverse" >> \
> -    /etc/apt/sources.list
>  RUN apt-get update
>  ENV PACKAGES flex bison \
>      libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev libncursesw5-dev \


--
Alex Bennée

Re: [Qemu-devel] [PATCH v2 4/8] docker: do not use Trusty APT source in Xenial

Posted by Alex Bennée 8 years ago

Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> probably missed in 7fc581c29518
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  tests/docker/dockerfiles/ubuntu.docker | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker
> index dabbf2a8a4..686d90ae8c 100644
> --- a/tests/docker/dockerfiles/ubuntu.docker
> +++ b/tests/docker/dockerfiles/ubuntu.docker
> @@ -1,6 +1,4 @@
>  FROM ubuntu:16.04
> -RUN echo "deb http://archive.ubuntu.com/ubuntu/ trusty universe multiverse" >> \
> -    /etc/apt/sources.list

do we not need anything in universe or multiverse?

>  RUN apt-get update
>  ENV PACKAGES flex bison \
>      libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev libncursesw5-dev \


--
Alex Bennée

Re: [Qemu-devel] [PATCH v2 4/8] docker: do not use Trusty APT source in Xenial

Posted by Philippe Mathieu-Daudé 8 years ago

On 01/17/2018 08:54 AM, Alex Bennée wrote:
> 
> Philippe Mathieu-Daudé <f4bug@amsat.org> writes:
> 
>> probably missed in 7fc581c29518
>>
>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> ---
>>  tests/docker/dockerfiles/ubuntu.docker | 2 --
>>  1 file changed, 2 deletions(-)
>>
>> diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker
>> index dabbf2a8a4..686d90ae8c 100644
>> --- a/tests/docker/dockerfiles/ubuntu.docker
>> +++ b/tests/docker/dockerfiles/ubuntu.docker
>> @@ -1,6 +1,4 @@
>>  FROM ubuntu:16.04
>> -RUN echo "deb http://archive.ubuntu.com/ubuntu/ trusty universe multiverse" >> \
>> -    /etc/apt/sources.list
> 
> do we not need anything in universe or multiverse?

Since this image is Xenial based, surely not from Trusty :)

This line is now included in the base image, I'll update the commit
description.

> 
>>  RUN apt-get update
>>  ENV PACKAGES flex bison \
>>      libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev libncursesw5-dev \
> 
> 
> --
> Alex Bennée
>