From 336a439f10c70577122fa025a6b33eebce2e23ff Mon Sep 17 00:00:00 2001 From: Andrey Sergeev Date: Mon, 1 Jun 2020 15:57:33 +0300 Subject: [PATCH 1/3] fixed docker file --- README.md | 6 ++++++ docker/Dockerfile | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 545a638..f4937f0 100644 --- a/README.md +++ b/README.md @@ -320,6 +320,12 @@ because `rd_kafka_destroy` sometimes hangs forever. # Benchmarks +Before any commands init and updated git submodule +```bash + git submodule init + git submodule update +``` + ## Producer ### Async diff --git a/docker/Dockerfile b/docker/Dockerfile index 84da555..ec2b201 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,16 +7,19 @@ RUN yum install -y cmake \ gcc-c++ \ cyrus-sasl-lib \ openssl-libs \ + openssl-devel \ tarantool-devel + ADD . /opt/tarantool WORKDIR /opt/tarantool ENV STATIC_BUILD ON +ENV WITH_OPENSSL_1_1 OFF RUN cmake . RUN make -ENTRYPOINT tarantool /opt/tarantool/tests/app.lua \ No newline at end of file +ENTRYPOINT tarantool /opt/tarantool/tests/app.lua From cf1fb6cb60e932197ab76773cfc5bd721c7f4030 Mon Sep 17 00:00:00 2001 From: Andrey Sergeev Date: Mon, 1 Jun 2020 16:00:53 +0300 Subject: [PATCH 2/3] added ssl to requirements --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index f4937f0..067295c 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,8 @@ non critical errors as strings which allows you to decide how to handle it. * Tarantool development headers * librdkafka >= 0.11.5 * librdkafka development headers +* openssl-libs +* openssl development headers * make * cmake * gcc From 575c116981546ff8b61942ae8aad889cfa229200 Mon Sep 17 00:00:00 2001 From: Andrey Sergeev Date: Mon, 1 Jun 2020 16:47:48 +0300 Subject: [PATCH 3/3] remowed newline --- docker/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index ec2b201..28cb2ac 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -10,7 +10,6 @@ RUN yum install -y cmake \ openssl-devel \ tarantool-devel - ADD . /opt/tarantool WORKDIR /opt/tarantool