From fa62d27c82de85dc9c1d703fc8e1026169881fe8 Mon Sep 17 00:00:00 2001 From: Juha Kosonen Date: Mon, 2 Mar 2020 14:21:31 +0200 Subject: [PATCH] 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 Change-Id: Ib6050dead7e296306ed3f860797fdf6b3944fb43 --- docker/os/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 && \ -- 2.16.6