aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/Dockerfile
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/Dockerfile')
-rw-r--r--scripts/Dockerfile22
1 files changed, 13 insertions, 9 deletions
diff --git a/scripts/Dockerfile b/scripts/Dockerfile
index e34436ed..8be19783 100644
--- a/scripts/Dockerfile
+++ b/scripts/Dockerfile
@@ -1,12 +1,16 @@
FROM alpine
MAINTAINER chriseth <chris@ethereum.org>
+#Official solidity docker image
-RUN \
- apk --no-cache --update add build-base cmake boost-dev git && \
- sed -i -E -e 's/include <sys\/poll.h>/include <poll.h>/' /usr/include/boost/asio/detail/socket_types.hpp && \
- git clone --depth 1 --recursive -b develop https://github.com/ethereum/solidity && \
- cd /solidity && cmake -DCMAKE_BUILD_TYPE=Release -DTESTS=0 -DSTATIC_LINKING=1 && \
- cd /solidity && make solc && install -s solc/solc /usr/bin && \
- cd / && rm -rf solidity && \
- apk del sed build-base git make cmake gcc g++ musl-dev curl-dev boost-dev && \
- rm -rf /var/cache/apk/*
+#Establish working directory as solidity
+WORKDIR /solidity
+#Copy working directory on travis to the image
+COPY / $WORKDIR
+
+#Install dependencies, eliminate annoying warnings, and build release, delete all remaining points and statically link.
+RUN ./scripts/install_deps.sh && sed -i -E -e 's/include <sys\/poll.h>/include <poll.h>/' /usr/include/boost/asio/detail/socket_types.hpp &&\
+cmake -DCMAKE_BUILD_TYPE=Release -DTESTS=0 -DSTATIC_LINKING=1 &&\
+make solc && install -s solc/solc /usr/bin &&\
+cd / && rm -rf solidity &&\
+apk del sed build-base git make cmake gcc g++ musl-dev curl-dev boost-dev &&\
+rm -rf /var/cache/apk/* \ No newline at end of file