diff --git a/.dockerignore b/.dockerignore index 0674a2f29d4ac5595eb0c4dfa4c41a4cc7ca0c90..ccf38d0ee61407b9782b875a9d3e93ad1150b628 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,6 @@ 3rdparty +!3rdparty/BuildDms +!3rdparty/BuildGoogleCloud out build_* _skbuild diff --git a/docker/build_scripts/osdu_linux_build.sh b/docker/build_scripts/osdu_linux_build.sh new file mode 100644 index 0000000000000000000000000000000000000000..9b405b414016dacb0a71cacef0791a49aef4501f --- /dev/null +++ b/docker/build_scripts/osdu_linux_build.sh @@ -0,0 +1,12 @@ +#!/bin/sh +REPO='open-vds' +if [ $# -gt 0 ] + then + REPO=$1 + shift +fi +cd $REPO +mkdir build_release +cd build_release +cmake -DCMAKE_BUILD_TYPE=Release "$@" -GNinja -DCMAKE_INSTALL_PREFIX=../../$REPO-install .. +ninja install diff --git a/docker/osdu.Dockerfile b/docker/osdu.Dockerfile index f11a2730a63df243290f0044d4a477e1c2a5f92c..a7fe9ceb86263bb8b2c30dc8451fe0c8bda40ea4 100644 --- a/docker/osdu.Dockerfile +++ b/docker/osdu.Dockerfile @@ -24,8 +24,9 @@ RUN pip3 install ninja COPY python/requirements-dev-with-docs.txt /tmp/requirements-dev.txt RUN pip3 install -r tmp/requirements-dev.txt -COPY docker/build_scripts/generic_linux_build.sh /root/build_and_install_openvds.sh -RUN cd root && bash /root/build_and_install_openvds.sh ${tag} ${repo} -DBUILD_PYTHON=OFF -DBUILD_JAVA=OFF -DBUILD_DOCS=OFF -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF +COPY docker/build_scripts/osdu_linux_build.sh /root/build_and_install_openvds.sh +COPY . /root/open-vds +RUN cd root && bash /root/build_and_install_openvds.sh open-vds -DBUILD_PYTHON=OFF -DBUILD_JAVA=OFF -DBUILD_DOCS=OFF -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF # Deploy stage