| Message ID | 20180115143500.22631-8-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | docker: update Ubuntu and Fedora images, deprecate old ones | expand |
Philippe Mathieu-Daudé <f4bug@amsat.org> writes: > deprecate the generic 'fedora' image, but stay backward incompatible > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> What clashed with this? > --- > tests/docker/Makefile.include | 3 ++- > tests/docker/dockerfiles/fedora.docker | 29 ++++++++++++----------------- > tests/docker/dockerfiles/fedora25.docker | 18 ++++++++++++++++++ > 3 files changed, 32 insertions(+), 18 deletions(-) > create mode 100644 tests/docker/dockerfiles/fedora25.docker > > diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include > index 1adea40499..950ef51d35 100644 > --- a/tests/docker/Makefile.include > +++ b/tests/docker/Makefile.include > @@ -4,7 +4,7 @@ > > DOCKER_SUFFIX := .docker > DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles > -DOCKER_DEPRECATED_IMAGES := debian ubuntu > +DOCKER_DEPRECATED_IMAGES := debian fedora ubuntu > DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) > DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) > # Use a global constant ccache directory to speed up repetitive builds > @@ -61,6 +61,7 @@ docker-image-debian-ppc64el-cross: docker-image-debian9 > docker-image-debian-s390x-cross: docker-image-debian9 > docker-image-debian-win32-cross: docker-image-debian8-mxe > docker-image-debian-win64-cross: docker-image-debian8-mxe > +docker-image-fedora: docker-image-fedora25 > docker-image-ubuntu: docker-image-ubuntu16.04 > docker-image-travis: NOUSER=1 > > diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker > index 4b26c3aded..961534275f 100644 > --- a/tests/docker/dockerfiles/fedora.docker > +++ b/tests/docker/dockerfiles/fedora.docker > @@ -1,18 +1,13 @@ > -FROM fedora:latest > -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 > +# SPDX-License-Identifier: GPL-2.0-or-later > +# > +# This template is deprecated, it was previously based on Fedora 25 on QEMU 2.9. > +# Now than more recent releases are out, please use qemu:fedora25 as base for > +# Fedora 25. > +# > +FROM qemu:fedora25 > > -RUN dnf install -y $PACKAGES > -RUN rpm -q $PACKAGES | sort > /packages.txt > -ENV FEATURES mingw clang pyyaml > +RUN for n in $(seq 8); do echo; done && \ > + echo "\n\t\tThis image is deprecated." && echo && \ > + echo "\tUse 'FROM qemu:fedora27' to use the Fedora 27 image" && \ > + echo "\tor 'FROM qemu:fedora25' to use the old Fedora 25." && \ > + for n in $(seq 8); do echo; done > diff --git a/tests/docker/dockerfiles/fedora25.docker b/tests/docker/dockerfiles/fedora25.docker > new file mode 100644 > index 0000000000..b53fe63b5c > --- /dev/null > +++ b/tests/docker/dockerfiles/fedora25.docker > @@ -0,0 +1,18 @@ > +FROM fedora:25 > +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 -- Alex Bennée
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 1adea40499..950ef51d35 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -4,7 +4,7 @@ DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles -DOCKER_DEPRECATED_IMAGES := debian ubuntu +DOCKER_DEPRECATED_IMAGES := debian fedora ubuntu DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds @@ -61,6 +61,7 @@ docker-image-debian-ppc64el-cross: docker-image-debian9 docker-image-debian-s390x-cross: docker-image-debian9 docker-image-debian-win32-cross: docker-image-debian8-mxe docker-image-debian-win64-cross: docker-image-debian8-mxe +docker-image-fedora: docker-image-fedora25 docker-image-ubuntu: docker-image-ubuntu16.04 docker-image-travis: NOUSER=1 diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 4b26c3aded..961534275f 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,18 +1,13 @@ -FROM fedora:latest -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 +# SPDX-License-Identifier: GPL-2.0-or-later +# +# This template is deprecated, it was previously based on Fedora 25 on QEMU 2.9. +# Now than more recent releases are out, please use qemu:fedora25 as base for +# Fedora 25. +# +FROM qemu:fedora25 -RUN dnf install -y $PACKAGES -RUN rpm -q $PACKAGES | sort > /packages.txt -ENV FEATURES mingw clang pyyaml +RUN for n in $(seq 8); do echo; done && \ + echo "\n\t\tThis image is deprecated." && echo && \ + echo "\tUse 'FROM qemu:fedora27' to use the Fedora 27 image" && \ + echo "\tor 'FROM qemu:fedora25' to use the old Fedora 25." && \ + for n in $(seq 8); do echo; done diff --git a/tests/docker/dockerfiles/fedora25.docker b/tests/docker/dockerfiles/fedora25.docker new file mode 100644 index 0000000000..b53fe63b5c --- /dev/null +++ b/tests/docker/dockerfiles/fedora25.docker @@ -0,0 +1,18 @@ +FROM fedora:25 +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
deprecate the generic 'fedora' image, but stay backward incompatible Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- tests/docker/Makefile.include | 3 ++- tests/docker/dockerfiles/fedora.docker | 29 ++++++++++++----------------- tests/docker/dockerfiles/fedora25.docker | 18 ++++++++++++++++++ 3 files changed, 32 insertions(+), 18 deletions(-) create mode 100644 tests/docker/dockerfiles/fedora25.docker