summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2018-09-11 11:37:19 +0200
committerlouiz’ <louiz@louiz.org>2018-09-11 11:41:49 +0200
commit57889718f1c33a0ba963f3956ef7d5fb90cefc62 (patch)
tree9dd27805a4d2be7b07d57d7684e32701e53adcc7
parentcd201774295c9e3cd188e8088269e6b206c57eab (diff)
downloadbiboumi-57889718f1c33a0ba963f3956ef7d5fb90cefc62.tar.gz
biboumi-57889718f1c33a0ba963f3956ef7d5fb90cefc62.tar.bz2
biboumi-57889718f1c33a0ba963f3956ef7d5fb90cefc62.tar.xz
biboumi-57889718f1c33a0ba963f3956ef7d5fb90cefc62.zip
Use alpine's botan package in the docker image
-rw-r--r--docker/biboumi/alpine/Dockerfile20
1 files changed, 5 insertions, 15 deletions
diff --git a/docker/biboumi/alpine/Dockerfile b/docker/biboumi/alpine/Dockerfile
index 89c7223..c466eb9 100644
--- a/docker/biboumi/alpine/Dockerfile
+++ b/docker/biboumi/alpine/Dockerfile
@@ -5,16 +5,10 @@
# This is the prefered way to build the release image, used by the
# end users, in production.
-FROM docker.io/alpine:latest as builder
+FROM docker.io/alpine:edge as builder
RUN apk add --no-cache --virtual .build cmake expat-dev g++ git libidn-dev \
- make postgresql-dev python2 sqlite-dev udns-dev util-linux-dev
-
-RUN git clone https://github.com/randombit/botan.git && \
- cd botan && \
- ./configure.py --prefix=/usr && \
- make -j8 && \
- make install
+ make postgresql-dev sqlite-dev udns-dev botan-dev util-linux-dev
RUN git clone git://git.louiz.org/biboumi && \
mkdir ./biboumi/build && \
@@ -25,19 +19,15 @@ RUN git clone git://git.louiz.org/biboumi && \
-DWITH_SQLITE3=1 \
-DWITH_LIBIDN=1 \
-DWITH_POSTGRESQL=1 && \
- make -j8 && \
+ make && \
make install
# ---
-FROM docker.io/alpine:latest
+FROM docker.io/alpine:edge
RUN apk add --no-cache libidn libpq libstdc++ libuuid postgresql-libs \
- sqlite-libs udns expat ca-certificates
-
-COPY --from=builder /usr/bin/botan /usr/bin/botan
-COPY --from=builder /usr/lib/libbotan* /usr/lib/
-COPY --from=builder /usr/lib/pkgconfig/botan-2.pc /usr/lib/pkgconfig/botan-2.pc
+ sqlite-libs udns expat ca-certificates botan
COPY --from=builder /etc/biboumi /etc/biboumi
COPY --from=builder /usr/bin/biboumi /usr/bin/biboumi