X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=docker%2Fos%2FDockerfile;h=3f3fe95d90a7220057a7ae69a93555aa88feaaed;hb=4b3bf154e21874a4c46e0251f14d41d2adbe45ac;hp=2e7f36a7b2edce350cafd3bdf459219ce5c4001f;hpb=04d8950198efa3b50271e63f0ea5c0726551f14e;p=validation.git diff --git a/docker/os/Dockerfile b/docker/os/Dockerfile index 2e7f36a..3f3fe95 100644 --- a/docker/os/Dockerfile +++ b/docker/os/Dockerfile @@ -31,8 +31,6 @@ RUN apt-get update && apt-get -y install \ wget \ golint \ sqlite3 \ - openssh-client \ - sshpass \ debian-goodies \ build-essential \ pkg-config \ @@ -71,18 +69,18 @@ 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 && \ + git clone https://github.com/future-architect/vuls -b v0.9.7 && \ cd vuls && \ make install && \ mkdir -p /root/go/src/github.com/kotakanbe && \ - git -C /root/go/src/github.com/kotakanbe clone https://github.com/kotakanbe/go-cve-dictionary.git && \ + git -C /root/go/src/github.com/kotakanbe clone https://github.com/kotakanbe/go-cve-dictionary.git -b v0.5.0 && \ cd /root/go/src/github.com/kotakanbe/go-cve-dictionary/ && \ make install && \ - git -C /root/go/src/github.com/kotakanbe clone https://github.com/kotakanbe/goval-dictionary.git && \ + git -C /root/go/src/github.com/kotakanbe clone https://github.com/kotakanbe/goval-dictionary.git -b v0.2.8 && \ cd /root/go/src/github.com/kotakanbe/goval-dictionary && \ make install && \ mkdir -p /root/go/src/github.com/knqyf263 && \ - git -C /root/go/src/github.com/knqyf263 clone https://github.com/knqyf263/gost.git && \ + git -C /root/go/src/github.com/knqyf263 clone https://github.com/knqyf263/gost.git -b v0.1.3 && \ cd /root/go/src/github.com/knqyf263/gost && \ make install @@ -111,6 +109,8 @@ COPY --from=build /root/go/bin /root/go/bin COPY --from=build /root/go/src/github.com/bin /root/go/src/github.com/bin RUN apt-get update && apt-get -y install \ + openssh-client \ + sshpass \ python3-pip python3.6 && \ cd /usr/bin && ln -s python3 python && \ pip3 install -r /wheels/requirements/pip-requirements.txt \