From f3b31a25fdd25a2ae3e8f341e25cf4b96bb92abe Mon Sep 17 00:00:00 2001
From: andrey <andey@signalmodelling.ru>
Date: Thu, 17 Sep 2020 13:45:40 +0300
Subject: [PATCH 1/2] add Dockerfile for ubuntu

---
 Jenkinsfile                    |  2 +-
 docker/ubuntu-shstk/Dockerfile | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 docker/ubuntu-shstk/Dockerfile

diff --git a/Jenkinsfile b/Jenkinsfile
index de62052..bf17402 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,7 +28,7 @@ node {
         _envmap["${_n}"] = "${_v}";
     }
 	def _msg = "Built images:"
-    def platforms = ['debian', 'osx', 'windows', 'android', 'pi']
+    def platforms = ['debian', 'osx', 'windows', 'android', 'pi', 'ubuntu']
 	for (int i = 0; i < platforms.size(); ++i) {
 	    if (_envmap["BUILD_${platforms[i]}"] == "1") {
 			stage("${platforms[i]}-shstk") {
diff --git a/docker/ubuntu-shstk/Dockerfile b/docker/ubuntu-shstk/Dockerfile
new file mode 100644
index 0000000..d894a66
--- /dev/null
+++ b/docker/ubuntu-shstk/Dockerfile
@@ -0,0 +1,17 @@
+ARG DOCKER_PREFIX=wapmobil/
+FROM ${DOCKER_PREFIX}ubuntu
+
+ARG LIBS_BUILD_NUMBER=9999
+ARG JOBS_COUNT=4
+ENV PATH=/opt/cmake/bin:$PATH 
+
+WORKDIR /soft
+RUN git clone -b master --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
+
+WORKDIR /soft/shstk_build_ubuntu
+RUN cmake -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
+ && make install -j${JOBS_COUNT} \
+ && rm -rf * \
+ && ldconfig
+ 
+WORKDIR /soft/src

From d228382814dea9b92c1f0972a2b71cadbe40500b Mon Sep 17 00:00:00 2001
From: Ivan Pelipenko <peri4ko@yandex.ru>
Date: Thu, 17 Sep 2020 13:51:45 +0300
Subject: [PATCH 2/2] pip

---
 pip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pip b/pip
index 351ad1b..5f7c58c 160000
--- a/pip
+++ b/pip
@@ -1 +1 @@
-Subproject commit 351ad1bf304d8d089527955200121b00686f9d08
+Subproject commit 5f7c58c28eacdc91cbdd470e6e58710506aca8cb