Revert "Use alpine's botan package in the docker image"
This reverts commit 57889718f1.
This commit is contained in:
@@ -5,10 +5,16 @@
|
|||||||
# This is the prefered way to build the release image, used by the
|
# This is the prefered way to build the release image, used by the
|
||||||
# end users, in production.
|
# 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 \
|
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 && \
|
RUN git clone git://git.louiz.org/biboumi && \
|
||||||
mkdir ./biboumi/build && \
|
mkdir ./biboumi/build && \
|
||||||
@@ -19,15 +25,19 @@ RUN git clone git://git.louiz.org/biboumi && \
|
|||||||
-DWITH_SQLITE3=1 \
|
-DWITH_SQLITE3=1 \
|
||||||
-DWITH_LIBIDN=1 \
|
-DWITH_LIBIDN=1 \
|
||||||
-DWITH_POSTGRESQL=1 && \
|
-DWITH_POSTGRESQL=1 && \
|
||||||
make && \
|
make -j8 && \
|
||||||
make install
|
make install
|
||||||
|
|
||||||
# ---
|
# ---
|
||||||
|
|
||||||
FROM docker.io/alpine:edge
|
FROM docker.io/alpine:latest
|
||||||
|
|
||||||
RUN apk add --no-cache libidn libpq libstdc++ libuuid postgresql-libs \
|
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 /etc/biboumi /etc/biboumi
|
||||||
COPY --from=builder /usr/bin/biboumi /usr/bin/biboumi
|
COPY --from=builder /usr/bin/biboumi /usr/bin/biboumi
|
||||||
|
|||||||
Reference in New Issue
Block a user