From fb29d6925fa6af0ebb08a24b4cc9557bbca0447e Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Thu, 15 Aug 2019 10:40:17 +0200
Subject: [PATCH] update docker files for python api
---
deploy/docker_buildenv/Ubuntu16.04/Dockerfile | 12 +++++++
.../{Ubuntu18.04 => Ubuntu16.04}/build.sh | 2 +-
.../Ubuntu16.04/build_image.sh | 3 ++
.../Ubuntu16.04/install_curl.sh | 16 ++++++++++
deploy/docker_buildenv/Ubuntu18.04/Dockerfile | 11 -------
.../Ubuntu18.04/build_image.sh | 3 --
tests/manual/python_tests/test_p.py | 32 +++++++++++++------
.../api/python/source_dist_linux/setup.py.in | 4 +--
8 files changed, 57 insertions(+), 26 deletions(-)
create mode 100644 deploy/docker_buildenv/Ubuntu16.04/Dockerfile
rename deploy/docker_buildenv/{Ubuntu18.04 => Ubuntu16.04}/build.sh (57%)
create mode 100755 deploy/docker_buildenv/Ubuntu16.04/build_image.sh
create mode 100755 deploy/docker_buildenv/Ubuntu16.04/install_curl.sh
delete mode 100644 deploy/docker_buildenv/Ubuntu18.04/Dockerfile
delete mode 100755 deploy/docker_buildenv/Ubuntu18.04/build_image.sh
diff --git a/deploy/docker_buildenv/Ubuntu16.04/Dockerfile b/deploy/docker_buildenv/Ubuntu16.04/Dockerfile
new file mode 100644
index 000000000..1d58583ff
--- /dev/null
+++ b/deploy/docker_buildenv/Ubuntu16.04/Dockerfile
@@ -0,0 +1,12 @@
+from ubuntu:16.04
+
+ENV GOPATH /tmp
+
+RUN apt update && apt install -y cmake g++ golang zlib1g-dev python cython python-numpy python3 cython3 python3-numpy git wget
+
+
+ADD install_curl.sh install_curl.sh
+RUN ./install_curl.sh /curl
+
+
+ADD build.sh /bin/build.sh
diff --git a/deploy/docker_buildenv/Ubuntu18.04/build.sh b/deploy/docker_buildenv/Ubuntu16.04/build.sh
similarity index 57%
rename from deploy/docker_buildenv/Ubuntu18.04/build.sh
rename to deploy/docker_buildenv/Ubuntu16.04/build.sh
index 3f3ac29d6..48e7d972c 100755
--- a/deploy/docker_buildenv/Ubuntu18.04/build.sh
+++ b/deploy/docker_buildenv/Ubuntu16.04/build.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
cd /asapo/build
-cmake -DCMAKE_BUILD_TYPE="Debug" ..
+cmake -DCMAKE_BUILD_TYPE="Release" -DLIBCURL_DIR=/curl ..
cd worker && make
cd ../producer && make
diff --git a/deploy/docker_buildenv/Ubuntu16.04/build_image.sh b/deploy/docker_buildenv/Ubuntu16.04/build_image.sh
new file mode 100755
index 000000000..6c427c990
--- /dev/null
+++ b/deploy/docker_buildenv/Ubuntu16.04/build_image.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+docker build -t yakser/asapo-env:ubuntu16.04 .
+docker push yakser/asapo-env:ubuntu16.04
diff --git a/deploy/docker_buildenv/Ubuntu16.04/install_curl.sh b/deploy/docker_buildenv/Ubuntu16.04/install_curl.sh
new file mode 100755
index 000000000..ac368ddc7
--- /dev/null
+++ b/deploy/docker_buildenv/Ubuntu16.04/install_curl.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+mkdir -p $1
+cd $1
+wget https://curl.haxx.se/download/curl-7.58.0.tar.gz
+tar xzf curl-7.58.0.tar.gz
+cd curl-7.58.0
+./configure --without-ssl --disable-shared --disable-manual --disable-ares --disable-cookies \
+--disable-crypto-auth --disable-ipv6 --disable-proxy --disable-unix-sockets \
+--without-libidn --without-librtmp --without-zlib --disable-ldap \
+--disable-libcurl-option --prefix=`pwd`/../
+make
+make install
+cd -
+rm -rf bin share curl-7.58.0
+rm curl-7.58.0.tar.gz
diff --git a/deploy/docker_buildenv/Ubuntu18.04/Dockerfile b/deploy/docker_buildenv/Ubuntu18.04/Dockerfile
deleted file mode 100644
index ce3127fc1..000000000
--- a/deploy/docker_buildenv/Ubuntu18.04/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-from ubuntu:18.04
-
-ENV GOPATH /tmp
-
-RUN apt update && apt install -y cmake g++ libcurl4-openssl-dev golang zlib1g-dev python cython python-numpy python3 cython3 python3-numpy
-
-
-RUN apt install -y git
-
-
-ADD build.sh /bin/build.sh
\ No newline at end of file
diff --git a/deploy/docker_buildenv/Ubuntu18.04/build_image.sh b/deploy/docker_buildenv/Ubuntu18.04/build_image.sh
deleted file mode 100755
index 0a524d35f..000000000
--- a/deploy/docker_buildenv/Ubuntu18.04/build_image.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-docker build -t yakser/asapo-env:ubuntu18.04 .
-#docker push yakser/asapo-env:ubuntu18.04
diff --git a/tests/manual/python_tests/test_p.py b/tests/manual/python_tests/test_p.py
index 9a641528a..5f1f8b973 100644
--- a/tests/manual/python_tests/test_p.py
+++ b/tests/manual/python_tests/test_p.py
@@ -3,18 +3,32 @@ from __future__ import print_function
import asapo_worker
import sys
import json
+import time
+<<<<<<< Updated upstream
broker, err = asapo_worker.create_server_broker("psana002:8400", "/tmp", "asapo_test2","",
"yzgAcLmijSLWIm8dBiGNCbc0i42u5HSm-zR6FRqo__Y=", 1000000)
+=======
+source = "psana002:8400"
+path = "/asapo_shared/asapo/data"
+beamtime = "asapo_test"
+token = "KmUDdacgBzaOD3NIJvN1NmKGqWKtx0DK-NyPjdpeWkc="
+>>>>>>> Stashed changes
-if not broker:
- print("Cannot create broker: " + err)
- sys.exit(1)
-last_id = 0
+broker, err = asapo_worker.create_server_broker(
+ source, path, beamtime, token, 1000)
+
+group_id, err = broker.generate_group_id()
+if err is not None:
+ print('cannot generate group id, err: ', err)
+else:
+ print('generated group id: ', group_id)
+
while True:
- array, meta, err = broker.get_last(meta_only=False)
- id = meta['_id']
- if id != last_id:
- print ("file content:",array.tostring().strip().decode("utf-8"))
- last_id = id
+ data, meta, err = broker.get_last(group_id, meta_only=False)
+ if err is not None:
+ print('err: ', err)
+ else:
+ print('filename: ', meta['name'])
+ time.sleep(1)
diff --git a/worker/api/python/source_dist_linux/setup.py.in b/worker/api/python/source_dist_linux/setup.py.in
index dacf73f5f..9fc10832c 100644
--- a/worker/api/python/source_dist_linux/setup.py.in
+++ b/worker/api/python/source_dist_linux/setup.py.in
@@ -4,8 +4,8 @@ import numpy
ext_modules = [
Extension("asapo_worker", ["asapo_worker.cpp"],
- extra_objects=['lib/libasapo-worker.a',
- 'lib/libcurl.a'],
+ extra_objects=['lib/libasapo-worker.a'],
+ libraries = ['curl'],
include_dirs=["include/common","include",numpy.get_include()],
extra_compile_args=@EXTRA_COMPILE_ARGS@,
extra_link_args=@EXTRA_LINK_ARGS@,
--
GitLab