| Message ID | 20230224180857.1050220-2-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | testing/next: docker.py removal and kaniko updates | expand |
On Fri, Feb 24, 2023 at 06:08:51PM +0000, Alex Bennée wrote: > In the process of migrating away from using docker.py to build our > containers we need to expose the command to the build environment. The > script is still a useful way to probe which command works though. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > configure | 3 +++ > 1 file changed, 3 insertions(+) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> With regards, Daniel
On 24/2/23 19:08, Alex Bennée wrote: > In the process of migrating away from using docker.py to build our > containers we need to expose the command to the build environment. The > script is still a useful way to probe which command works though. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > configure | 3 +++ > 1 file changed, 3 insertions(+) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
diff --git a/configure b/configure index cf6db3d551..b6a1cebad9 100755 --- a/configure +++ b/configure @@ -1744,6 +1744,7 @@ fi # functions to probe cross compilers container="no" +runc="" if test $use_containers = "yes" && (has "docker" || has "podman"); then case $($python "$source_path"/tests/docker/docker.py probe) in *docker) container=docker ;; @@ -1752,6 +1753,7 @@ if test $use_containers = "yes" && (has "docker" || has "podman"); then esac if test "$container" != "no"; then docker_py="$python $source_path/tests/docker/docker.py --engine $container" + runc=$($python "$source_path"/tests/docker/docker.py probe) fi fi @@ -2351,6 +2353,7 @@ fi if test "$container" != no; then echo "ENGINE=$container" >> $config_host_mak + echo "RUNC=$runc" >> $config_host_mak fi echo "ROMS=$roms" >> $config_host_mak echo "MAKE=$make" >> $config_host_mak
In the process of migrating away from using docker.py to build our containers we need to expose the command to the build environment. The script is still a useful way to probe which command works though. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- configure | 3 +++ 1 file changed, 3 insertions(+)