1, 在dockerfile构建中 更新git submodule

This commit is contained in:
chenlei 2019-07-26 11:01:54 +08:00
parent c7a31e17c5
commit e367815b47
3 changed files with 8 additions and 3 deletions

View File

@ -1,4 +1,3 @@
.git
.idea .idea
cmake-build-debug cmake-build-debug
build build

View File

@ -33,13 +33,16 @@ RUN rm -f /etc/nginx/sites-enabled/default
#后端 #后端
FROM base as build_b FROM base as build_b
WORKDIR /usr/src/ZLMediaKit 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 Android ./Android
ADD cmake ./cmake ADD cmake ./cmake
ADD server ./server ADD server ./server
ADD src ./src ADD src ./src
ADD tests ./tests 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 chmod +x build_for_docker_linux.sh
RUN mkdir -p build/bin/dbdata && \ RUN mkdir -p build/bin/dbdata && \
mkdir -p build/bin/log mkdir -p build/bin/log

View File

@ -1,4 +1,7 @@
#!/bin/bash #!/bin/bash
git submodule init
git submodule update
mkdir -p linux_build mkdir -p linux_build
rm -rf ./build rm -rf ./build
ln -s ./linux_build build ln -s ./linux_build build