summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nordberg <linus@sunet.se>2020-02-18 16:27:26 +0100
committerLinus Nordberg <linus@sunet.se>2020-02-18 16:27:26 +0100
commit5715fc058d3a1588636cf95f7a3c5a7ee71bb4b8 (patch)
tree96e4fade7dfd9f69e5d51441f32b2ea1c6789bda
parent19e896dbe2dc733d5dea38681ef4b67752dac4b6 (diff)
Use p11-kit from packages
Also, fix the PATH -- $HOME is not set.
-rw-r--r--packaging/docker-p11p-dev/Dockerfile10
1 files changed, 3 insertions, 7 deletions
diff --git a/packaging/docker-p11p-dev/Dockerfile b/packaging/docker-p11p-dev/Dockerfile
index dfc546f..08b904d 100644
--- a/packaging/docker-p11p-dev/Dockerfile
+++ b/packaging/docker-p11p-dev/Dockerfile
@@ -28,17 +28,13 @@ RUN git clone https://git.sunet.se/rebar3.git
WORKDIR /usr/local/src/rebar3
RUN ./bootstrap
RUN ./rebar3 local install
-ENV PATH="${HOME}/.cache/rebar3/bin:${PATH}"
+ENV PATH="/root/.cache/rebar3/bin:${PATH}"
# p11-kit, for p11-kit-remote
-RUN apt-get -yq install make
-WORKDIR /usr/local/src
-RUN git clone --branch p11p https://git.sunet.se/p11-kit.git
-WORKDIR /usr/local/src/p11-kit
-RUN ./configure --without-libtasn1
-RUN make all check install
+RUN apt-get -yq install p11-kit
# p11p, for p11p-daemon
+RUN apt-get -yq install make
WORKDIR /usr/local/src
RUN git clone https://git.sunet.se/p11p.git
WORKDIR /usr/local/src/p11p/p11p-daemon