X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=validation.git;a=blobdiff_plain;f=docker%2Fos%2FDockerfile;h=c447dea70a21f27d86fcb8b8fa795af778f637fb;hp=13a9c26c8ecb788f2f2305f2a713049c25cd88cf;hb=HEAD;hpb=5eaedeb5e211a11ca838b00a55ea49367ad90c4a diff --git a/docker/os/Dockerfile b/docker/os/Dockerfile index 13a9c26..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 && \ @@ -101,7 +97,7 @@ RUN \ 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