From bc2283cca40d143ecc231286fe3a722409937a6e Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Tue, 18 Feb 2020 11:10:12 +0100 Subject: Add basic Dockerfile --- packaging/docker-p11p-dev/Dockerfile | 44 ++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 packaging/docker-p11p-dev/Dockerfile diff --git a/packaging/docker-p11p-dev/Dockerfile b/packaging/docker-p11p-dev/Dockerfile new file mode 100644 index 0000000..d4dc0a4 --- /dev/null +++ b/packaging/docker-p11p-dev/Dockerfile @@ -0,0 +1,44 @@ +FROM debian:buster-slim + +MAINTAINER + +RUN apt-get update +RUN echo 'debconf debconf/frontend select noninteractive' | debconf-set-selections +RUN apt-get -yq upgrade + +# debian extra +RUN apt-get -yq install apt-utils + +# buld deps +RUN apt-get -yq install git + +# softhsm2, for testing +RUN apt-get -yq install softhsm2 + +# FIXME: remove unused +RUN apt-get -yq install erlang-asn1 erlang-base erlang-common-test erlang-crypto erlang-debugger erlang-dev erlang-dialyzer erlang-eunit erlang-inets erlang-os-mon erlang-public-key erlang-reltool erlang-runtime-tools erlang-ssl erlang-tools + +# rebar3, for building p11p-daemon +WORKDIR /usr/local/src +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}" + +# 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 + +# p11p, for p11p-daemon +WORKDIR /usr/local/src +RUN git clone https://git.sunet.se/p11p.git +WORKDIR /usr/local/src/p11p/p11p-daemon +RUN make rel + +WORKDIR /usr/local/src/p11p/p11p-daemon +CMD ["make", "shell"] -- cgit v1.1 From 19e896dbe2dc733d5dea38681ef4b67752dac4b6 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Tue, 18 Feb 2020 11:25:17 +0100 Subject: Add missing rebar3 dependencies --- packaging/docker-p11p-dev/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packaging/docker-p11p-dev/Dockerfile b/packaging/docker-p11p-dev/Dockerfile index d4dc0a4..dfc546f 100644 --- a/packaging/docker-p11p-dev/Dockerfile +++ b/packaging/docker-p11p-dev/Dockerfile @@ -15,9 +15,13 @@ RUN apt-get -yq install git # softhsm2, for testing RUN apt-get -yq install softhsm2 +# p11p and rebar3 dependencies # FIXME: remove unused RUN apt-get -yq install erlang-asn1 erlang-base erlang-common-test erlang-crypto erlang-debugger erlang-dev erlang-dialyzer erlang-eunit erlang-inets erlang-os-mon erlang-public-key erlang-reltool erlang-runtime-tools erlang-ssl erlang-tools +# rebar3 dependencies +RUN apt-get -yq install erlang-parsetools + # rebar3, for building p11p-daemon WORKDIR /usr/local/src RUN git clone https://git.sunet.se/rebar3.git -- cgit v1.1 From 5715fc058d3a1588636cf95f7a3c5a7ee71bb4b8 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Tue, 18 Feb 2020 16:27:26 +0100 Subject: Use p11-kit from packages Also, fix the PATH -- $HOME is not set. --- packaging/docker-p11p-dev/Dockerfile | 10 +++------- 1 file 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 -- cgit v1.1