docker: misc cleanups
v2 cover docker: misc cleanups
This should include anything I've sent so far (not including the RFC for more exploratory changes) that hasn't already been included in a roundup by Alex Bennée.
Mostly, it removes unused docker files and replaces python2 with python3 in all of the container environments.
V2:
- Rolled in python2 --> python3 conversion
- Added travis conversion to python patch
- Remove debian8 dockerfile, which is also now unused.
John Snow (5):
docker: move tests from python2 to python3
docker: remove 'deprecated' image definitions
docker: remove debian8-mxe definitions
docker: remove unused debian-sid and debian-ports
docker: removed unused debian8 partial image
tests/docker/Makefile.include | 8 ++--- tests/docker/dockerfiles/centos7.docker | 2 +- tests/docker/dockerfiles/debian-ports.docker | 2 +- tests/docker/dockerfiles/debian-sid.docker | 2 +- .../dockerfiles/debian-xtensa-cross.docker | 2 +- tests/docker/dockerfiles/debian10.docker | 2 +- tests/docker/dockerfiles/debian8.docker | 34 ------------------- tests/docker/dockerfiles/debian9.docker | 2 +- tests/docker/dockerfiles/travis.docker | 2 +- tests/docker/dockerfiles/ubuntu.docker | 2 +- tests/docker/dockerfiles/ubuntu1804.docker | 2 +- 11 files changed, 12 insertions(+), 48 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian8.docker
Signature · 1 line
2.21.0
PATCH v2 1/5 docker: move tests from python2 to python3
As part of the push to drop python2 support, replace any explicit python2 dependencies with python3 versions.
For centos, python2 still exists as an implicit dependency, but by adding python3 we will be able to build even if the configure script begins to require python 3.5+.
Tested with centos7, fedora, ubuntu, ubuntu1804, and debian 9 (amd64). Tested under a custom configure script that requires Python 3.5+.
the travis dockerfile is also moved to using python3, which was tested by running make docker-test-build@travis, which I hope is sufficient.
Message-id: [email protected]
--- tests/docker/dockerfiles/centos7.docker | 2 +- tests/docker/dockerfiles/debian-ports.docker | 2 +- tests/docker/dockerfiles/debian-sid.docker | 2 +- tests/docker/dockerfiles/debian-xtensa-cross.docker | 2 +- tests/docker/dockerfiles/debian10.docker | 2 +- tests/docker/dockerfiles/debian8.docker | 3 +-- tests/docker/dockerfiles/debian9.docker | 2 +- tests/docker/dockerfiles/travis.docker | 2 +- tests/docker/dockerfiles/ubuntu.docker | 2 +- tests/docker/dockerfiles/ubuntu1804.docker | 2 +- 10 files changed, 10 insertions(+), 11 deletions(-)
tests/docker/dockerfiles/centos7.docker +1 -1
@@ -25,6 +25,7 @@ ENV PACKAGES \ nettle-devel \ perl-Test-Harness \ pixman-devel \ + python3 \ SDL-devel \ spice-glib-devel \ spice-server-devel \
@@ -34,4 +35,3 @@ ENV PACKAGES \ zlib-devel RUN yum install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt -
tests/docker/dockerfiles/debian-ports.docker +1 -1
@@ -31,6 +31,6 @@ RUN apt-get update && \ git \ pkg-config \ psmisc \ - python \ + python3 \ texinfo \ $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)
tests/docker/dockerfiles/debian-sid.docker +1 -1
@@ -31,5 +31,5 @@ RUN apt update && \ git \ pkg-config \ psmisc \ - python \ + python3 \ texinfo || { echo "Failed to build - see debian-sid.docker notes"; exit 1; }
tests/docker/dockerfiles/debian-xtensa-cross.docker +1 -1
@@ -18,7 +18,7 @@ RUN apt-get update && \ flex \ gettext \ git \ - python-minimal + python3-minimal ENV CPU_LIST csp dc232b dc233c ENV TOOLCHAIN_RELEASE 2018.02
tests/docker/dockerfiles/debian10.docker +1 -1
@@ -26,7 +26,7 @@ RUN apt update && \ git \ pkg-config \ psmisc \ - python \ + python3 \ python3-sphinx \ texinfo \ $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)
tests/docker/dockerfiles/debian8.docker +1 -2
@@ -30,5 +30,4 @@ RUN apt update && \ git \ gnupg \ pkg-config \ - python-minimal - + python3-minimal
tests/docker/dockerfiles/debian9.docker +1 -1
@@ -26,7 +26,7 @@ RUN apt update && \ git \ pkg-config \ psmisc \ - python \ + python3 \ python3-sphinx \ texinfo \ $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)
tests/docker/dockerfiles/travis.docker +1 -1
@@ -5,7 +5,7 @@ ENV LC_ALL en_US.UTF-8 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 +RUN apt-get -y install device-tree-compiler python3 python3-yaml dh-autoreconf gdb strace lsof net-tools gcovr # Travis tools require PhantomJS / Neo4j / Maven accessible # in their PATH (QEMU build won't access them). ENV PATH /usr/local/phantomjs/bin:/usr/local/phantomjs:/usr/local/neo4j-3.2.7/bin:/usr/local/maven-3.5.2/bin:/usr/local/cmake-3.9.2/bin:/usr/local/clang-5.0.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
tests/docker/dockerfiles/ubuntu.docker +1 -1
@@ -60,7 +60,7 @@ ENV PACKAGES flex bison \ libvte-2.91-dev \ libxen-dev \ make \ - python-yaml \ + python3-yaml \ python3-sphinx \ sparse \ texinfo \
tests/docker/dockerfiles/ubuntu1804.docker +1 -1
@@ -47,7 +47,7 @@ ENV PACKAGES flex bison \ libvte-2.91-dev \ libxen-dev \ make \ - python-yaml \ + python3-yaml \ python3-sphinx \ sparse \ texinfo \
Signature · 1 line
2.21.0
Re: [PATCH v2 1/5] docker: move tests from python2 to python3
Quoted 10 lines · John Snow
As part of the push to drop python2 support, replace any explicit python2 dependencies with python3 versions.
For centos, python2 still exists as an implicit dependency, but by adding python3 we will be able to build even if the configure script begins to require python 3.5+.
Tested with centos7, fedora, ubuntu, ubuntu1804, and debian 9 (amd64). Tested under a custom configure script that requires Python 3.5+.
Quoted 6 lines
the travis dockerfile is also moved to using python3, which was tested by running
make docker-test-build@travis, which I hope is sufficient.Signed-off-by John Snow <[email protected]>Message-id: [email protected]
^ remove
v1 has:
Quoted 7 lines
--- tests/docker/dockerfiles/centos7.docker | 2 +- tests/docker/dockerfiles/debian-ports.docker | 2 +- tests/docker/dockerfiles/debian-sid.docker | 2 +- tests/docker/dockerfiles/debian-xtensa-cross.docker | 2 +- tests/docker/dockerfiles/debian10.docker | 2 +- tests/docker/dockerfiles/debian8.docker | 3 +--
If you queue this patch at the end of your series, no need to patch debian8.docker.
Anyway,
Quoted 136 lines
tests/docker/dockerfiles/debian9.docker | 2 +- tests/docker/dockerfiles/travis.docker | 2 +- tests/docker/dockerfiles/ubuntu.docker | 2 +- tests/docker/dockerfiles/ubuntu1804.docker | 2 +- 10 files changed, 10 insertions(+), 11 deletions(-)tests/docker/dockerfiles/centos7.docker +1
-1@@ -25,6 +25,7 @@ ENV PACKAGES \ nettle-devel \ perl-Test-Harness \ pixman-devel \ + python3 \ SDL-devel \ spice-glib-devel \ spice-server-devel \@@ -34,4 +35,3 @@ ENV PACKAGES \ zlib-devel RUN yum install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt -tests/docker/dockerfiles/debian-ports.docker +1
-1@@ -31,6 +31,6 @@ RUN apt-get update && \ git \ pkg-config \ psmisc \ - python \ + python3 \ texinfo \ $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)tests/docker/dockerfiles/debian-sid.docker +1
-1@@ -31,5 +31,5 @@ RUN apt update && \ git \ pkg-config \ psmisc \ - python \ + python3 \ texinfo || { echo "Failed to build - see debian-sid.docker notes"; exit 1; }tests/docker/dockerfiles/debian-xtensa-cross.docker +1
-1@@ -18,7 +18,7 @@ RUN apt-get update && \ flex \ gettext \ git \ - python-minimal + python3-minimal ENV CPU_LIST csp dc232b dc233c ENV TOOLCHAIN_RELEASE 2018.02tests/docker/dockerfiles/debian10.docker +1
-1@@ -26,7 +26,7 @@ RUN apt update && \ git \ pkg-config \ psmisc \ - python \ + python3 \ python3-sphinx \ texinfo \ $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)tests/docker/dockerfiles/debian8.docker +1
-2@@ -30,5 +30,4 @@ RUN apt update && \ git \ gnupg \ pkg-config \ - python-minimal - + python3-minimaltests/docker/dockerfiles/debian9.docker +1
-1@@ -26,7 +26,7 @@ RUN apt update && \ git \ pkg-config \ psmisc \ - python \ + python3 \ python3-sphinx \ texinfo \ $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)tests/docker/dockerfiles/travis.docker +1
-1@@ -5,7 +5,7 @@ ENV LC_ALL en_US.UTF-8 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 +RUN apt-get -y install device-tree-compiler python3 python3-yaml dh-autoreconf gdb strace lsof net-tools gcovr # Travis tools require PhantomJS / Neo4j / Maven accessible # in their PATH (QEMU build won't access them). ENV PATH /usr/local/phantomjs/bin:/usr/local/phantomjs:/usr/local/neo4j-3.2.7/bin:/usr/local/maven-3.5.2/bin:/usr/local/cmake-3.9.2/bin:/usr/local/clang-5.0.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bintests/docker/dockerfiles/ubuntu.docker +1
-1@@ -60,7 +60,7 @@ ENV PACKAGES flex bison \ libvte-2.91-dev \ libxen-dev \ make \ - python-yaml \ + python3-yaml \ python3-sphinx \ sparse \ texinfo \tests/docker/dockerfiles/ubuntu1804.docker +1
-1@@ -47,7 +47,7 @@ ENV PACKAGES flex bison \ libvte-2.91-dev \ libxen-dev \ make \ - python-yaml \ + python3-yaml \ python3-sphinx \ sparse \ texinfo \
Re: [PATCH v2 1/5] docker: move tests from python2 to python3
Quoted 30 lines · Philippe Mathieu-Daudé
Quoted 10 lines · John Snow
As part of the push to drop python2 support, replace any explicit python2 dependencies with python3 versions.
For centos, python2 still exists as an implicit dependency, but by adding python3 we will be able to build even if the configure script begins to require python 3.5+.
Tested with centos7, fedora, ubuntu, ubuntu1804, and debian 9 (amd64). Tested under a custom configure script that requires Python 3.5+.
Quoted 6 lines
the travis dockerfile is also moved to using python3, which was tested by running
make docker-test-build@travis, which I hope is sufficient.Signed-off-by John Snow <[email protected]>Message-id: [email protected]
^ remove
v1 has:
Reviewed-by Eduardo Habkost <[email protected]>Quoted 7 lines
--- tests/docker/dockerfiles/centos7.docker | 2 +- tests/docker/dockerfiles/debian-ports.docker | 2 +- tests/docker/dockerfiles/debian-sid.docker | 2 +- tests/docker/dockerfiles/debian-xtensa-cross.docker | 2 +- tests/docker/dockerfiles/debian10.docker | 2 +- tests/docker/dockerfiles/debian8.docker | 3 +--
Quoted 3 lines
If you queue this patch at the end of your series, no need to patch debian8.docker.
Yep, agreed.
- Cleber.
Re: [PATCH v2 1/5] docker: move tests from python2 to python3
In reply to John SnowQuoted 161 lines · John Snow
As part of the push to drop python2 support, replace any explicit python2 dependencies with python3 versions.
For centos, python2 still exists as an implicit dependency, but by adding python3 we will be able to build even if the configure script begins to require python 3.5+.
Tested with centos7, fedora, ubuntu, ubuntu1804, and debian 9 (amd64). Tested under a custom configure script that requires Python 3.5+.
the travis dockerfile is also moved to using python3, which was tested by running
make docker-test-build@travis, which I hope is sufficient.Signed-off-by John Snow <[email protected]>Message-id: [email protected]
--- tests/docker/dockerfiles/centos7.docker | 2 +- tests/docker/dockerfiles/debian-ports.docker | 2 +- tests/docker/dockerfiles/debian-sid.docker | 2 +- tests/docker/dockerfiles/debian-xtensa-cross.docker | 2 +- tests/docker/dockerfiles/debian10.docker | 2 +- tests/docker/dockerfiles/debian8.docker | 3 +-- tests/docker/dockerfiles/debian9.docker | 2 +- tests/docker/dockerfiles/travis.docker | 2 +- tests/docker/dockerfiles/ubuntu.docker | 2 +- tests/docker/dockerfiles/ubuntu1804.docker | 2 +- 10 files changed, 10 insertions(+), 11 deletions(-)tests/docker/dockerfiles/centos7.docker +1
-1@@ -25,6 +25,7 @@ ENV PACKAGES \ nettle-devel \ perl-Test-Harness \ pixman-devel \ + python3 \ SDL-devel \ spice-glib-devel \ spice-server-devel \@@ -34,4 +35,3 @@ ENV PACKAGES \ zlib-devel RUN yum install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt -tests/docker/dockerfiles/debian-ports.docker +1
-1@@ -31,6 +31,6 @@ RUN apt-get update && \ git \ pkg-config \ psmisc \ - python \ + python3 \ texinfo \ $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)tests/docker/dockerfiles/debian-sid.docker +1
-1@@ -31,5 +31,5 @@ RUN apt update && \ git \ pkg-config \ psmisc \ - python \ + python3 \ texinfo || { echo "Failed to build - see debian-sid.docker notes"; exit 1; }tests/docker/dockerfiles/debian-xtensa-cross.docker +1
-1@@ -18,7 +18,7 @@ RUN apt-get update && \ flex \ gettext \ git \ - python-minimal + python3-minimal ENV CPU_LIST csp dc232b dc233c ENV TOOLCHAIN_RELEASE 2018.02tests/docker/dockerfiles/debian10.docker +1
-1@@ -26,7 +26,7 @@ RUN apt update && \ git \ pkg-config \ psmisc \ - python \ + python3 \ python3-sphinx \ texinfo \ $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)tests/docker/dockerfiles/debian8.docker +1
-2@@ -30,5 +30,4 @@ RUN apt update && \ git \ gnupg \ pkg-config \ - python-minimal - + python3-minimaltests/docker/dockerfiles/debian9.docker +1
-1@@ -26,7 +26,7 @@ RUN apt update && \ git \ pkg-config \ psmisc \ - python \ + python3 \ python3-sphinx \ texinfo \ $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)tests/docker/dockerfiles/travis.docker +1
-1@@ -5,7 +5,7 @@ ENV LC_ALL en_US.UTF-8 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 +RUN apt-get -y install device-tree-compiler python3 python3-yaml dh-autoreconf gdb strace lsof net-tools gcovr # Travis tools require PhantomJS / Neo4j / Maven accessible # in their PATH (QEMU build won't access them). ENV PATH /usr/local/phantomjs/bin:/usr/local/phantomjs:/usr/local/neo4j-3.2.7/bin:/usr/local/maven-3.5.2/bin:/usr/local/cmake-3.9.2/bin:/usr/local/clang-5.0.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bintests/docker/dockerfiles/ubuntu.docker +1
-1@@ -60,7 +60,7 @@ ENV PACKAGES flex bison \ libvte-2.91-dev \ libxen-dev \ make \ - python-yaml \ + python3-yaml \ python3-sphinx \ sparse \ texinfo \tests/docker/dockerfiles/ubuntu1804.docker +1
-1@@ -47,7 +47,7 @@ ENV PACKAGES flex bison \ libvte-2.91-dev \ libxen-dev \ make \ - python-yaml \ + python3-yaml \ python3-sphinx \ sparse \ texinfo \Signature · 1 line
2.21.0
With the exception of debian8.docker, as noted in v1 and as addressed later in this series:
PATCH v2 2/5 docker: remove 'deprecated' image definitions
In reply to John SnowThere isn't a debian.dockerfile anymore,
so perform some ghost-busting.
Message-id: [email protected]
--- tests/docker/Makefile.include | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
tests/docker/Makefile.include +3 -4
@@ -4,11 +4,10 @@ DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles -DOCKER_DEPRECATED_IMAGES := debian # we don't run tests on intermediate images (used as base by another image) -DOCKER_PARTIAL_IMAGES := debian debian8 debian9 debian10 debian-sid +DOCKER_PARTIAL_IMAGES := debian8 debian9 debian10 debian-sid DOCKER_PARTIAL_IMAGES += debian8-mxe debian9-mxe debian-ports debian-bootstrap -DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) +DOCKER_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 DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache
@@ -159,7 +158,7 @@ docker-image-debian-powerpc-user-cross: docker-binfmt-image-debian-powerpc-user DOCKER_USER_IMAGES += debian-powerpc-user # Expand all the pre-requistes for each docker image and test combination -$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES)), \ +$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES)), \ $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \ $(eval .PHONY: docker-$t@$i) \ $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \
Signature · 1 line
2.21.0
PATCH v2 3/5 docker: remove debian8-mxe definitions
In reply to John SnowWe don't have a debian8-mxe dockerfile anymore.
Message-id: [email protected]
--- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/docker/Makefile.include +1 -1
@@ -6,7 +6,7 @@ DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles # we don't run tests on intermediate images (used as base by another image) DOCKER_PARTIAL_IMAGES := debian8 debian9 debian10 debian-sid -DOCKER_PARTIAL_IMAGES += debian8-mxe debian9-mxe debian-ports debian-bootstrap +DOCKER_PARTIAL_IMAGES += debian9-mxe debian-ports debian-bootstrap DOCKER_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
Signature · 1 line
2.21.0
Re: [PATCH v2 3/5] docker: remove debian8-mxe definitions
Quoted 5 lines · John Snow
We don't have a debian8-mxe dockerfile anymore.
Signed-off-by John Snow <[email protected]>Message-id: [email protected]
^ remove?
Quoted 18 lines
--- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tests/docker/Makefile.include +1
-1@@ -6,7 +6,7 @@ DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles # we don't run tests on intermediate images (used as base by another image) DOCKER_PARTIAL_IMAGES := debian8 debian9 debian10 debian-sid -DOCKER_PARTIAL_IMAGES += debian8-mxe debian9-mxe debian-ports debian-bootstrap +DOCKER_PARTIAL_IMAGES += debian9-mxe debian-ports debian-bootstrap DOCKER_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
PATCH v2 4/5 docker: remove unused debian-sid and debian-ports
In reply to John SnowThese are listed as "partial" images, but have no user. Remove them.
Message-id: [email protected]
--- tests/docker/Makefile.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tests/docker/Makefile.include +2 -2
@@ -5,8 +5,8 @@ DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles # we don't run tests on intermediate images (used as base by another image) -DOCKER_PARTIAL_IMAGES := debian8 debian9 debian10 debian-sid -DOCKER_PARTIAL_IMAGES += debian9-mxe debian-ports debian-bootstrap +DOCKER_PARTIAL_IMAGES := debian8 debian9 debian10 +DOCKER_PARTIAL_IMAGES += debian9-mxe debian-bootstrap DOCKER_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
Signature · 1 line
2.21.0
PATCH v2 5/5 docker: removed unused debian8 partial image
In reply to John Snowdebian8 partial base is also not consumed by any image, so remove it.
--- tests/docker/Makefile.include | 3 +-- tests/docker/dockerfiles/debian8.docker | 33 ------------------------- 2 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian8.docker
tests/docker/Makefile.include +1 -2
@@ -5,8 +5,7 @@ DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles # we don't run tests on intermediate images (used as base by another image) -DOCKER_PARTIAL_IMAGES := debian8 debian9 debian10 -DOCKER_PARTIAL_IMAGES += debian9-mxe debian-bootstrap +DOCKER_PARTIAL_IMAGES := debian9 debian9-mxe debian10 debian-bootstrap DOCKER_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
tests/docker/dockerfiles/debian8.docker deleted +0 -33
@@ -1,33 +0,0 @@ -# -# Docker multiarch cross-compiler target -# -# This docker target is builds on Debian and Emdebian's cross compiler targets -# to build distro with a selection of cross compilers for building test binaries. -# -# On its own you can't build much but the docker-foo-cross targets -# build on top of the base debian image. -# -FROM debian:jessie-slim - -MAINTAINER Philippe Mathieu-Daudé <[email protected]> - -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list - -# Setup some basic tools we need -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -yy eatmydata && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt-get install -y --no-install-recommends \ - bison \ - binutils-multiarch \ - build-essential \ - ca-certificates \ - clang \ - curl \ - flex \ - gettext \ - git \ - gnupg \ - pkg-config \ - python3-minimal
Signature · 1 line
2.21.0
Re: [PATCH v2 5/5] docker: removed unused debian8 partial image
Quoted 1 line · John Snow
debian8 partial base is also not consumed by any image, so remove it.
Quoted 62 lines
Signed-off-by John Snow <[email protected]>--- tests/docker/Makefile.include | 3 +-- tests/docker/dockerfiles/debian8.docker | 33 ------------------------- 2 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian8.dockertests/docker/Makefile.include +1
-2@@ -5,8 +5,7 @@ DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles # we don't run tests on intermediate images (used as base by another image) -DOCKER_PARTIAL_IMAGES := debian8 debian9 debian10 -DOCKER_PARTIAL_IMAGES += debian9-mxe debian-bootstrap +DOCKER_PARTIAL_IMAGES := debian9 debian9-mxe debian10 debian-bootstrap DOCKER_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 buildstests/docker/dockerfiles/debian8.docker deleted +0
-33@@ -1,33 +0,0 @@ -# -# Docker multiarch cross-compiler target -# -# This docker target is builds on Debian and Emdebian's cross compiler targets -# to build distro with a selection of cross compilers for building test binaries. -# -# On its own you can't build much but the docker-foo-cross targets -# build on top of the base debian image. -# -FROM debian:jessie-slim - -MAINTAINER Philippe Mathieu-Daudé <[email protected]> - -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list - -# Setup some basic tools we need -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -yy eatmydata && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt-get install -y --no-install-recommends \ - bison \ - binutils-multiarch \ - build-essential \ - ca-certificates \ - clang \ - curl \ - flex \ - gettext \ - git \ - gnupg \ - pkg-config \ - python3-minimal