From 9b34538928365579daa0e57100d7625c5ddbd6e4 Mon Sep 17 00:00:00 2001 From: Marko Date: Mon, 16 Mar 2020 14:01:35 +0100 Subject: [PATCH 1/2] db-testing: change base to golang (#44) (#45) Change base image to basic golang, not circle:golang Signed-off-by: Marko Baricevic --- docker-tm-db-testing/Dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-tm-db-testing/Dockerfile b/docker-tm-db-testing/Dockerfile index 4a48b60..9719ab0 100644 --- a/docker-tm-db-testing/Dockerfile +++ b/docker-tm-db-testing/Dockerfile @@ -1,9 +1,9 @@ -FROM circleci/golang +FROM golang ENV LD_LIBRARY_PATH=/usr/local/lib -RUN sudo apt-get install -y --no-install-recommends \ - libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev libzstd-dev +RUN apt-get update && apt-get install -y --no-install-recommends \ + libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev libzstd-dev make tar wget # Install cleveldb RUN \ @@ -11,10 +11,10 @@ RUN \ && tar xvf v1.20.tar.gz \ && cd leveldb-1.20 \ && make \ - && sudo cp -a out-static/lib* out-shared/lib* /usr/local/lib \ + && cp -a out-static/lib* out-shared/lib* /usr/local/lib \ && cd include \ - && sudo cp -a leveldb /usr/local/include \ - && sudo ldconfig \ + && cp -a leveldb /usr/local/include \ + && ldconfig \ && cd ../.. \ && rm -rf v1.20.tar.gz leveldb-1.20 @@ -24,7 +24,7 @@ RUN \ && tar -zxf v6.6.4.tar.gz \ && cd rocksdb-6.6.4 \ && DEBUG_LEVEL=0 make -j4 shared_lib \ - && sudo make install-shared \ - && sudo ldconfig \ + && make install-shared \ + && ldconfig \ && cd .. \ && rm -rf v6.6.4.tar.gz rocksdb-6.6.4 From 7acb971c89126956b119917940d19a6160bdc9f7 Mon Sep 17 00:00:00 2001 From: Roy Crihfield Date: Mon, 8 Nov 2021 20:42:49 +0800 Subject: [PATCH 2/2] Upgrade RocksDB to 6.24.2 --- docker-tm-db-testing/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-tm-db-testing/Dockerfile b/docker-tm-db-testing/Dockerfile index 9719ab0..29d1fb0 100644 --- a/docker-tm-db-testing/Dockerfile +++ b/docker-tm-db-testing/Dockerfile @@ -20,11 +20,11 @@ RUN \ # Install Rocksdb RUN \ - wget https://github.com/facebook/rocksdb/archive/v6.6.4.tar.gz \ - && tar -zxf v6.6.4.tar.gz \ - && cd rocksdb-6.6.4 \ + wget https://github.com/facebook/rocksdb/archive/v6.24.2.tar.gz \ + && tar -zxf v6.24.2.tar.gz \ + && cd rocksdb-6.42.2 \ && DEBUG_LEVEL=0 make -j4 shared_lib \ && make install-shared \ && ldconfig \ && cd .. \ - && rm -rf v6.6.4.tar.gz rocksdb-6.6.4 + && rm -rf v6.24.2.tar.gz rocksdb-6.24.2