X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=docker%2Fos%2FDockerfile;h=58bed2322e1cd57bf197730370c0df5c43556aca;hb=c2475490514ec2573697b6707a82feb8fd4936b0;hp=61d1848e94effa789fc08e5a6e05c47a5003cd32;hpb=d1b564a6e36765c478db6519992cb8d074e85008;p=validation.git diff --git a/docker/os/Dockerfile b/docker/os/Dockerfile index 61d1848..58bed23 100644 --- a/docker/os/Dockerfile +++ b/docker/os/Dockerfile @@ -49,15 +49,20 @@ RUN make autotools && \ make -j $(getconf _NPROCESSORS_ONLN) 2>&1 | tee ../build-log.txt && \ make install 2>&1 | tee ../install-log.txt RUN tar czvf /opt/akraino/ltp.tar.gz /opt/ltp +WORKDIR /root/src +RUN git clone https://github.com/CISOfy/lynis && tar czvf /opt/akraino/lynis-remote.tar.gz ./lynis # Copy binaries into the final container and install robot framework FROM ubuntu:18.04 COPY --from=build /wheels /wheels COPY --from=build /opt/akraino/validation /opt/akraino/validation COPY --from=build /opt/akraino/ltp.tar.gz /opt/akraino/ltp.tar.gz +COPY --from=build /opt/akraino/lynis-remote.tar.gz /opt/akraino/lynis-remote.tar.gz + RUN apt-get update && apt-get -y install \ - python3-pip python3.7 &&\ + python3-pip python3.6 && \ + cd /usr/bin && ln -s python3 python && \ pip3 install -r /wheels/requirements/pip-requirements.txt \ -f /wheels && \ rm -rf /wheels && \ @@ -65,5 +70,7 @@ RUN apt-get update && apt-get -y install \ rm -rf /var/cache/apt/* && \ rm -rf /var/lib/apt/lists/* -# Install blueval dependencies +# Install bluval dependencies RUN pip3 install -r /opt/akraino/validation/bluval/requirements.txt +ENV LC_ALL=C.UTF-8 +ENV LANG=C.UTF-8