X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=validation.git;a=blobdiff_plain;f=docker%2Fos%2FDockerfile;h=2c164733a7ea23692547c7bc903317fac5ba19c0;hp=3f3fe95d90a7220057a7ae69a93555aa88feaaed;hb=HEAD;hpb=4b3bf154e21874a4c46e0251f14d41d2adbe45ac

diff --git a/docker/os/Dockerfile b/docker/os/Dockerfile
index 3f3fe95..2c16473 100644
--- a/docker/os/Dockerfile
+++ b/docker/os/Dockerfile
@@ -15,28 +15,24 @@
 ##############################################################################
 
 # ref: https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#use-multi-stage-builds
-FROM ubuntu:18.04 as build
+FROM ubuntu as build
 
 # Install dependencies
 COPY pip-requirements.txt /wheels/requirements/pip-requirements.txt
 RUN apt-get update && apt-get -y install \
-    python3-pip \
     gcc \
     git \
-    libc-dev \
-    libffi6 \
-    libffi-dev \
     make \
-    libssl-dev \
     wget \
-    golint \
-    sqlite3 \
-    debian-goodies \
-    build-essential \
-    pkg-config \
-    autoconf automake autotools-dev m4 \
     linux-headers-generic \
-    libaio-dev libattr1-dev libcap-dev
+    build-essential \
+    libssl-dev \
+    libffi-dev \
+    python-dev \
+    python3-pip \
+    automake \
+    autoconf \
+    pkgconf
 
 # Build binaries
 WORKDIR /wheels
@@ -69,7 +65,7 @@ RUN if [ $(uname -m) == 'aarch64' ]; then HOST_ARCH=arm64; else HOST_ARCH=amd64;
     export PATH=$PATH:/root/go/bin:/root/go/src/github.com/bin && \
     mkdir -p /root/go/src/github.com/future-architect && \
     cd /root/go/src/github.com/future-architect && \
-    git clone https://github.com/future-architect/vuls -b v0.9.7 && \
+    git clone https://github.com/future-architect/vuls -b v0.10.0 && \
     cd vuls && \
     make install && \
     mkdir -p /root/go/src/github.com/kotakanbe && \
@@ -93,14 +89,15 @@ RUN \
     for i in $(seq 2002 "$(date +"%Y")"); do go-cve-dictionary fetchnvd -quiet -http-proxy=${HTTP_PROXY} -dbpath /opt/akraino/validation/tests/os/vuls/cve.sqlite3 -years "$i"; done && \
     goval-dictionary fetch-ubuntu -http-proxy=${HTTP_PROXY} -dbpath=/opt/akraino/validation/tests/os/vuls/oval_ubuntu_16.sqlite3 16 && \
     goval-dictionary fetch-ubuntu -http-proxy=${HTTP_PROXY} -dbpath=/opt/akraino/validation/tests/os/vuls/oval_ubuntu_18.sqlite3 18 && \
-    goval-dictionary fetch-redhat -http-proxy=${HTTP_PROXY} -dbpath=/opt/akraino/validation/tests/os/vuls/oval_centos.sqlite3 7 && \
+    goval-dictionary fetch-redhat -http-proxy=${HTTP_PROXY} -dbpath=/opt/akraino/validation/tests/os/vuls/oval_centos_7.sqlite3 7 && \
+    goval-dictionary fetch-redhat -http-proxy=${HTTP_PROXY} -dbpath=/opt/akraino/validation/tests/os/vuls/oval_centos_8.sqlite3 8 && \
     gost fetch redhat --http-proxy=${HTTP_PROXY} --dbpath=/opt/akraino/validation/tests/os/vuls/gost_centos.sqlite3 --threads=$(nproc) && \
     cd /opt/akraino/validation/tests/os/vuls && \
     tar cvzf db.tar.gz *.sqlite3 && \
     rm *.sqlite3
 
 # Copy binaries into the final container and install robot framework, bluval dependencies
-FROM ubuntu:18.04
+FROM ubuntu
 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