update docker files for python api

deploy/docker_buildenv/Ubuntu16.04/Dockerfile

+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

deploy/docker_buildenv/Ubuntu18.04/build.sh → deploy/docker_buildenv/Ubuntu16.04/build.sh

 #!/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
 

deploy/docker_buildenv/Ubuntu16.04/build_image.sh

+#!/usr/bin/env bash
+docker build -t yakser/asapo-env:ubuntu16.04 .
+docker push yakser/asapo-env:ubuntu16.04

deploy/docker_buildenv/Ubuntu16.04/install_curl.sh

+#!/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

deploy/docker_buildenv/Ubuntu18.04/Dockerfile

-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

deploy/docker_buildenv/Ubuntu18.04/build_image.sh

-#!/usr/bin/env bash
-docker build -t yakser/asapo-env:ubuntu18.04 .
-#docker push yakser/asapo-env:ubuntu18.04

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)

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@,