From e367815b471bb166e232abdb8b58f98bcbef8072 Mon Sep 17 00:00:00 2001 From: chenlei Date: Fri, 26 Jul 2019 11:01:54 +0800 Subject: [PATCH] =?UTF-8?q?1,=20=E5=9C=A8dockerfile=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E4=B8=AD=20=E6=9B=B4=E6=96=B0git=20submodule?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .dockerignore | 1 - docker/Dockerfile | 7 +++++-- docker/build_for_docker_linux.sh | 3 +++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.dockerignore b/.dockerignore index b8531b41..bdcda75c 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,3 @@ -.git .idea cmake-build-debug build diff --git a/docker/Dockerfile b/docker/Dockerfile index 069b9301..93c621d0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -33,13 +33,16 @@ RUN rm -f /etc/nginx/sites-enabled/default #后端 FROM base as build_b WORKDIR /usr/src/ZLMediaKit -ADD 3rdpart ./3rdpart +ADD 3rdpart/SQLite ./3rdpart/SQLite +ADD 3rdpart/jsoncpp ./3rdpart/jsoncpp +ADD 3rdpart/sqlite3pp ./3rdpart/sqlite3pp ADD Android ./Android ADD cmake ./cmake ADD server ./server ADD src ./src ADD tests ./tests -ADD .travis.yml _config.yml CMakeLists.txt docker/build_for_docker_linux.sh ./ +ADD .git ./.git +ADD .travis.yml _config.yml CMakeLists.txt docker/build_for_docker_linux.sh .gitmodules ./ RUN chmod +x build_for_docker_linux.sh RUN mkdir -p build/bin/dbdata && \ mkdir -p build/bin/log diff --git a/docker/build_for_docker_linux.sh b/docker/build_for_docker_linux.sh index 27e7f5e3..fac2697e 100755 --- a/docker/build_for_docker_linux.sh +++ b/docker/build_for_docker_linux.sh @@ -1,4 +1,7 @@ #!/bin/bash +git submodule init +git submodule update + mkdir -p linux_build rm -rf ./build ln -s ./linux_build build