From: Juha Kosonen <juha.kosonen@nokia.com>
Date: Mon, 2 Mar 2020 12:21:31 +0000 (+0200)
Subject: Fix os layer build failures
X-Git-Tag: 3.0.0~8
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=fa62d27c82de85dc9c1d703fc8e1026169881fe8;p=validation.git

Fix os layer build failures

Following changes implemented:

- pkg-config is required for building recent version of LTP [1]
- do not try to re-create vuls directory

[1] https://github.com/linux-test-project/ltp/issues/649

JIRA: VAL-100

Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
Change-Id: Ib6050dead7e296306ed3f860797fdf6b3944fb43
---

diff --git a/docker/os/Dockerfile b/docker/os/Dockerfile
index 95d8cfe..fc0d033 100644
--- a/docker/os/Dockerfile
+++ b/docker/os/Dockerfile
@@ -32,6 +32,7 @@ RUN apt-get update && apt-get -y install \
     sqlite3 \
     debian-goodies \
     build-essential \
+    pkg-config \
     autoconf automake autotools-dev m4 \
     linux-headers-generic \
     libaio-dev libattr1-dev libcap-dev
@@ -98,7 +99,6 @@ RUN wget https://dl.google.com/go/go1.12.6.linux-amd64.tar.gz -P /root/ && \
     git -C /root/go/src/github.com/kotakanbe clone https://github.com/kotakanbe/go-cve-dictionary.git && \
     cd /root/go/src/github.com/kotakanbe/go-cve-dictionary/ && \
     make install && \
-    mkdir /opt/akraino/validation/tests/os/vuls/ && \
     for i in $(seq 2002 "$(date +"%Y")"); do go-cve-dictionary fetchnvd -http-proxy=${HTTP_PROXY} -dbpath /opt/akraino/validation/tests/os/vuls/cve.sqlite3 -years "$i"; done && \
     git -C /root/go/src/github.com/kotakanbe clone https://github.com/kotakanbe/goval-dictionary.git && \
     cd /root/go/src/github.com/kotakanbe/goval-dictionary && \