Commit 476f83af authored by quicksilver's avatar quicksilver
Browse files

update Dockerfile

parent 73c05491

ci/jenkins/Jenkinsfile

+4 −4
Original line number Diff line number Diff line
@@ -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'

                                }

docker/build_env/cpu/ubuntu16.04/Dockerfile

+3 −0
Original line number Diff line number Diff line
@@ -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" ]

docker/build_env/cpu/ubuntu18.04/Dockerfile

+3 −0
Original line number Diff line number Diff line
@@ -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" ]

docker/build_env/gpu/ubuntu16.04/Dockerfile

+3 −1
Original line number Diff line number Diff line
@@ -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" ]

docker/build_env/gpu/ubuntu18.04/Dockerfile

+3 −1
Original line number Diff line number Diff line
@@ -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" ]