From d11ad9a005644d921723a6399b961cd9aad6cff7 Mon Sep 17 00:00:00 2001 From: Leonardo Di Donato Date: Fri, 19 Jul 2019 09:20:54 +0000 Subject: [PATCH] fix(docker/tester): switch to fedora 28 and avocado 69 Signed-off-by: Leonardo Di Donato --- docker/tester/Dockerfile | 8 +++----- docker/tester/root/usr/bin/usage | 3 +++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docker/tester/Dockerfile b/docker/tester/Dockerfile index 62261fcd..c9554172 100644 --- a/docker/tester/Dockerfile +++ b/docker/tester/Dockerfile @@ -1,4 +1,4 @@ -FROM centos:7 +FROM fedora:28 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,10 +7,8 @@ LABEL maintainer="opensource@sysdig.com" ENV FALCO_VERSION= ENV BUILD_TYPE=release -RUN yum -y install epel-release && yum clean all -y && \ - yum -y install python-pip docker jq unzip && yum clean all -y - -RUN pip install avocado-framework avocado-framework-plugin-varianter-yaml-to-mux +RUN curl https://avocado-project.org/data/repos/avocado-fedora.repo -o /etc/yum.repos.d/avocado.repo && \ + dnf install -y docker jq unzip python2-avocado python2-avocado-plugins-varianter-yaml-to-mux && dnf clean all COPY ./root / diff --git a/docker/tester/root/usr/bin/usage b/docker/tester/root/usr/bin/usage index 48510f02..68051846 100755 --- a/docker/tester/root/usr/bin/usage +++ b/docker/tester/root/usr/bin/usage @@ -3,6 +3,8 @@ 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) dockerversion=$(docker --version) +avocadoversion=$(pip show avocado-framework | grep Version) +avocadoversion=${avocadoversion#"Version: "} cat <