summaryrefslogtreecommitdiffstats
path: root/tests/docker
diff options
context:
space:
mode:
authorCleber Rosa2020-03-12 20:36:13 +0100
committerCleber Rosa2020-03-18 00:16:16 +0100
commita51d6a549361fd1a20dd2ac1d6a42ac0a4c708c7 (patch)
tree3e149b2f39a616c667b4b9af5b439947017a22a7 /tests/docker
parenttests/docker: add CentOS 8 Dockerfile (diff)
downloadqemu-a51d6a549361fd1a20dd2ac1d6a42ac0a4c708c7.tar.gz
qemu-a51d6a549361fd1a20dd2ac1d6a42ac0a4c708c7.tar.xz
qemu-a51d6a549361fd1a20dd2ac1d6a42ac0a4c708c7.zip
tests/docker: make "buildah bud" output similar to "docker build"
Podman users will most often be using buildah to build containers. Among the differences between "buildah bud|build-using-dockerfile" and a traditional "docker build" is that buildah does not run a container during build. To the best of my knowledge and experiments, this means that runtime variables, such as ENV from one base image will not propagate into another. The end result is that the location for the cross compiler binaries, defined in the base "qemu/debian9-mxe" image, are not passed through this image. Consequently, the cross compilers are not on PATH and the build fails. Signed-off-by: Cleber Rosa <crosa@redhat.com> Acked-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20200312193616.438922-3-crosa@redhat.com> Signed-off-by: Cleber Rosa <crosa@redhat.com>
Diffstat (limited to 'tests/docker')
-rw-r--r--tests/docker/dockerfiles/debian-win32-cross.docker2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/docker/dockerfiles/debian-win32-cross.docker b/tests/docker/dockerfiles/debian-win32-cross.docker
index 9d7053e59d..d16d6431bc 100644
--- a/tests/docker/dockerfiles/debian-win32-cross.docker
+++ b/tests/docker/dockerfiles/debian-win32-cross.docker
@@ -9,7 +9,7 @@ MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
ENV TARGET i686
-ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin
+ENV PATH $PATH:/usr/lib/mxe/usr/bin:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin
ENV PKG_CONFIG_PATH \
$PKG_CONFIG_PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/lib/pkgconfig