From 67abb7102d51d71485afbfc655cfd35577da3ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Eckel?= Date: Thu, 22 Jun 2023 09:21:51 +0200 Subject: [PATCH] fixed all-in-one container tarantool issue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Eckel --- Dockerfile-all-in-one | 8 +++++--- Makefile | 4 ++-- docs/root/source/introduction/quickstart.md | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Dockerfile-all-in-one b/Dockerfile-all-in-one index 1189bf9..8178641 100644 --- a/Dockerfile-all-in-one +++ b/Dockerfile-all-in-one @@ -1,4 +1,4 @@ -FROM python:3.9-slim +FROM ubuntu:22.04 LABEL maintainer "contact@ipdb.global" ARG TM_VERSION=0.34.24 @@ -11,13 +11,15 @@ RUN apt-get update \ && apt-get install -y openssl ca-certificates git \ && apt-get install -y vim build-essential cmake jq zsh wget \ && apt-get install -y libstdc++6 \ - && apt-get install -y openssh-client openssh-server \ - && pip install --upgrade pip cffi \ + && apt-get install -y openssh-client openssh-server +RUN apt-get install -y python3 python3-pip cython3 +RUN pip install --upgrade pip cffi \ && pip install -e . \ && apt-get autoremove # Install tarantool and monit RUN apt-get install -y dirmngr gnupg apt-transport-https software-properties-common ca-certificates curl +RUN ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime RUN apt-get update RUN curl -L https://tarantool.io/wrATeGF/release/2/installer.sh | bash RUN apt-get install -y tarantool monit diff --git a/Makefile b/Makefile index f6edb59..ed15997 100644 --- a/Makefile +++ b/Makefile @@ -65,8 +65,8 @@ test: check-deps test-unit ## Run unit test-unit: check-deps ## Run all tests once or specify a file/test with TEST=tests/file.py::Class::test @$(DC) up -d tarantool - #wget https://github.com/tendermint/tendermint/releases/download/v0.34.15/tendermint_0.34.15_linux_amd64.tar.gz - #tar zxf tendermint_0.34.15_linux_amd64.tar.gz + #wget https://github.com/tendermint/tendermint/releases/download/v0.34.24/tendermint_0.34.24_linux_amd64.tar.gz + #tar zxf tendermint_0.34.24_linux_amd64.tar.gz poetry run pytest -m "not abci" rm -rf ~/.tendermint && ./tendermint init && ./tendermint node --consensus.create_empty_blocks=false --rpc.laddr=tcp://0.0.0.0:26657 --proxy_app=tcp://localhost:26658& poetry run pytest -m abci diff --git a/docs/root/source/introduction/quickstart.md b/docs/root/source/introduction/quickstart.md index 5549856..e27d014 100644 --- a/docs/root/source/introduction/quickstart.md +++ b/docs/root/source/introduction/quickstart.md @@ -59,8 +59,8 @@ $ sudo apt install mongodb ``` Tendermint can be installed and started as follows ``` -$ wget https://github.com/tendermint/tendermint/releases/download/v0.34.15/tendermint_0.34.15_linux_amd64.tar.gz -$ tar zxf tendermint_0.34.15_linux_amd64.tar.gz +$ wget https://github.com/tendermint/tendermint/releases/download/v0.34.24/tendermint_0.34.24_linux_amd64.tar.gz +$ tar zxf tendermint_0.34.24_linux_amd64.tar.gz $ ./tendermint init $ ./tendermint node --proxy_app=tcp://localhost:26658 ```