summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2018-09-12 15:31:27 +0200
committerlouiz’ <louiz@louiz.org>2018-09-12 15:31:27 +0200
commiteb082d152dbf682e3c670e2ab6091298b01a1e63 (patch)
treedaafb1a25a6f0e22cce7551031d045f07a288e2d
parent57889718f1c33a0ba963f3956ef7d5fb90cefc62 (diff)
downloadbiboumi-eb082d152dbf682e3c670e2ab6091298b01a1e63.tar.gz
biboumi-eb082d152dbf682e3c670e2ab6091298b01a1e63.tar.bz2
biboumi-eb082d152dbf682e3c670e2ab6091298b01a1e63.tar.xz
biboumi-eb082d152dbf682e3c670e2ab6091298b01a1e63.zip
Revert "Use alpine's botan package in the docker image"
This reverts commit 57889718f1c33a0ba963f3956ef7d5fb90cefc62.
-rw-r--r--docker/biboumi/alpine/Dockerfile20
1 files changed, 15 insertions, 5 deletions
diff --git a/docker/biboumi/alpine/Dockerfile b/docker/biboumi/alpine/Dockerfile
index c466eb9..89c7223 100644
--- a/docker/biboumi/alpine/Dockerfile
+++ b/docker/biboumi/alpine/Dockerfile
@@ -5,10 +5,16 @@
# This is the prefered way to build the release image, used by the
# end users, in production.
-FROM docker.io/alpine:edge as builder
+FROM docker.io/alpine:latest as builder
RUN apk add --no-cache --virtual .build cmake expat-dev g++ git libidn-dev \
- make postgresql-dev sqlite-dev udns-dev botan-dev util-linux-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
RUN git clone git://git.louiz.org/biboumi && \
mkdir ./biboumi/build && \
@@ -19,15 +25,19 @@ RUN git clone git://git.louiz.org/biboumi && \
-DWITH_SQLITE3=1 \
-DWITH_LIBIDN=1 \
-DWITH_POSTGRESQL=1 && \
- make && \
+ make -j8 && \
make install
# ---
-FROM docker.io/alpine:edge
+FROM docker.io/alpine:latest
RUN apk add --no-cache libidn libpq libstdc++ libuuid postgresql-libs \
- sqlite-libs udns expat ca-certificates botan
+ 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
COPY --from=builder /etc/biboumi /etc/biboumi
COPY --from=builder /usr/bin/biboumi /usr/bin/biboumi