updated python and go to new build requirement. added script to create

dockers locally
This commit is contained in:
sveneh 2015-02-05 12:07:12 +01:00
parent 83258456d3
commit 2e2e36cc72
6 changed files with 48 additions and 32 deletions

5
.gitignore vendored
View File

@ -1,6 +1,5 @@
venv/ venv/
*~ *~
*.swp *.sw?
*.swo
.vagrant/ .vagrant/
client-tests.pem *.pem

View File

@ -2,25 +2,23 @@
- name: update C++ client - name: update C++ client
docker_image: docker_image:
path: /home/{{ ansible_ssh_user }}/git/ansible/test-files/docker-cppjit path: /home/{{ ansible_ssh_user }}/git/ansible/test-files/docker-cppjit
name: cppjit name: ethereum/cppjit-testrunner
state: build state: build
# command: docker build -t cpp /home/{{ ansible_ssh_user }}/git/ansible/test-files/docker-cpp
async: 1200 async: 1200
poll: 5 poll: 5
- name: update Go client - name: update Go client
docker_image: docker_image:
path: /home/{{ ansible_ssh_user }}/git/ansible/test-files/docker-go path: /home/{{ ansible_ssh_user }}/git/ansible/test-files/docker-go
name: go name: ethereum/go-testrunner
state: build state: build
# command: docker build -t go /home/{{ ansible_ssh_user }}/git/ansible/test-files/docker-go
async: 1200 async: 1200
poll: 5 poll: 5
- name: update Python client - name: update Python client
docker_image: docker_image:
path: /home/{{ ansible_ssh_user }}/git/ansible/test-files/docker-python path: /home/{{ ansible_ssh_user }}/git/ansible/test-files/docker-python
name: python name: ethereum/python-testrunner
state: build state: build
async: 1200 async: 1200
poll: 5 poll: 5

View File

@ -0,0 +1,7 @@
#!/bin/bash -x
# creates the necessary docker images to run testrunner.sh locally
docker build --tag="ethereum/cppjit-testrunner" docker-cppjit
docker build --tag="ethereum/python-testrunner" docker-python
docker build --tag="ethereum/go-testrunner" docker-go

View File

@ -34,6 +34,9 @@ RUN add-apt-repository ppa:ethereum/ethereum
RUN apt-get update RUN apt-get update
RUN apt-get install -qy libcryptopp-dev libjson-rpc-cpp-dev RUN apt-get install -qy libcryptopp-dev libjson-rpc-cpp-dev
# this is a workaround, to make sure that docker's cache is invalidated whenever the git repo changes
ADD https://api.github.com/repos/ethereum/cpp-ethereum/git/refs/heads/develop unused.txt
# Build Ethereum (HEADLESS) # Build Ethereum (HEADLESS)
RUN git clone --depth=1 --branch develop https://github.com/ethereum/cpp-ethereum RUN git clone --depth=1 --branch develop https://github.com/ethereum/cpp-ethereum
RUN mkdir -p cpp-ethereum/build RUN mkdir -p cpp-ethereum/build
@ -41,4 +44,3 @@ RUN cd cpp-ethereum/build && cmake .. -DCMAKE_BUILD_TYPE=Release -DHEADLESS=1 -D
RUN ldconfig RUN ldconfig
ENTRYPOINT ["/cpp-ethereum/build/test/checkRandomTest"] ENTRYPOINT ["/cpp-ethereum/build/test/checkRandomTest"]

View File

