diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..83cd31d --- /dev/null +++ b/.dockerignore @@ -0,0 +1,40 @@ +# Compiled Object files +*.slo +*.lo +*.o +*.obj + +# Precompiled Headers +*.gch +*.pch + +# Compiled Dynamic libraries +*.so +*.dylib +*.dll + +# Compiled Static libraries +*.lai +*.la +*.a +*.lib + +# Executables +*.exe +*.out +*.app + +# Gcov files +*.gcno +*.gcov +*.gcda + +# Python files +*.pyc +*.pyo + +# Build directories +build/ + +# Clion directory +.idea/ \ No newline at end of file diff --git a/docker/biboumi/alpine/Dockerfile b/docker/biboumi/alpine/Dockerfile index d887327..28f843a 100644 --- a/docker/biboumi/alpine/Dockerfile +++ b/docker/biboumi/alpine/Dockerfile @@ -10,19 +10,22 @@ FROM docker.io/alpine:latest as builder RUN apk add --no-cache --virtual .build cmake expat-dev g++ git libidn-dev \ make postgresql-dev python3 sqlite-dev udns-dev util-linux-dev botan3-dev +COPY . /source -RUN git clone https://codeberg.org/poezio/biboumi && \ - mkdir ./biboumi/build && \ - cd ./biboumi/build && \ +WORKDIR /source + +RUN mkdir build && cd build && \ cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DWITH_BOTAN=1 \ -DWITHOUT_SYSTEMD=1 \ -DWITH_SQLITE3=1 \ -DWITH_LIBIDN=1 \ - -DWITH_POSTGRESQL=1 && \ - make -j8 && \ - make install + -DWITH_POSTGRESQL=1 \ + -DWITH_UDNS=1 \ + -DWITH_LIBIDN=1 && \ + cmake --build . && \ + cmake --install . # --- @@ -34,7 +37,7 @@ RUN apk add --no-cache libidn libpq libstdc++ libuuid postgresql-libs \ COPY --from=builder /etc/biboumi /etc/biboumi COPY --from=builder /usr/bin/biboumi /usr/bin/biboumi -COPY --from=builder /biboumi/docker/biboumi/alpine/biboumi.cfg /etc/biboumi/biboumi.cfg +COPY --from=builder /source/docker/biboumi/alpine/biboumi.cfg /etc/biboumi/biboumi.cfg RUN adduser biboumi -D -h /home/biboumi && \ mkdir /var/lib/biboumi && \