summaryrefslogtreecommitdiff
path: root/packaging/docker
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordberg.se>2015-04-22 18:22:22 +0200
committerLinus Nordberg <linus@nordberg.se>2015-04-23 16:25:48 +0200
commit8fce884a61fb2ecb626f6df41e214d3dfdbe91fd (patch)
treefda0582b143b77ec86cdfdc22669de0bed65e099 /packaging/docker
parentec8d3b298ed76f8f8f10d5f26718351bcb084510 (diff)
[docker] Add softhsm2.
Diffstat (limited to 'packaging/docker')
-rw-r--r--packaging/docker/catlfish-dev/Dockerfile19
1 files changed, 14 insertions, 5 deletions
diff --git a/packaging/docker/catlfish-dev/Dockerfile b/packaging/docker/catlfish-dev/Dockerfile
index ff2bc2c..ba90e7b 100644
--- a/packaging/docker/catlfish-dev/Dockerfile
+++ b/packaging/docker/catlfish-dev/Dockerfile
@@ -19,25 +19,27 @@ FROM erlang
RUN apt-get update
RUN echo 'debconf debconf/frontend select noninteractive' | debconf-set-selections
-# For building.
-RUN apt-get -y -q install gcc git make curl
+# For building. g++ and OpenSSL is for SoftHSMv2.
+RUN apt-get -y -q install gcc git make curl g++ libssl-dev
# For merge.
RUN apt-get -y -q install git python-ecdsa python-yaml
-# Build dependencies in /usr/local/src.
-WORKDIR /usr/local/src
+# 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 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 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 make -C lager
+WORKDIR /usr/local/src
RUN curl 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
@@ -45,10 +47,18 @@ RUN curl https://www.ct.nordu.net/dist/erlang-idna-1.0.2.tar.gz | tar xzf - -C h
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 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 -
+WORKDIR /usr/local/src/SoftHSMv2-2.0.0b3
+RUN ./configure --prefix=/usr/local && make all install
+ADD softhsm2.conf /usr/local/etc/
+
# Build plop and catlfish.
+WORKDIR /usr/local/src
RUN git clone https://git.nordu.net/plop.git
RUN make -C plop
+WORKDIR /usr/local/src
RUN git clone https://git.nordu.net/catlfish.git
RUN make -C catlfish PREFIX=/usr/local all release
@@ -69,6 +79,5 @@ RUN ln -s /usr/local/etc/catlfish/catlfish.config /var/run/catlfish/
ADD merge.sh /usr/local/catlfish/
ADD start.sh /var/run/catlfish/
-WORKDIR /var/run/catlfish
USER catlfish
ENTRYPOINT ["/var/run/catlfish/start.sh"]