@ -4,43 +4,44 @@ FROM ubuntu:14.04
## Environment setup ## Environment setup
ENV HOME /root ENV HOME /root
ENV GOPATH /root/go ENV GOPATH /root/go
ENV PATH /go/bin:/root/go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games ENV PATH /golang/bin:/root/go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games
ENV PKG_CONFIG_PATH /opt/qt54/lib/pkgconfig
RUN mkdir -p /root/go RUN mkdir -p /root/go
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
## Install base dependencies ## Install base dependencies
RUN apt-get update && apt-get upgrade -y RUN apt-get update && apt-get upgrade -y
RUN apt-get install -y git mercurial build-essential software-properties-common pkg-config libgmp3-dev libreadline6-dev libpcre3-dev libpcre++-dev RUN apt-get install -y git mercurial build-essential software-properties-common pkg-config libgmp3-dev libreadline6-dev libpcre3-dev libpcre++-dev mesa-common-dev libglu1-mesa-dev
## Build and install Go ## Install Qt5.4 dependencies from PPA
RUN hg clone -u release https://code.google.com/p/go RUN add-apt-repository ppa:beineri/opt-qt54-trusty -y
RUN cd go && hg update go1.4
RUN cd go/src && ./make.bash && go version
## Install GUI dependencies
RUN add-apt-repository ppa:ubuntu-sdk-team/ppa -y
RUN apt-get update -y RUN apt-get update -y
RUN apt-get install -y qtbase5-private-dev qtdeclarative5-private-dev libqt5opengl5-dev RUN apt-get install -y qt54quickcontrols qt54webengine
## Fetch and install serpent-go ## Build and install latest Go
RUN go get -v -d github.com/ethereum/serpent-go RUN git clone https://go.googlesource.com/go golang
WORKDIR $GOPATH/src/github.com/ethereum/serpent-go RUN cd golang && git checkout go1.4.1
# RUN git checkout master RUN cd golang/src && ./make.bash && go version
RUN git submodule update --init
## Fetch and install QML
RUN go get -u -v -d github.com/obscuren/qml
WORKDIR $GOPATH/src/github.com/obscuren/qml
RUN git checkout v1
RUN go install -v RUN go install -v
# Fetch and install go-ethereum # this is a workaround, to make sure that docker's cache is invalidated whenever the git repo changes
RUN go get -v -d github.com/ethereum/go-ethereum/... ADD https://api.github.com/repos/ethereum/go-ethereum/git/refs/heads/develop unused.txt
## Fetch and install go-ethereum
RUN go get -u -v -d github.com/ethereum/go-ethereum/...
WORKDIR $GOPATH/src/github.com/ethereum/go-ethereum WORKDIR $GOPATH/src/github.com/ethereum/go-ethereum
RUN git checkout develop RUN git checkout develop
RUN git pull RUN git pull
RUN ETH_DEPS=$(go list -f '{{.Imports}} {{.TestImports}} {{.XTestImports}}' github.com/ethereum/go-ethereum/... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g'); if [ "$ETH_DEPS" ]; then go get $ETH_DEPS; fi RUN ETH_DEPS=$(go list -f '{{.Imports}} {{.TestImports}} {{.XTestImports}}' github.com/ethereum/go-ethereum/... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g'); if [ "$ETH_DEPS" ]; then go get $ETH_DEPS; fi
RUN go install -v ./cmd/ethtest RUN go install -v ./cmd/ethtest
# Run JSON RPC
ENTRYPOINT ["ethtest"] ENTRYPOINT ["ethtest"]
EXPOSE 8080

View File

@ -1,6 +1,15 @@
FROM sveneh/pyethereum-base FROM ubuntu:14.04
RUN git clone --branch master https://github.com/ethereum/pyethereum.git ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update
RUN apt-get upgrade -y
RUN apt-get install -qy curl git python2.7 python-pip python-dev
# this is a workaround, to make sure that docker's cache is invalidated whenever the git repo changes
ADD https://api.github.com/repos/ethereum/pyethereum/git/refs/heads/develop unused.txt
RUN git clone --branch develop https://github.com/ethereum/pyethereum.git
RUN cd pyethereum && curl https://bootstrap.pypa.io/bootstrap-buildout.py | python RUN cd pyethereum && curl https://bootstrap.pypa.io/bootstrap-buildout.py | python