summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--catlfish-dev/Dockerfile31
-rw-r--r--catlfish-dev/sha256sums.txt7
2 files changed, 24 insertions, 14 deletions
diff --git a/catlfish-dev/Dockerfile b/catlfish-dev/Dockerfile
index adec77a..c45db52 100644
--- a/catlfish-dev/Dockerfile
+++ b/catlfish-dev/Dockerfile
@@ -32,29 +32,28 @@ RUN apt-get -y -q install gcc git make curl g++ libssl-dev nettle-dev libbsd-dev
RUN apt-get -y -q install git python-ecdsa python-yaml
# Build all dependencies.
+WORKDIR /tmp
+ADD sha256sums.txt .
+RUN cat sha256sums.txt | while read c f; do curl -s -O https://www.ct.nordu.net/dist/$f; done
+RUN sha256sum -c sha256sums.txt
WORKDIR /usr/local/src
-RUN curl -s https://www.ct.nordu.net/dist/mochiweb-v2.12.2.tar.gz | tar xzf -
-RUN ln -s mochiweb-2.12.2 mochiweb
+RUN tar xf /tmp/mochiweb-v2.12.2.tar.gz && ln -s mochiweb-2.12.2 mochiweb
RUN make -C mochiweb
WORKDIR /usr/local/src
-RUN curl -s 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 -s 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 tar xf /tmp/lager-2.1.1.tar.gz && ln -s lager-2.1.1 lager; mkdir lager/deps
+RUN tar xf /tmp/goldrush-0.1.6.tar.gz -C lager/deps && ln -s goldrush-0.1.6 lager/deps/goldrush
RUN make -C lager
WORKDIR /usr/local/src
-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 -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 tar xf /tmp/hackney-1.1.0.tar.gz && ln -s hackney-1.1.0 hackney; mkdir hackney/deps
+RUN tar xf /tmp/erlang-idna-1.0.2.tar.gz -C hackney/deps && ln -s erlang-idna-1.0.2 hackney/deps/idna
+RUN tar xf /tmp/ssl_verify_hostname-1.0.4.tar.gz -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 -s https://www.ct.nordu.net/dist/SoftHSMv2-2.0.0b3-ndn1.tar.gz | tar xzf -
+RUN tar xf /tmp/SoftHSMv2-2.0.0b3-ndn1.tar.gz
WORKDIR /usr/local/src/SoftHSMv2-2.0.0b3
RUN ./configure --prefix=/usr/local && make all install
ADD softhsm2.conf /usr/local/etc/
@@ -62,11 +61,15 @@ 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 plop
+#RUN test -n "$(git tag --contains)" && git tag --verify $(git tag --contains)
+RUN make
WORKDIR /usr/local/src
RUN git clone https://git.nordu.net/catlfish.git
-RUN make -C catlfish PREFIX=/usr/local all release
+WORKDIR catlfish
+#RUN test -n "$(git tag --contains)" && git tag --verify $(git tag --contains)
+RUN make PREFIX=/usr/local all release
# Config dir is mounted from host using `-v' to 'docker run'.
VOLUME /usr/local/etc/catlfish
diff --git a/catlfish-dev/sha256sums.txt b/catlfish-dev/sha256sums.txt
new file mode 100644
index 0000000..5b3c78b
--- /dev/null
+++ b/catlfish-dev/sha256sums.txt
@@ -0,0 +1,7 @@
+d87d7283245bdc1595ece8e79d7f13076fcbc02be6717319c67a79f0556adee9 erlang-idna-1.0.2.tar.gz
+554f36983e19fcf2ebee18b5c0ff502af4fc1b853b49041c7a9821d7043e349f goldrush-0.1.6.tar.gz
+061722a4cc9bec67ade511c4ba48b7c19077be51e531f36773d0b127c6bee808 hackney-1.1.0.tar.gz
+ec6a039e11ecab6550eb699a05b0d3570b111864d45cd91c2b21fd75388a94d6 lager-2.1.1.tar.gz
+73369f5a2e0d5477632a3d1fa44c674f2dfc98908f86bfd6bd77b266bdb88684 mochiweb-v2.12.2.tar.gz
+bd2e09b853b48ea7582db3fb9ae79e1e7b1db8d01ddeee28d7bacc7b6fda2909 SoftHSMv2-2.0.0b3-ndn1.tar.gz
+d3206695fd951529ec105e83370779ff94d57fee24a91a969a2e4a1651747ef7 ssl_verify_hostname-1.0.4.tar.gz