diff --git a/ci/jenkins/Jenkinsfile b/ci/jenkins/Jenkinsfile index 50aadab367..f0562ada64 100644 --- a/ci/jenkins/Jenkinsfile +++ b/ci/jenkins/Jenkinsfile @@ -93,7 +93,7 @@ pipeline { stage("Publish docker images") { agent { kubernetes { - label 'publish' + label "${BINRARY_VERSION}-publish" defaultContainer 'jnlp' yamlFile 'ci/jenkins/pod/docker-pod.yaml' } @@ -115,7 +115,7 @@ pipeline { stage("Deploy to Development") { agent { kubernetes { - label 'dev-test' + label "${BINRARY_VERSION}-dev-test" defaultContainer 'jnlp' yamlFile 'ci/jenkins/pod/testEnvironment.yaml' } @@ -223,7 +223,7 @@ pipeline { stage("Publish docker images") { agent { kubernetes { - label 'publish' + label "${BINRARY_VERSION}-publish" defaultContainer 'jnlp' yamlFile 'ci/jenkins/pod/docker-pod.yaml' } @@ -245,7 +245,7 @@ pipeline { stage("Deploy to Development") { agent { kubernetes { - label 'dev-test' + label "${BINRARY_VERSION}-dev-test" defaultContainer 'jnlp' yamlFile 'ci/jenkins/pod/testEnvironment.yaml' } diff --git a/docker/build_env/cpu/ubuntu16.04/Dockerfile b/docker/build_env/cpu/ubuntu16.04/Dockerfile index 6979ae9d40..45e2b53938 100644 --- a/docker/build_env/cpu/ubuntu16.04/Dockerfile +++ b/docker/build_env/cpu/ubuntu16.04/Dockerfile @@ -22,5 +22,8 @@ RUN ln -s /usr/lib/x86_64-linux-gnu/libmysqlclient.so \ RUN sh -c 'echo export LD_LIBRARY_PATH=/opt/intel/compilers_and_libraries_2019.5.281/linux/mkl/lib/intel64:\$LD_LIBRARY_PATH > /etc/profile.d/mkl.sh' COPY docker-entrypoint.sh /app/docker-entrypoint.sh + +WORKDIR /opt/milvus + ENTRYPOINT [ "/app/docker-entrypoint.sh" ] CMD [ "start" ] diff --git a/docker/build_env/cpu/ubuntu18.04/Dockerfile b/docker/build_env/cpu/ubuntu18.04/Dockerfile index 6cd2bfc1c7..7c76e2ec7a 100644 --- a/docker/build_env/cpu/ubuntu18.04/Dockerfile +++ b/docker/build_env/cpu/ubuntu18.04/Dockerfile @@ -22,5 +22,8 @@ RUN ln -s /usr/lib/x86_64-linux-gnu/libmysqlclient.so \ RUN sh -c 'echo export LD_LIBRARY_PATH=/opt/intel/compilers_and_libraries_2019.5.281/linux/mkl/lib/intel64:\$LD_LIBRARY_PATH > /etc/profile.d/mkl.sh' COPY docker-entrypoint.sh /app/docker-entrypoint.sh + +WORKDIR /opt/milvus + ENTRYPOINT [ "/app/docker-entrypoint.sh" ] CMD [ "start" ] diff --git a/docker/build_env/gpu/ubuntu16.04/Dockerfile b/docker/build_env/gpu/ubuntu16.04/Dockerfile index 2d0baf45e9..d35a7dccfd 100644 --- a/docker/build_env/gpu/ubuntu16.04/Dockerfile +++ b/docker/build_env/gpu/ubuntu16.04/Dockerfile @@ -20,6 +20,8 @@ RUN ln -s /usr/lib/x86_64-linux-gnu/libmysqlclient.so /usr/lib/x86_64-linux-gnu/ RUN sh -c 'echo export LD_LIBRARY_PATH=/opt/intel/compilers_and_libraries_2019.5.281/linux/mkl/lib/intel64:\$LD_LIBRARY_PATH > /etc/profile.d/mkl.sh' COPY docker-entrypoint.sh /app/docker-entrypoint.sh + +WORKDIR /opt/milvus + ENTRYPOINT [ "/app/docker-entrypoint.sh" ] CMD [ "start" ] - diff --git a/docker/build_env/gpu/ubuntu18.04/Dockerfile b/docker/build_env/gpu/ubuntu18.04/Dockerfile index 8ed9573977..9f2f3f55ac 100644 --- a/docker/build_env/gpu/ubuntu18.04/Dockerfile +++ b/docker/build_env/gpu/ubuntu18.04/Dockerfile @@ -20,6 +20,8 @@ RUN ln -s /usr/lib/x86_64-linux-gnu/libmysqlclient.so /usr/lib/x86_64-linux-gnu/ RUN sh -c 'echo export LD_LIBRARY_PATH=/opt/intel/compilers_and_libraries_2019.5.281/linux/mkl/lib/intel64:\$LD_LIBRARY_PATH > /etc/profile.d/mkl.sh' COPY docker-entrypoint.sh /app/docker-entrypoint.sh + +WORKDIR /opt/milvus + ENTRYPOINT [ "/app/docker-entrypoint.sh" ] CMD [ "start" ] - diff --git a/docker/deploy/cpu/ubuntu16.04/Dockerfile b/docker/deploy/cpu/ubuntu16.04/Dockerfile index 2a8317733b..9e90c6a89c 100644 --- a/docker/deploy/cpu/ubuntu16.04/Dockerfile +++ b/docker/deploy/cpu/ubuntu16.04/Dockerfile @@ -11,6 +11,8 @@ COPY ./docker-entrypoint.sh /opt COPY ./milvus /opt/milvus ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/milvus/lib" +WORKDIR /opt/milvus + ENTRYPOINT [ "/opt/docker-entrypoint.sh" ] CMD [ "start" ] diff --git a/docker/deploy/cpu/ubuntu18.04/Dockerfile b/docker/deploy/cpu/ubuntu18.04/Dockerfile index 4cf9ceebad..0064f4aad2 100644 --- a/docker/deploy/cpu/ubuntu18.04/Dockerfile +++ b/docker/deploy/cpu/ubuntu18.04/Dockerfile @@ -11,6 +11,8 @@ COPY ./docker-entrypoint.sh /opt COPY ./milvus /opt/milvus ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/milvus/lib" +WORKDIR /opt/milvus + ENTRYPOINT [ "/opt/docker-entrypoint.sh" ] CMD [ "start" ] diff --git a/docker/deploy/gpu/ubuntu16.04/Dockerfile b/docker/deploy/gpu/ubuntu16.04/Dockerfile index c5ca0ab03e..ee5402d3a9 100644 --- a/docker/deploy/gpu/ubuntu16.04/Dockerfile +++ b/docker/deploy/gpu/ubuntu16.04/Dockerfile @@ -15,6 +15,8 @@ COPY ./docker-entrypoint.sh /opt COPY ./milvus /opt/milvus ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/milvus/lib" +WORKDIR /opt/milvus + ENTRYPOINT [ "/opt/docker-entrypoint.sh" ] CMD [ "start" ] diff --git a/docker/deploy/gpu/ubuntu18.04/Dockerfile b/docker/deploy/gpu/ubuntu18.04/Dockerfile index 0d16ae46e1..0760fe527e 100644 --- a/docker/deploy/gpu/ubuntu18.04/Dockerfile +++ b/docker/deploy/gpu/ubuntu18.04/Dockerfile @@ -15,6 +15,8 @@ COPY ./docker-entrypoint.sh /opt COPY ./milvus /opt/milvus ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/milvus/lib" +WORKDIR /opt/milvus + ENTRYPOINT [ "/opt/docker-entrypoint.sh" ] CMD [ "start" ]