update(docker/tester): switch to fedora:31

Co-Authored-By: Lorenzo Fontana <lo@linux.com>
Signed-off-by: Leonardo Di Donato <leodidonato@gmail.com>
This commit is contained in:
Leonardo Di Donato 2020-01-17 16:41:48 +01:00 committed by Leo Di Donato
parent 521c3198bd
commit 77d23d2cc6
3 changed files with 10 additions and 8 deletions

View File

@ -1,4 +1,4 @@
FROM fedora:28 FROM fedora:31
LABEL name="falcosecurity/falco-tester" 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=<current_falco_version> --name <name> falcosecurity/falco-tester test" 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=<current_falco_version> --name <name> falcosecurity/falco-tester test"
@ -7,8 +7,10 @@ LABEL maintainer="opensource@sysdig.com"
ENV FALCO_VERSION= ENV FALCO_VERSION=
ENV BUILD_TYPE=release ENV BUILD_TYPE=release
RUN curl https://avocado-project.org/data/repos/avocado-fedora.repo -o /etc/yum.repos.d/avocado.repo && \ RUN dnf install -y python2-pip python2 docker findutils jq unzip && dnf clean all
dnf install -y docker findutils jq unzip python2-avocado python2-avocado-plugins-varianter-yaml-to-mux && 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 / COPY ./root /

View File

@ -49,7 +49,7 @@ case "$CMD" in
fi fi
echo "Running regression tests ..." echo "Running regression tests ..."
cd $SOURCE_DIR/falco/test 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 docker rmi "$DOCKER_IMAGE_NAME" || true
;; ;;
"bash") "bash")

View File

@ -1,9 +1,9 @@
#!/usr/bin/env bash #!/usr/bin/env bash
pythonversion=$(python -c 'import sys; version=sys.version_info[:3]; print("{0}.{1}.{2}".format(*version))') pythonversion=$(python2 -c 'import sys; version=sys.version_info[:3]; print("{0}.{1}.{2}".format(*version))')
pipversion=$(pip --version | cut -d' ' -f 1,2,5,6) pipversion=$(pip2 --version | cut -d' ' -f 1,2,5,6)
dockerversion=$(docker --version) dockerversion=$(docker --version)
avocadoversion=$(pip show avocado-framework | grep Version) avocadoversion=$(pip2 show avocado-framework | grep Version)
avocadoversion=${avocadoversion#"Version: "} avocadoversion=${avocadoversion#"Version: "}
cat <<EOF cat <<EOF
@ -38,4 +38,4 @@ Environment.
* ${pipversion} * ${pipversion}
* avocado ${avocadoversion} * avocado ${avocadoversion}
* ${dockerversion} * ${dockerversion}
EOF EOF