Merge branch 'master' into travis

bin/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 description = "Ethcore client."
-name = "ethcore-client"
-version = "0.1.0"
+name = "parity"
+version = "0.9.0"
 license = "GPL-3.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 

bin/src/main.rs

@@ -9,7 +9,7 @@ extern crate rustc_serialize;
 extern crate ethcore_util as util;
 extern crate ethcore;
 extern crate ethsync;
-extern crate log;
+extern crate log as rlog;
 extern crate env_logger;
 extern crate ctrlc;
 
@@ -17,7 +17,7 @@ extern crate ctrlc;
 extern crate ethcore_rpc as rpc;
 
 use std::env;
-use log::{LogLevelFilter};
+use rlog::{LogLevelFilter};
 use env_logger::LogBuilder;
 use ctrlc::CtrlC;
 use util::*;

docker/Dockerfile

@@ -0,0 +1,40 @@
+FROM ubuntu:14.04
+
+# install tools and dependencies
+RUN apt-get update && \
+	apt-get install -y \
+	# make
+	build-essential \
+	# add-apt-repository
+	software-properties-common \
+	curl \
+	wget \ 
+	git \
+	# evmjit dependencies
+	zlib1g-dev \
+	libedit-dev
+
+# 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
+
+# install evmjit
+RUN git clone https://github.com/debris/evmjit && \
+	cd evmjit && \
+	mkdir build && cd build && \
+	cmake .. && make && make install && cd
+
+# 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
+
+# show backtraces
+ENV RUST_BACKTRACE 1