Fam Zheng <f...@redhat.com> writes: > On Mon, 02/15 10:15, Alex Bennée wrote: >> >> Fam Zheng <f...@redhat.com> writes: >> >> > Signed-off-by: Fam Zheng <f...@redhat.com> >> > --- >> > tests/docker/centos6.docker | 5 +++++ >> > tests/docker/fedora.docker | 7 +++++++ >> > tests/docker/ubuntu.docker | 9 +++++++++ >> > 3 files changed, 21 insertions(+) >> > create mode 100644 tests/docker/centos6.docker >> > create mode 100644 tests/docker/fedora.docker >> > create mode 100644 tests/docker/ubuntu.docker >> > >> > diff --git a/tests/docker/centos6.docker b/tests/docker/centos6.docker >> > new file mode 100644 >> > index 0000000..7daa2fb >> > --- /dev/null >> > +++ b/tests/docker/centos6.docker >> > @@ -0,0 +1,5 @@ >> > +FROM centos:6 >> > +RUN yum install -y \ >> > + git make gcc g++ \ >> > + zlib-devel glib2-devel SDL-devel pixman-devel >> > + >> > diff --git a/tests/docker/fedora.docker b/tests/docker/fedora.docker >> > new file mode 100644 >> > index 0000000..81091b7 >> > --- /dev/null >> > +++ b/tests/docker/fedora.docker >> > @@ -0,0 +1,7 @@ >> > +FROM fedora:23 >> > +RUN dnf install -y \ >> > + ccache git \ >> > + glib2-devel pixman-devel zlib-devel SDL-devel \ >> > + gcc gcc-c++ clang make perl which bc findutils \ >> > + >> > mingw{32,64}-{pixman,glib2,gmp,SDL,pkg-config,gtk2,gtk3,gnutls,nettle,libtasn1,libjpeg-turbo,libpng,curl,libssh2,bzip2} >> > +ENV FEATURES mingw clang >> > diff --git a/tests/docker/ubuntu.docker b/tests/docker/ubuntu.docker >> > new file mode 100644 >> > index 0000000..f1dc518 >> > --- /dev/null >> > +++ b/tests/docker/ubuntu.docker >> > @@ -0,0 +1,9 @@ >> > +FROM ubuntu:14.04 >> > +RUN apt-get update >> > +RUN apt-get -y install \ >> > + libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev \ >> > + libseccomp-dev libgnutls-dev libssh2-1-dev libspice-server-dev \ >> > + libspice-protocol-dev libnss3-dev \ >> > + libgtk-3-dev libvte-2.90-dev libsdl1.2-dev libpng12-dev >> > libpixman-1-dev \ >> > + git make ccache python-yaml gcc clang >> > +ENV FEATURES clang ccache pyyaml >> >> >> How are we going to approach naming and upgrading of containers? >> >> Here centos6 is named so explicitly where as fedora (which is a faster >> moving project) will be replaced at some point. The ubuntu image is the >> current LTS which will have a new release in a few months although the >> LTS will be supported for some time. >> >> Maybe we should call them fedora-current and ubuntu-lts? > > I wanted to make the names short and easy to remember. For now I think > diversity is more interesting than variations in one distro family, that's why > I didn't really care whether it is ubuntu-latest or LTS, and chose 14.04 > arbitrarily.
Well we care enough for centos. I would at least like to check against debian-stable and debian-testing because a testing target would give us advanced notice of distro breaking changes. > > Replacing fedora 23 with future versions only takes one line change in > fedora.docker, and a subsequent "make docker-test-*@fedora" will make sure the > container image is rebuilt. (It's what tests/docker/docker_build does.) > > After all x64 Linuxs are very alike when Mac, Windows and non-x86 hosts are > also in the picture, and it would be great if we could cover at least some of > them here. I'm experimenting with docker on aarch64 ATM so I'll see what happens with these scripts there ;-) > > Fam -- Alex Bennée