Commit a16a0544 authored by test's avatar test
Browse files

update docker images version to ubuntu18.04 


Former-commit-id: 37b330c19f95bc0a6e85b46fcc3dd785c1814c66
parent 2909cfcf

ci/jenkins/Jenkinsfile

+2 −2
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ pipeline { 
    }



    stages {

        stage("Ubuntu 16.04") {

        stage("Ubuntu 18.04") {

            environment {

                OS_NAME = "ubuntu16.04"

                OS_NAME = "ubuntu18.04"

                PACKAGE_VERSION = VersionNumber([

                    versionNumberString : '${SEMVER}-${LOWER_BUILD_TYPE}-${OS_NAME}-x86_64-${BUILD_DATE_FORMATTED, "yyyyMMdd"}-${BUILDS_TODAY}'

                ]);

ci/jenkins/pod/milvus-build-env-pod.yaml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ metadata: 
spec:

  containers:

  - name: milvus-build-env

    image: registry.zilliz.com/milvus/milvus-build-env:v0.5.0

    image: registry.zilliz.com/milvus/milvus-build-env:v0.5.0-ubuntu18.04

    command:

    - cat

    tty: true

docker/build_env/ubuntu18.04/Dockerfile

0 → 100644
+25 −0
Original line number Diff line number Diff line 
FROM nvidia/cuda:10.1-devel-ubuntu18.04



ENV NVIDIA_DRIVER_CAPABILITIES compute,utility



RUN apt-get update && apt-get install -y --no-install-recommends wget && \

    wget -qO- "https://cmake.org/files/v3.14/cmake-3.14.3-Linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C /usr/local && \

    wget -P /tmp https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB && \

    apt-key add /tmp/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB && \

    sh -c 'echo deb https://apt.repos.intel.com/mkl all main > /etc/apt/sources.list.d/intel-mkl.list' && \

    apt-get update && apt-get install -y --no-install-recommends \

    git flex bison gfortran \

    curl libtool automake libboost1.58-all-dev libssl-dev pkg-config libcurl4-openssl-dev \

    clang-format-6.0 clang-tidy-6.0 \

    lcov mysql-client libmysqlclient-dev intel-mkl-gnu-2019.4-243 intel-mkl-core-2019.4-243 && \

    apt-get remove --purge -y && \

    rm -rf /var/lib/apt/lists/*



RUN ln -s /usr/lib/x86_64-linux-gnu/libmysqlclient.so /usr/lib/x86_64-linux-gnu/libmysqlclient_r.so



RUN sh -c 'echo export LD_LIBRARY_PATH=/opt/intel/compilers_and_libraries_2019.4.243/linux/mkl/lib/intel64:\$LD_LIBRARY_PATH > /etc/profile.d/mkl.sh'



COPY docker-entrypoint.sh /app/docker-entrypoint.sh

ENTRYPOINT [ "/app/docker-entrypoint.sh" ]

CMD [ "start" ]

docker/build_env/ubuntu18.04/docker-entrypoint.sh

0 → 100755
+10 −0
Original line number Diff line number Diff line 
#!/bin/bash



set -e



if [ "$1" = 'start' ]; then

   tail -f /dev/null

fi



exec "$@"

docker/deploy/ubuntu18.04/Dockerfile

0 → 100644
+23 −0
Original line number Diff line number Diff line 
FROM nvidia/cuda:10.1-devel-ubuntu18.04



ENV NVIDIA_DRIVER_CAPABILITIES compute,utility



RUN rm -rf /etc/apt/sources.list.d/nvidia-ml.list && rm -rf /etc/apt/sources.list.d/cuda.list



RUN apt-get update && apt-get install -y --no-install-recommends \

    gfortran libsqlite3-dev libmysqlclient-dev libcurl4-openssl-dev python3 && \

    apt-get remove --purge -y && \

    rm -rf /var/lib/apt/lists/*



RUN ln -s /usr/lib/x86_64-linux-gnu/libmysqlclient.so /usr/lib/x86_64-linux-gnu/libmysqlclient_r.so



COPY ./docker-entrypoint.sh /opt

COPY ./milvus /opt/milvus

ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/milvus/lib"



ENTRYPOINT [ "/opt/docker-entrypoint.sh" ]



CMD [ "start" ]



EXPOSE 19530