From 8239a293d954c3b965ba6806ba87edf5b10aa0c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@bluware.com>
Date: Thu, 27 May 2021 19:35:41 +0200
Subject: [PATCH] Update osdu docker image

---
 .dockerignore                            |  2 ++
 docker/build_scripts/osdu_linux_build.sh | 12 ++++++++++++
 docker/osdu.Dockerfile                   |  5 +++--
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 docker/build_scripts/osdu_linux_build.sh

diff --git a/.dockerignore b/.dockerignore
index 0674a2f2..ccf38d0e 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 00000000..9b405b41
--- /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 f11a2730..a7fe9ceb 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
-- 
GitLab