Skip to content
Snippets Groups Projects
Commit 9f2d0d84 authored by Sergey Yakubov's avatar Sergey Yakubov
Browse files

Merge pull request #70 in ASAPO/asapo from feature_authorize-beamtime to develop

* commit 'd15517bb':
  increase timeouts, add centos build environment
parents 0463e4de d15517bb
No related branches found
No related tags found
No related merge requests found
from centos:7
ENV GOPATH /tmp
RUN yum update -y && yum install -y cmake g++ golang zlib1g-dev python cython python-numpy python3 cython3 python3-numpy git wget
RUN yum -y install gcc
RUN yum -y install epel-release make
ADD install_curl.sh install_curl.sh
RUN ./install_curl.sh /curl
RUN yum install -y python-pip python3-pip && pip install --upgrade cython && pip3 install --upgrade cython
RUN pip3 install sphinx
ADD build.sh /bin/build.sh
RUN yum -y install gcc-c++
ADD install_cmake.sh install_cmake.sh
RUN ./install_cmake.sh
RUN yum -y install zlib-devel
RUN yum -y install python3-numpy python-numpy
RUN yum -y install numpy
RUN yum -y install python-devel python36-devel
RUN yum -y install glibc-static libstdc++-static
\ No newline at end of file
#!/usr/bin/env bash
cd /asapo/build
cmake -DCMAKE_BUILD_TYPE="Release" -DLIBCURL_DIR=/curl -DBUILD_PYTHON_DOCS=ON ..
cd consumer && make
cd ../producer && make
cd ../sphinx && make
#!/usr/bin/env bash
docker build -t yakser/asapo-env:centos7.7 .
#docker push yakser/asapo-env:ubuntu16.04
#!/usr/bin/env bash
wget https://cmake.org/files/v3.10/cmake-3.10.0.tar.gz
tar zxvf cmake-3.*
cd cmake-3.*
./bootstrap --prefix=/usr/local
make -j$(nproc)
make install
cmake --version
/usr/local/bin/cmake --version
#!/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
......@@ -6,7 +6,7 @@ import sys
source, path, beamtime, token, group_id = sys.argv[1:]
broker = asapo_consumer.create_server_broker(source,path, beamtime,"",token,1000)
broker = asapo_consumer.create_server_broker(source,path, beamtime,"",token,60000)
if group_id == "new":
......
......@@ -5,7 +5,7 @@ beamtime_id=asapo_test
stream_in=detector
stream_out=stream
timeout=2
timeout=15
timeout_producer=25
nthreads=4
......
......@@ -136,7 +136,7 @@ def check_single(broker,group_id_new):
else:
exit_on_noerr("wrong query")
broker = asapo_consumer.create_server_broker("bla",path, beamtime,"",token,1000)
broker = asapo_consumer.create_server_broker("bla",path, beamtime,"",token,60000)
try:
broker.get_last(group_id_new, meta_only=True)
except asapo_consumer.AsapoUnavailableServiceError as err:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment