grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #726 from ethcore/docker

Browse Source 
dockerfiles update
This commit is contained in:
Arkadiy Paronyan 2016-03-14 19:02:04 +01:00
commit ffbc6f51cb
3 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/ubuntu-dev/Dockerfile
View File

@ -8,8 +8,8 @@ RUN apt-get update && \
# add-apt-repository # add-apt-repository
software-properties-common \ software-properties-common \
curl \ curl \
gcc \ g++ \
wget \ wget \
git \ git \
# evmjit dependencies # evmjit dependencies
zlib1g-dev \ zlib1g-dev \
@ -18,9 +18,8 @@ RUN apt-get update && \
# cmake, llvm and rocksdb ppas. then update ppas # cmake, llvm and rocksdb ppas. then update ppas
RUN add-apt-repository -y "ppa:george-edison55/cmake-3.x" && \ 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://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 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 # install evmjit
RUN git clone https://github.com/debris/evmjit && \ RUN git clone https://github.com/debris/evmjit && \
@ -31,9 +30,6 @@ RUN git clone https://github.com/debris/evmjit && \
# install multirust # install multirust
RUN curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes 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 # export rust LIBRARY_PATH
ENV LIBRARY_PATH /usr/local/lib ENV LIBRARY_PATH /usr/local/lib

13
docker/ubuntu-jit/Dockerfile
View File

@ -8,9 +8,9 @@ RUN apt-get update && \
# add-apt-repository # add-apt-repository
software-properties-common \ software-properties-common \
curl \ curl \
wget \ wget \
git \ git \
gcc \ g++ \
# evmjit dependencies # evmjit dependencies
zlib1g-dev \ zlib1g-dev \
libedit-dev libedit-dev
@ -18,9 +18,8 @@ RUN apt-get update && \
# cmake, llvm and rocksdb ppas. then update ppas # cmake, llvm and rocksdb ppas. then update ppas
RUN add-apt-repository -y "ppa:george-edison55/cmake-3.x" && \ 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://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 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 # install evmjit
RUN git clone https://github.com/debris/evmjit && \ RUN git clone https://github.com/debris/evmjit && \
@ -31,9 +30,6 @@ RUN git clone https://github.com/debris/evmjit && \
# install multirust # install multirust
RUN curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes 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 # export rust LIBRARY_PATH
ENV LIBRARY_PATH /usr/local/lib ENV LIBRARY_PATH /usr/local/lib
@ -41,7 +37,6 @@ ENV LIBRARY_PATH /usr/local/lib
ENV RUST_BACKTRACE 1 ENV RUST_BACKTRACE 1
# build parity # build parity
# TODO: add jit feature
RUN git clone https://github.com/ethcore/parity && \ RUN git clone https://github.com/ethcore/parity && \
cd parity && \ cd parity && \
cargo install --features rpc cargo build --release --features ethcore/jit

15
docker/ubuntu/Dockerfile
View File

@ -3,23 +3,14 @@ FROM ubuntu:14.04
# install tools and dependencies # install tools and dependencies
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y \ apt-get install -y \
gcc \ g++ \
curl \ curl \
git \ git \
# add-apt-repository make
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 # install multirust
RUN curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes 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 # export rust LIBRARY_PATH
ENV LIBRARY_PATH /usr/local/lib ENV LIBRARY_PATH /usr/local/lib
@ -29,4 +20,4 @@ ENV RUST_BACKTRACE 1
# build parity # build parity
RUN git clone https://github.com/ethcore/parity && \ RUN git clone https://github.com/ethcore/parity && \
cd parity && \ cd parity && \
cargo install --features rpc cargo build --release