From 04dacb26c474b2b23575511dcc21690316cabc3e Mon Sep 17 00:00:00 2001 From: Benjamin Schmid Date: Sat, 8 Oct 2022 10:07:30 +0200 Subject: [PATCH 1/3] chore(Dockerfile): comment out ignored setting --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 792f595..3be228f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ARG SIGNAL_CLI_VERSION=0.10.9 ARG LIBSIGNAL_CLIENT_VERSION=0.17.0 -ARG SIGNAL_CLI_NATIVE_PACKAGE_VERSION=0.10.9-1 +#ARG SIGNAL_CLI_NATIVE_PACKAGE_VERSION=0.10.9-1 ARG SWAG_VERSION=1.6.7 ARG GRAALVM_JAVA_VERSION=17 @@ -16,7 +16,7 @@ ARG SWAG_VERSION ARG GRAALVM_JAVA_VERSION ARG GRAALVM_VERSION ARG BUILD_VERSION_ARG -ARG SIGNAL_CLI_NATIVE_PACKAGE_VERSION +#ARG SIGNAL_CLI_NATIVE_PACKAGE_VERSION COPY ext/libraries/libsignal-client/v${LIBSIGNAL_CLIENT_VERSION} /tmp/libsignal-client-libraries From df9477cf4fd24db48a6a45fa655ce41ea32bfd61 Mon Sep 17 00:00:00 2001 From: Benjamin Schmid Date: Sat, 8 Oct 2022 10:07:44 +0200 Subject: [PATCH 2/3] build(Dockerfile): upgrade signal-cli version to 0.11.3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3be228f..fcdd2fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SIGNAL_CLI_VERSION=0.10.9 +ARG SIGNAL_CLI_VERSION=0.11.3 ARG LIBSIGNAL_CLIENT_VERSION=0.17.0 #ARG SIGNAL_CLI_NATIVE_PACKAGE_VERSION=0.10.9-1 From 141ba043af6b5b0136255a0f787b1389376d99b3 Mon Sep 17 00:00:00 2001 From: Benjamin Schmid Date: Sat, 8 Oct 2022 11:59:58 +0200 Subject: [PATCH 3/3] doc(libsignal/README): add notes on potential pitfalls --- ext/libraries/libsignal-client/README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ext/libraries/libsignal-client/README.md b/ext/libraries/libsignal-client/README.md index 31be7c3..1a67ece 100644 --- a/ext/libraries/libsignal-client/README.md +++ b/ext/libraries/libsignal-client/README.md @@ -16,3 +16,8 @@ to build the library for `x86-64`, `armv7` and `arm64` ## Why? Building libsignal-client every time a new docker image gets released takes really long (especially for cross platform builds with docker/buildx and QEMU). Furthermore, due to this bug here (https://github.com/docker/buildx/issues/395) we would need to use an ugly workaround for that right now. As libsignal-client isn't released very often I guess it's okay to manually build a new version once in a while. + +## Pitfalls + +1. `cross` requires a Rust installation via [`rustup`](https://www.rust-lang.org/tools/install), otherwise you might receive a _toolchain is not fully qualified_-Error. +2. Your user must have permission to directly talk to the Docker daemon using the `docker` command. To avoid running as root, [you can add your user to the docker group and reboot](https://docs.docker.com/engine/install/linux-postinstall/).