diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | catlfish-dev/Dockerfile | 26 |
2 files changed, 14 insertions, 14 deletions
@@ -2,7 +2,7 @@ catlfish-dev catlfish-dev-lunahsm: docker build --no-cache --rm -t $@:latest $@ erlang: - docker build --noc-cache --rm -t $@:latest $@ + docker build --no-cache --rm -t $@:latest $@ base: docker build --no-cache --rm -t $@:latest base-debian:jessie diff --git a/catlfish-dev/Dockerfile b/catlfish-dev/Dockerfile index fbbf695..c395a36 100644 --- a/catlfish-dev/Dockerfile +++ b/catlfish-dev/Dockerfile @@ -25,36 +25,36 @@ FROM erlang RUN apt-get update RUN echo 'debconf debconf/frontend select noninteractive' | debconf-set-selections -# For building. g++ and OpenSSL is for SoftHSMv2. -RUN apt-get -y -q install gcc git make curl g++ libssl-dev +# For building. g++ and OpenSSL are for SoftHSMv2. +RUN apt-get -y -q install gcc git make curl g++ libssl-dev nettle-dev libbsd-dev librhash-dev libpython2.7-dev -# For merge. -RUN apt-get -y -q install git python-ecdsa python-yaml nettle-dev libbsd-dev librhash-dev +# For merge and tests. +RUN apt-get -y -q install git python-ecdsa python-yaml python-pyasn1 unzip nettle-dev libbsd-dev librhash-dev # Build all dependencies. WORKDIR /usr/local/src -RUN curl https://www.ct.nordu.net/dist/mochiweb-v2.12.2.tar.gz | tar xzf - -RUN ln -s mochiweb-2.12.2 mochiweb +RUN curl -s https://www.ct.nordu.net/dist/mochiweb-2.15.1.tar.gz | tar xzf - +RUN ln -s mochiweb-2.15.1 mochiweb RUN make -C mochiweb WORKDIR /usr/local/src -RUN curl https://www.ct.nordu.net/dist/lager-2.1.1.tar.gz | tar xzf - -RUN ln -s lager-2.1.1 lager +RUN curl -s https://www.ct.nordu.net/dist/lager-3.2.2.tar.gz | tar xzf - +RUN ln -s lager-3.2.2 lager RUN mkdir lager/deps -RUN curl https://www.ct.nordu.net/dist/goldrush-0.1.6.tar.gz | tar xzf - -C lager/deps && ln -s goldrush-0.1.6 lager/deps/goldrush +RUN curl -s https://www.ct.nordu.net/dist/goldrush-0.1.8.tar.gz | tar xzf - -C lager/deps && ln -s goldrush-0.1.8 lager/deps/goldrush RUN make -C lager WORKDIR /usr/local/src -RUN curl https://www.ct.nordu.net/dist/hackney-1.1.0.tar.gz | tar xzf - +RUN curl -s https://www.ct.nordu.net/dist/hackney-1.1.0.tar.gz | tar xzf - RUN ln -s hackney-1.1.0 hackney RUN mkdir hackney/deps -RUN curl https://www.ct.nordu.net/dist/erlang-idna-1.0.2.tar.gz | tar xzf - -C hackney/deps && ln -s erlang-idna-1.0.2 hackney/deps/idna -RUN curl https://www.ct.nordu.net/dist/ssl_verify_hostname-1.0.4.tar.gz | tar xzf - -C hackney/deps && ln -s ssl_verify_hostname-1.0.4 hackney/deps/ssl_verify_hostname +RUN curl -s https://www.ct.nordu.net/dist/erlang-idna-1.0.2.tar.gz | tar xzf - -C hackney/deps && ln -s erlang-idna-1.0.2 hackney/deps/idna +RUN curl -s https://www.ct.nordu.net/dist/ssl_verify_hostname-1.0.4.tar.gz | tar xzf - -C hackney/deps && ln -s ssl_verify_hostname-1.0.4 hackney/deps/ssl_verify_hostname RUN make -C hackney REBAR=../lager/rebar WORKDIR /usr/local/src -RUN curl https://www.ct.nordu.net/dist/SoftHSMv2-2.0.0b3-ndn1.tar.gz | tar xzf - +RUN curl -s https://www.ct.nordu.net/dist/SoftHSMv2-2.0.0b3-ndn1.tar.gz | tar xzf - WORKDIR /usr/local/src/SoftHSMv2-2.0.0b3 RUN ./configure --prefix=/usr/local && make all install ADD softhsm2.conf /usr/local/etc/ |