diff --git a/docker/tester/Dockerfile b/docker/tester/Dockerfile index 764a2ce4..7d64c85f 100644 --- a/docker/tester/Dockerfile +++ b/docker/tester/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:28 +FROM fedora:31 LABEL name="falcosecurity/falco-tester" LABEL usage="docker run -v /boot:/boot:ro -v /var/run/docker.sock:/var/run/docker.sock -v $PWD/..:/source -v $PWD/build:/build -e FALCO_VERSION= --name falcosecurity/falco-tester test" @@ -7,8 +7,10 @@ LABEL maintainer="opensource@sysdig.com" ENV FALCO_VERSION= ENV BUILD_TYPE=release -RUN curl https://avocado-project.org/data/repos/avocado-fedora.repo -o /etc/yum.repos.d/avocado.repo && \ - dnf install -y docker findutils jq unzip python2-avocado python2-avocado-plugins-varianter-yaml-to-mux && dnf clean all +RUN dnf install -y python2-pip python2 docker findutils jq unzip && dnf clean all +ENV PATH="/root/.local/bin/:${PATH}" +RUN pip2 install --user avocado-framework==69.0 +RUN pip2 install --user avocado-framework-plugin-varianter-yaml-to-mux==69.0 COPY ./root / diff --git a/docker/tester/root/usr/bin/entrypoint b/docker/tester/root/usr/bin/entrypoint index eb8fac3e..ad3cfb24 100755 --- a/docker/tester/root/usr/bin/entrypoint +++ b/docker/tester/root/usr/bin/entrypoint @@ -49,7 +49,7 @@ case "$CMD" in fi echo "Running regression tests ..." cd $SOURCE_DIR/falco/test - bash run_regression_tests.sh $BUILD_DIR/$BUILD_TYPE + ./run_regression_tests.sh $BUILD_DIR/$BUILD_TYPE docker rmi "$DOCKER_IMAGE_NAME" || true ;; "bash") diff --git a/docker/tester/root/usr/bin/usage b/docker/tester/root/usr/bin/usage index 96527ad0..c3d0c448 100755 --- a/docker/tester/root/usr/bin/usage +++ b/docker/tester/root/usr/bin/usage @@ -1,9 +1,9 @@ #!/usr/bin/env bash -pythonversion=$(python -c 'import sys; version=sys.version_info[:3]; print("{0}.{1}.{2}".format(*version))') -pipversion=$(pip --version | cut -d' ' -f 1,2,5,6) +pythonversion=$(python2 -c 'import sys; version=sys.version_info[:3]; print("{0}.{1}.{2}".format(*version))') +pipversion=$(pip2 --version | cut -d' ' -f 1,2,5,6) dockerversion=$(docker --version) -avocadoversion=$(pip show avocado-framework | grep Version) +avocadoversion=$(pip2 show avocado-framework | grep Version) avocadoversion=${avocadoversion#"Version: "} cat <