From 29ef21087f36b624840fba4fd375d3be490fbde5 Mon Sep 17 00:00:00 2001 From: projectmoon Date: Sat, 31 Oct 2020 21:33:52 +0000 Subject: [PATCH] Remove dynamically linked olm from Dockerfile. --- Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9e2ace7..4560358 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM bougyman/voidlinux:glibc as builder RUN xbps-install -Syu RUN xbps-install -Sy base-devel rust cargo cmake wget gnupg -RUN xbps-install -Sy libressl-devel olm-devel libstdc++-devel +RUN xbps-install -Sy libressl-devel libstdc++-devel # Install tini for signal processing and zombie killing ENV TINI_VERSION v0.18.0 @@ -19,16 +19,14 @@ RUN set -eux; \ tini --version # Build dicebot -# OLM is temporarily built with dynamic linking due to a bug in -# olm-sys: https://gitlab.gnome.org/BrainBlasted/olm-sys/-/issues/6 RUN mkdir -p /root/src WORKDIR /root/src ADD . ./ -RUN OLM_LINK_VARIANT=dylib cargo build --release +RUN cargo build --release # Final image FROM bougyman/voidlinux:latest -RUN xbps-install -Sy ca-certificates libstdc++ olm +RUN xbps-install -Sy ca-certificates libstdc++ COPY --from=builder \ /root/src/target/release/dicebot \ /usr/local/bin/