From b9860ac38834b87c397786fa238069337aeeebf3 Mon Sep 17 00:00:00 2001 From: Thomas Ubensee <34603111+tomuben@users.noreply.github.com> Date: Fri, 9 Aug 2024 14:59:11 -0300 Subject: [PATCH] Changed working dir when running test_udfclient.sh --- .../flavor_base/base_test_build_run/Dockerfile | 6 ++++-- .../flavor_base/build_run/Dockerfile | 3 ++- .../flavor_base/base_test_build_run/Dockerfile | 6 ++++-- .../flavor_base/build_run/Dockerfile | 3 ++- .../flavor_base/base_test_build_run/Dockerfile | 6 ++++-- .../flavor_base/build_run/Dockerfile | 3 ++- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/base_test_build_run/Dockerfile b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/base_test_build_run/Dockerfile index 6800028d..048e32e6 100644 --- a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/base_test_build_run/Dockerfile +++ b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/base_test_build_run/Dockerfile @@ -14,8 +14,10 @@ ENV CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/ ENV C_INCLUDE_PATH=$C_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/ RUN ./build.sh --lockfile_mode=off --config no-tty -c dbg --config python --config test-binaries-py3 RUN cp -r -L bazel-bin/* /exaudf -RUN ./base/test_udfclient.sh /exaudf/exaudfclient_py3 -RUN ./base/test_udfclient.sh /exaudf/exaudfclient_py3_static + +WORKDIR /exaudfclient/base +RUN ./test_udfclient.sh /exaudf/exaudfclient_py3 +RUN ./test_udfclient.sh /exaudf/exaudfclient_py3_static WORKDIR / RUN mkdir /exasol_emulator diff --git a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_run/Dockerfile b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_run/Dockerfile index a45306a5..7de3bdbb 100644 --- a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_run/Dockerfile +++ b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_run/Dockerfile @@ -10,7 +10,8 @@ ENV C_INCLUDE_PATH=$C_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/ RUN ./build.sh --lockfile_mode=off --config no-tty --config optimize --config python --config fast-binary-py3 RUN cp -r -L bazel-bin/* /exaudf -RUN ./base/test_udfclient.sh /exaudf/exaudfclient_py3 +WORKDIR /exaudfclient/base +RUN ./test_udfclient.sh /exaudf/exaudfclient_py3 WORKDIR /exaudf diff --git a/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/base_test_build_run/Dockerfile b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/base_test_build_run/Dockerfile index c3c84dbf..211ea3c4 100644 --- a/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/base_test_build_run/Dockerfile +++ b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/base_test_build_run/Dockerfile @@ -14,8 +14,10 @@ ENV C_INCLUDE_PATH=$C_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/ # We need to build with optimize here, because the debug build fails to run with a runtime linking error regarding protobuf RUN ./build.sh --lockfile_mode=off --config no-tty -c dbg --config python --config test-binaries-py3 RUN cp -r -L bazel-bin/* /exaudf -RUN ./base/test_udfclient.sh /exaudf/exaudfclient_py3 -RUN ./base/test_udfclient.sh /exaudf/exaudfclient_py3_static + +WORKDIR /exaudfclient/base +RUN ./test_udfclient.sh /exaudf/exaudfclient_py3 +RUN ./test_udfclient.sh /exaudf/exaudfclient_py3_static WORKDIR / RUN mkdir /exasol_emulator diff --git a/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/build_run/Dockerfile b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/build_run/Dockerfile index a45306a5..7de3bdbb 100644 --- a/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/build_run/Dockerfile +++ b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/build_run/Dockerfile @@ -10,7 +10,8 @@ ENV C_INCLUDE_PATH=$C_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/ RUN ./build.sh --lockfile_mode=off --config no-tty --config optimize --config python --config fast-binary-py3 RUN cp -r -L bazel-bin/* /exaudf -RUN ./base/test_udfclient.sh /exaudf/exaudfclient_py3 +WORKDIR /exaudfclient/base +RUN ./test_udfclient.sh /exaudf/exaudfclient_py3 WORKDIR /exaudf diff --git a/flavors/template-Exasol-all-python-3.10/flavor_base/base_test_build_run/Dockerfile b/flavors/template-Exasol-all-python-3.10/flavor_base/base_test_build_run/Dockerfile index be55e863..930ba99d 100644 --- a/flavors/template-Exasol-all-python-3.10/flavor_base/base_test_build_run/Dockerfile +++ b/flavors/template-Exasol-all-python-3.10/flavor_base/base_test_build_run/Dockerfile @@ -29,8 +29,10 @@ COPY /exaudfclient/ /exaudfclient/ WORKDIR /exaudfclient/ RUN ["/bin/bash", "-c", "source /env && bash build.sh --lockfile_mode=off --config no-tty -c dbg --config python --config test-binaries-py3"] RUN cp -r -L bazel-bin/* /exaudf -RUN ./base/test_udfclient.sh /exaudf/exaudfclient_py3 -RUN ./base/test_udfclient.sh /exaudf/exaudfclient_py3_static + +WORKDIR /exaudfclient/base +RUN ./test_udfclient.sh /exaudf/exaudfclient_py3 +RUN ./test_udfclient.sh /exaudf/exaudfclient_py3_static WORKDIR / RUN mkdir /exasol_emulator diff --git a/flavors/template-Exasol-all-python-3.10/flavor_base/build_run/Dockerfile b/flavors/template-Exasol-all-python-3.10/flavor_base/build_run/Dockerfile index c989badb..0690b72d 100644 --- a/flavors/template-Exasol-all-python-3.10/flavor_base/build_run/Dockerfile +++ b/flavors/template-Exasol-all-python-3.10/flavor_base/build_run/Dockerfile @@ -28,7 +28,8 @@ WORKDIR /exaudfclient/ RUN ["/bin/bash", "-c", "source /env && bash build.sh --lockfile_mode=off --config no-tty --config optimize --config python --config fast-binary-py3"] RUN cp -r -L bazel-bin/* /exaudf -RUN ./base/test_udfclient.sh /exaudf/exaudfclient_py3 +WORKDIR /exaudfclient/base +RUN ./test_udfclient.sh /exaudf/exaudfclient_py3 WORKDIR /exaudf