| Message ID | 20180115143500.22631-7-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | docker: update Ubuntu and Fedora images, deprecate old ones | expand |
On Mon, Jan 15, 2018 at 11:34:57AM -0300, Philippe Mathieu-Daudé wrote: > straight copy on Fedora 25 base. > > Suggested-by: Paolo Bonzini <pbonzini@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > tests/docker/dockerfiles/fedora27.docker | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > create mode 100644 tests/docker/dockerfiles/fedora27.docker > > diff --git a/tests/docker/dockerfiles/fedora27.docker b/tests/docker/dockerfiles/fedora27.docker > new file mode 100644 > index 0000000000..7cba4dcc2c > --- /dev/null > +++ b/tests/docker/dockerfiles/fedora27.docker > @@ -0,0 +1,18 @@ > +FROM fedora:27 > +ENV PACKAGES \ > + ccache gettext git tar PyYAML sparse flex bison python2 bzip2 hostname \ > + glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \ Perhaps SDL2 here too > + gcc gcc-c++ clang make perl which bc findutils libaio-devel \ > + nettle-devel \ > + mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL mingw32-pkg-config \ > + mingw32-gtk2 mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \ Is there a reason we have both GTK2 and GTK3 installed ? We've deprecated GTK2 and configure will pick GTK3 by default. IIUC there's no way to override that in the docker builds to force GTK2, so it can possibly be dropped. > + mingw32-libjpeg-turbo mingw32-libpng mingw32-curl mingw32-libssh2 \ > + mingw32-bzip2 \ > + mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL mingw64-pkg-config \ > + mingw64-gtk2 mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \ Repeated here. > + mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \ > + mingw64-bzip2 > + > +RUN dnf install -y $PACKAGES > +RUN rpm -q $PACKAGES | sort > /packages.txt > +ENV FEATURES mingw clang pyyaml Regards, Daniel
On 01/15/2018 01:27 PM, Daniel P. Berrange wrote: > On Mon, Jan 15, 2018 at 11:34:57AM -0300, Philippe Mathieu-Daudé wrote: >> straight copy on Fedora 25 base. >> >> Suggested-by: Paolo Bonzini <pbonzini@redhat.com> >> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >> --- >> tests/docker/dockerfiles/fedora27.docker | 18 ++++++++++++++++++ >> 1 file changed, 18 insertions(+) >> create mode 100644 tests/docker/dockerfiles/fedora27.docker >> >> diff --git a/tests/docker/dockerfiles/fedora27.docker b/tests/docker/dockerfiles/fedora27.docker >> new file mode 100644 >> index 0000000000..7cba4dcc2c >> --- /dev/null >> +++ b/tests/docker/dockerfiles/fedora27.docker >> @@ -0,0 +1,18 @@ >> +FROM fedora:27 >> +ENV PACKAGES \ >> + ccache gettext git tar PyYAML sparse flex bison python2 bzip2 hostname \ >> + glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \ > > Perhaps SDL2 here too > >> + gcc gcc-c++ clang make perl which bc findutils libaio-devel \ >> + nettle-devel \ >> + mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL mingw32-pkg-config \ >> + mingw32-gtk2 mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \ > > Is there a reason we have both GTK2 and GTK3 installed ? We've deprecated GTK2 > and configure will pick GTK3 by default. IIUC there's no way to override > that in the docker builds to force GTK2, so it can possibly be dropped. No clue, Fam? >> + mingw32-libjpeg-turbo mingw32-libpng mingw32-curl mingw32-libssh2 \ >> + mingw32-bzip2 \ >> + mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL mingw64-pkg-config \ >> + mingw64-gtk2 mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \ > > Repeated here. > >> + mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \ >> + mingw64-bzip2 >> + >> +RUN dnf install -y $PACKAGES >> +RUN rpm -q $PACKAGES | sort > /packages.txt >> +ENV FEATURES mingw clang pyyaml > > Regards, > Daniel >
On 01/15/2018 01:38 PM, Philippe Mathieu-Daudé wrote: > On 01/15/2018 01:27 PM, Daniel P. Berrange wrote: >> On Mon, Jan 15, 2018 at 11:34:57AM -0300, Philippe Mathieu-Daudé wrote: >>> straight copy on Fedora 25 base. >>> >>> Suggested-by: Paolo Bonzini <pbonzini@redhat.com> >>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >>> --- >>> tests/docker/dockerfiles/fedora27.docker | 18 ++++++++++++++++++ >>> 1 file changed, 18 insertions(+) >>> create mode 100644 tests/docker/dockerfiles/fedora27.docker >>> >>> diff --git a/tests/docker/dockerfiles/fedora27.docker b/tests/docker/dockerfiles/fedora27.docker >>> new file mode 100644 >>> index 0000000000..7cba4dcc2c >>> --- /dev/null >>> +++ b/tests/docker/dockerfiles/fedora27.docker >>> @@ -0,0 +1,18 @@ >>> +FROM fedora:27 >>> +ENV PACKAGES \ >>> + ccache gettext git tar PyYAML sparse flex bison python2 bzip2 hostname \ >>> + glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \ >> >> Perhaps SDL2 here too >> >>> + gcc gcc-c++ clang make perl which bc findutils libaio-devel \ >>> + nettle-devel \ >>> + mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL mingw32-pkg-config \ >>> + mingw32-gtk2 mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \ >> >> Is there a reason we have both GTK2 and GTK3 installed ? We've deprecated GTK2 >> and configure will pick GTK3 by default. IIUC there's no way to override >> that in the docker builds to force GTK2, so it can possibly be dropped. > > No clue, Fam? This series no longer applies since the c08d08b27cad "Build fedora image with ASAN/UBSan", I'll respin. Now since GTK2+3 are use in this docker image since it's origin, I'll wait for Fam to confirm we can drop GTK2. >>> + mingw32-libjpeg-turbo mingw32-libpng mingw32-curl mingw32-libssh2 \ >>> + mingw32-bzip2 \ >>> + mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL mingw64-pkg-config \ >>> + mingw64-gtk2 mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \ >> >> Repeated here. >> >>> + mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \ >>> + mingw64-bzip2 >>> + >>> +RUN dnf install -y $PACKAGES >>> +RUN rpm -q $PACKAGES | sort > /packages.txt >>> +ENV FEATURES mingw clang pyyaml
On Tue, Jan 16, 2018 at 12:38 AM, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > On 01/15/2018 01:27 PM, Daniel P. Berrange wrote: >> On Mon, Jan 15, 2018 at 11:34:57AM -0300, Philippe Mathieu-Daudé wrote: >>> straight copy on Fedora 25 base. >>> >>> Suggested-by: Paolo Bonzini <pbonzini@redhat.com> >>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >>> --- >>> tests/docker/dockerfiles/fedora27.docker | 18 ++++++++++++++++++ >>> 1 file changed, 18 insertions(+) >>> create mode 100644 tests/docker/dockerfiles/fedora27.docker >>> >>> diff --git a/tests/docker/dockerfiles/fedora27.docker b/tests/docker/dockerfiles/fedora27.docker >>> new file mode 100644 >>> index 0000000000..7cba4dcc2c >>> --- /dev/null >>> +++ b/tests/docker/dockerfiles/fedora27.docker >>> @@ -0,0 +1,18 @@ >>> +FROM fedora:27 >>> +ENV PACKAGES \ >>> + ccache gettext git tar PyYAML sparse flex bison python2 bzip2 hostname \ >>> + glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \ >> >> Perhaps SDL2 here too >> >>> + gcc gcc-c++ clang make perl which bc findutils libaio-devel \ >>> + nettle-devel \ >>> + mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL mingw32-pkg-config \ >>> + mingw32-gtk2 mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \ >> >> Is there a reason we have both GTK2 and GTK3 installed ? We've deprecated GTK2 >> and configure will pick GTK3 by default. IIUC there's no way to override >> that in the docker builds to force GTK2, so it can possibly be dropped. > > No clue, Fam? > I think Dan is right here. Fam
diff --git a/tests/docker/dockerfiles/fedora27.docker b/tests/docker/dockerfiles/fedora27.docker new file mode 100644 index 0000000000..7cba4dcc2c --- /dev/null +++ b/tests/docker/dockerfiles/fedora27.docker @@ -0,0 +1,18 @@ +FROM fedora:27 +ENV PACKAGES \ + ccache gettext git tar PyYAML sparse flex bison python2 bzip2 hostname \ + glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \ + gcc gcc-c++ clang make perl which bc findutils libaio-devel \ + nettle-devel \ + mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL mingw32-pkg-config \ + mingw32-gtk2 mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \ + mingw32-libjpeg-turbo mingw32-libpng mingw32-curl mingw32-libssh2 \ + mingw32-bzip2 \ + mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL mingw64-pkg-config \ + mingw64-gtk2 mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \ + mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \ + mingw64-bzip2 + +RUN dnf install -y $PACKAGES +RUN rpm -q $PACKAGES | sort > /packages.txt +ENV FEATURES mingw clang pyyaml
straight copy on Fedora 25 base. Suggested-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- tests/docker/dockerfiles/fedora27.docker | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 tests/docker/dockerfiles/fedora27.docker