From 81beaf10948fa00fb51935ea6b516ca9b8bf2d4b Mon Sep 17 00:00:00 2001 From: debris Date: Mon, 14 Mar 2016 17:53:08 +0100 Subject: [PATCH 1/3] update dockerfiles --- docker/ubuntu-dev/Dockerfile | 8 ++------ docker/ubuntu-jit/Dockerfile | 11 +++-------- docker/ubuntu/Dockerfile | 10 +--------- 3 files changed, 6 insertions(+), 23 deletions(-) diff --git a/docker/ubuntu-dev/Dockerfile b/docker/ubuntu-dev/Dockerfile index 8b016e6fd..e9113afdf 100644 --- a/docker/ubuntu-dev/Dockerfile +++ b/docker/ubuntu-dev/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update && \ software-properties-common \ curl \ gcc \ - wget \ + wget \ git \ # evmjit dependencies zlib1g-dev \ @@ -18,9 +18,8 @@ RUN apt-get update && \ # cmake, llvm and rocksdb ppas. then update ppas RUN add-apt-repository -y "ppa:george-edison55/cmake-3.x" && \ add-apt-repository "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.7 main" && \ - add-apt-repository "deb http://ppa.launchpad.net/giskou/librocksdb/ubuntu trusty main" && \ apt-get update && \ - apt-get install -y --force-yes cmake llvm-3.7-dev librocksdb + apt-get install -y --force-yes cmake llvm-3.7-dev # install evmjit RUN git clone https://github.com/debris/evmjit && \ @@ -31,9 +30,6 @@ RUN git clone https://github.com/debris/evmjit && \ # install multirust RUN curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes -# install nightly and make it default -RUN multirust update nightly && multirust default nightly - # export rust LIBRARY_PATH ENV LIBRARY_PATH /usr/local/lib diff --git a/docker/ubuntu-jit/Dockerfile b/docker/ubuntu-jit/Dockerfile index 90ce531be..c50aa83b5 100644 --- a/docker/ubuntu-jit/Dockerfile +++ b/docker/ubuntu-jit/Dockerfile @@ -8,7 +8,7 @@ RUN apt-get update && \ # add-apt-repository software-properties-common \ curl \ - wget \ + wget \ git \ gcc \ # evmjit dependencies @@ -18,9 +18,8 @@ RUN apt-get update && \ # cmake, llvm and rocksdb ppas. then update ppas RUN add-apt-repository -y "ppa:george-edison55/cmake-3.x" && \ add-apt-repository "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.7 main" && \ - add-apt-repository "deb http://ppa.launchpad.net/giskou/librocksdb/ubuntu trusty main" && \ apt-get update && \ - apt-get install -y --force-yes cmake llvm-3.7-dev librocksdb + apt-get install -y --force-yes cmake llvm-3.7-dev # install evmjit RUN git clone https://github.com/debris/evmjit && \ @@ -31,9 +30,6 @@ RUN git clone https://github.com/debris/evmjit && \ # install multirust RUN curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes -# install nightly and make it default -RUN multirust update nightly && multirust default nightly - # export rust LIBRARY_PATH ENV LIBRARY_PATH /usr/local/lib @@ -41,7 +37,6 @@ ENV LIBRARY_PATH /usr/local/lib ENV RUST_BACKTRACE 1 # build parity -# TODO: add jit feature RUN git clone https://github.com/ethcore/parity && \ cd parity && \ - cargo install --features rpc + cargo install --features ethcore/jit diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile index 812e66e9e..3273b816a 100644 --- a/docker/ubuntu/Dockerfile +++ b/docker/ubuntu/Dockerfile @@ -9,17 +9,9 @@ RUN apt-get update && \ # add-apt-repository software-properties-common -# rocksdb ppas. then update ppas -RUN add-apt-repository "deb http://ppa.launchpad.net/giskou/librocksdb/ubuntu trusty main" && \ - apt-get update && \ - apt-get install -y --force-yes librocksdb - # install multirust RUN curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes -# install nightly and make it default -RUN multirust update nightly && multirust default nightly - # export rust LIBRARY_PATH ENV LIBRARY_PATH /usr/local/lib @@ -29,4 +21,4 @@ ENV RUST_BACKTRACE 1 # build parity RUN git clone https://github.com/ethcore/parity && \ cd parity && \ - cargo install --features rpc + cargo install From c476e7da3110768aaf6325b50fd001fa270681d4 Mon Sep 17 00:00:00 2001 From: debris Date: Mon, 14 Mar 2016 18:25:05 +0100 Subject: [PATCH 2/3] update docker --- docker/ubuntu/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile index 3273b816a..141cbdfb0 100644 --- a/docker/ubuntu/Dockerfile +++ b/docker/ubuntu/Dockerfile @@ -3,11 +3,10 @@ FROM ubuntu:14.04 # install tools and dependencies RUN apt-get update && \ apt-get install -y \ - gcc \ + g++ \ curl \ git \ - # add-apt-repository - software-properties-common + make # install multirust RUN curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes From dfef09161cd0453aeeeee8b181e502dc58ed2fc1 Mon Sep 17 00:00:00 2001 From: debris Date: Mon, 14 Mar 2016 18:47:23 +0100 Subject: [PATCH 3/3] update dockerfiles --- docker/ubuntu-dev/Dockerfile | 2 +- docker/ubuntu-jit/Dockerfile | 4 ++-- docker/ubuntu/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/ubuntu-dev/Dockerfile b/docker/ubuntu-dev/Dockerfile index e9113afdf..05e8dfe8f 100644 --- a/docker/ubuntu-dev/Dockerfile +++ b/docker/ubuntu-dev/Dockerfile @@ -8,7 +8,7 @@ RUN apt-get update && \ # add-apt-repository software-properties-common \ curl \ - gcc \ + g++ \ wget \ git \ # evmjit dependencies diff --git a/docker/ubuntu-jit/Dockerfile b/docker/ubuntu-jit/Dockerfile index c50aa83b5..138882d2b 100644 --- a/docker/ubuntu-jit/Dockerfile +++ b/docker/ubuntu-jit/Dockerfile @@ -10,7 +10,7 @@ RUN apt-get update && \ curl \ wget \ git \ - gcc \ + g++ \ # evmjit dependencies zlib1g-dev \ libedit-dev @@ -39,4 +39,4 @@ ENV RUST_BACKTRACE 1 # build parity RUN git clone https://github.com/ethcore/parity && \ cd parity && \ - cargo install --features ethcore/jit + cargo build --release --features ethcore/jit diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile index 141cbdfb0..38c628d0e 100644 --- a/docker/ubuntu/Dockerfile +++ b/docker/ubuntu/Dockerfile @@ -20,4 +20,4 @@ ENV RUST_BACKTRACE 1 # build parity RUN git clone https://github.com/ethcore/parity && \ cd parity && \ - cargo install + cargo build --release