Merge branch 'master' into develop

README.md

@@ -8,7 +8,7 @@ Contributors, builders and testers include Eric Lombrozo (cross-compilation), Ti
 
 ### Building
 
-See https://github.com/ethereum/cpp-ethereum/wiki/Build-Instructions and https://github.com/ethereum/cpp-ethereum/wiki/Compatibility-Info-and-Build-Tips .
+See [Build Instructions](https://github.com/ethereum/cpp-ethereum/wiki/Build-Instructions) and [Compatibility Info and Build Tips](https://github.com/ethereum/cpp-ethereum/wiki/Compatibility-Info-and-Build-Tips).
 
 ### Testing
 
@@ -16,12 +16,15 @@ To run the tests, make sure you clone the tests repository from github.com/ether
 
 ### Yet To Do
 
-See https://github.com/ethereum/cpp-ethereum/wiki/TODO
+See [TODO](https://github.com/ethereum/cpp-ethereum/wiki/TODO)
+
 
 ### License
 
-See LICENSE
+See [LICENSE](LICENSE)
 
 ### Contributing
 
-Please read CodingStandards.txt thoroughly before making alterations to the code base. Please do *NOT* use an editor that automatically reformats whitespace away from astylerc or the formating guidelines as describled in CodingStandards.txt.
+All development goes in develop branch - please don't submit pull requests to master.
+
+Please read [CodingStandards.txt](CodingStandards.txt) thoroughly before making alterations to the code base. Please do *NOT* use an editor that automatically reformats whitespace away from astylerc or the formatting guidelines as described in [CodingStandards.txt](CodingStandards.txt).

docker/Dockerfile

@@ -0,0 +1,20 @@
+FROM ubuntu:14.04
+
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update
+RUN apt-get upgrade -y
+
+RUN apt-get install -qy wget
+RUN apt-get install -qy build-essential g++-4.8 automake libtool unzip git cmake
+RUN apt-get install -qy libncurses5-dev libgmp-dev libgmp3-dev libboost-all-dev libleveldb-dev yasm libminiupnpc-dev
+RUN apt-get install -qy qtbase5-dev qt5-default qtdeclarative5-dev libqt5webkit5-dev
+
+RUN mkdir /cryptopp562
+RUN cd /cryptopp562 && wget http://www.cryptopp.com/cryptopp562.zip && unzip cryptopp562.zip
+RUN cd /cryptopp562 && make -j $(cat /proc/cpuinfo | grep processor | wc -l) && make install
+
+RUN git clone --depth=1 https://github.com/ethereum/cpp-ethereum
+RUN mkdir cpp-ethereum/build
+RUN cd cpp-ethereum/build && cmake .. -DCMAKE_BUILD_TYPE=Release && make -j $(cat /proc/cpuinfo | grep processor | wc -l) && make install
+
+ENTRYPOINT ["/usr/local/bin/eth"]

docker/README.md

@@ -0,0 +1,17 @@
+# Dockerfile for cpp-ethereum
+Dockerfile to build a bleeding edge cpp-ethereum docker image from source
+
+    docker build -t cppeth < Dockerfile
+
+Run a simple peer server
+
+    docker run -i cppeth -m off -o peer -x 256
+
+GUI is compiled but not exposed. You can mount /cpp-ethereum/build to access binaries:
+
+    cid = $(docker run -i -v /cpp-ethereum/build cppeth -m off -o peer -x 256)
+    docker inspect $cid # <-- Find volume path in JSON output
+
+You may also modify the Docker image to run the GUI and expose a
+ssh/VNC server in order to tunnel an X11 or VNC session.
+