From 94af7ae6194f429eb7e851990b0a2f68c8d470ee Mon Sep 17 00:00:00 2001
From: test <test@zilliz.com>
Date: Thu, 17 Oct 2019 15:02:52 +0800
Subject: [PATCH] update docker images version to ubuntu18.04

Former-commit-id: 545c94dac0840472109eba466d0b87a95c3c87b5
---
 ci/jenkins/Jenkinsfile                        |  4 +--
 ci/jenkins/pod/milvus-build-env-pod.yaml      |  2 +-
 docker/build_env/ubuntu18.04/Dockerfile       | 25 +++++++++++++++++++
 .../ubuntu18.04/docker-entrypoint.sh          | 10 ++++++++
 docker/deploy/ubuntu18.04/Dockerfile          | 23 +++++++++++++++++
 .../deploy/ubuntu18.04/docker-entrypoint.sh   | 10 ++++++++
 6 files changed, 71 insertions(+), 3 deletions(-)
 create mode 100644 docker/build_env/ubuntu18.04/Dockerfile
 create mode 100755 docker/build_env/ubuntu18.04/docker-entrypoint.sh
 create mode 100644 docker/deploy/ubuntu18.04/Dockerfile
 create mode 100755 docker/deploy/ubuntu18.04/docker-entrypoint.sh

diff --git a/ci/jenkins/Jenkinsfile b/ci/jenkins/Jenkinsfile
index 5f3227fc..d3b7ac6d 100644
--- a/ci/jenkins/Jenkinsfile
+++ b/ci/jenkins/Jenkinsfile
@@ -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}'
                 ]);
diff --git a/ci/jenkins/pod/milvus-build-env-pod.yaml b/ci/jenkins/pod/milvus-build-env-pod.yaml
index 358cdee1..f0e798e7 100644
--- a/ci/jenkins/pod/milvus-build-env-pod.yaml
+++ b/ci/jenkins/pod/milvus-build-env-pod.yaml
@@ -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
diff --git a/docker/build_env/ubuntu18.04/Dockerfile b/docker/build_env/ubuntu18.04/Dockerfile
new file mode 100644
index 00000000..2a3721ce
--- /dev/null
+++ b/docker/build_env/ubuntu18.04/Dockerfile
@@ -0,0 +1,25 @@
+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" ]
+
diff --git a/docker/build_env/ubuntu18.04/docker-entrypoint.sh b/docker/build_env/ubuntu18.04/docker-entrypoint.sh
new file mode 100755
index 00000000..1e85e7e9
--- /dev/null
+++ b/docker/build_env/ubuntu18.04/docker-entrypoint.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+
+if [ "$1" = 'start' ]; then
+   tail -f /dev/null
+fi
+
+exec "$@"
+
diff --git a/docker/deploy/ubuntu18.04/Dockerfile b/docker/deploy/ubuntu18.04/Dockerfile
new file mode 100644
index 00000000..0d16ae46
--- /dev/null
+++ b/docker/deploy/ubuntu18.04/Dockerfile
@@ -0,0 +1,23 @@
+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
+
diff --git a/docker/deploy/ubuntu18.04/docker-entrypoint.sh b/docker/deploy/ubuntu18.04/docker-entrypoint.sh
new file mode 100755
index 00000000..446c174d
--- /dev/null
+++ b/docker/deploy/ubuntu18.04/docker-entrypoint.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+
+if [ "$1" == 'start' ]; then
+    cd /opt/milvus/scripts && ./start_server.sh
+fi
+
+exec "$@"
+
-- 
GitLab