diff --git a/Dockerfile b/Dockerfile index 96e845b..1d1d5c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,9 @@ -ARG SIGNAL_CLI_VERSION=0.13.24 -ARG LIBSIGNAL_CLIENT_VERSION=0.87.0 -ARG SIGNAL_CLI_NATIVE_PACKAGE_VERSION=0.13.24+morph027+2 +ARG SIGNAL_CLI_VERSION=0.14.0 +ARG LIBSIGNAL_CLIENT_VERSION=0.87.4 +ARG SIGNAL_CLI_NATIVE_PACKAGE_VERSION=0.14.0+morph027+1 ARG SWAG_VERSION=1.16.4 -ARG GRAALVM_VERSION=21.0.0 -#ARG GRAALVM_VERSION=25.0.2 +ARG GRAALVM_VERSION=25.0.2 ARG BUILD_VERSION_ARG=unset @@ -159,7 +158,7 @@ RUN cd /tmp/signal-cli-rest-api-src && go build -buildmode=plugin -o signal-cli- # is fixed we use the standard ubuntu image #FROM eclipse-temurin:21-jre-jammy -FROM ubuntu:jammy +FROM ubuntu:noble ENV GIN_MODE=release @@ -173,7 +172,7 @@ ENV SIGNAL_CLI_REST_API_PLUGIN_SHARED_OBJ_DIR=/usr/bin/ RUN dpkg-reconfigure debconf --frontend=noninteractive \ && apt-get update \ - && apt-get install -y --no-install-recommends util-linux supervisor netcat openjdk-21-jre curl locales \ + && apt-get install -y --no-install-recommends util-linux supervisor netcat-openbsd openjdk-25-jre curl locales \ && rm -rf /var/lib/apt/lists/* COPY --from=buildcontainer /tmp/signal-cli-rest-api-src/signal-cli-rest-api /usr/bin/signal-cli-rest-api @@ -184,7 +183,8 @@ COPY --from=buildcontainer /tmp/signal-cli-rest-api-src/signal-cli-rest-api_plug COPY entrypoint.sh /entrypoint.sh -RUN groupadd -g 1000 signal-api \ +RUN userdel ubuntu -r \ + && groupadd -g 1000 signal-api \ && useradd --no-log-init -M -d /home -s /bin/bash -u 1000 -g 1000 signal-api \ && ln -s /opt/signal-cli-${SIGNAL_CLI_VERSION}/bin/signal-cli /usr/bin/signal-cli \ && ln -s /opt/signal-cli-${SIGNAL_CLI_VERSION}/bin/signal-cli-native /usr/bin/signal-cli-native \ @@ -210,6 +210,8 @@ ENV SIGNAL_CLI_UID=1000 ENV SIGNAL_CLI_GID=1000 ENV SIGNAL_CLI_CHOWN_ON_STARTUP=true +RUN chown -R 1000:1000 /var/log/ + ENTRYPOINT ["/entrypoint.sh"] HEALTHCHECK --interval=20s --timeout=10s --retries=3 \ diff --git a/ext/libraries/libsignal-client/signal-cli-native.patch b/ext/libraries/libsignal-client/signal-cli-native.patch index cf506f0..31d3326 100644 --- a/ext/libraries/libsignal-client/signal-cli-native.patch +++ b/ext/libraries/libsignal-client/signal-cli-native.patch @@ -1,23 +1,22 @@ diff --git a/build.gradle.kts b/build.gradle.kts -index f51d9f1c..6357f590 100644 +index d8e36ea4..dba4dae3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -55,6 +55,7 @@ dependencies { - implementation(libs.slf4j.jul) +@@ -91,6 +91,7 @@ dependencies { implementation(libs.logback) + implementation(libs.zxing) implementation(project(":libsignal-cli")) -+ implementation(files("/tmp/libsignal-client.jar")) ++ implementation(files("/tmp/libsignal-client.jar")) } configurations { -@@ -63,6 +64,10 @@ configurations { +@@ -99,6 +100,9 @@ configurations { } } +configurations.all { -+ exclude(group = "org.signal", module = "libsignal-client") ++ exclude(group = "org.signal", module = "libsignal-client") +} -+ tasks.withType().configureEach { isPreserveFileTimestamps = false diff --git a/ext/libraries/libsignal-client/v0.87.4/arm64/libsignal_jni.so b/ext/libraries/libsignal-client/v0.87.4/arm64/libsignal_jni.so new file mode 100644 index 0000000..2139d11 Binary files /dev/null and b/ext/libraries/libsignal-client/v0.87.4/arm64/libsignal_jni.so differ diff --git a/ext/libraries/libsignal-client/v0.87.4/armv7/libsignal_jni.so b/ext/libraries/libsignal-client/v0.87.4/armv7/libsignal_jni.so new file mode 100644 index 0000000..41e847f Binary files /dev/null and b/ext/libraries/libsignal-client/v0.87.4/armv7/libsignal_jni.so differ diff --git a/ext/libraries/libsignal-client/v0.87.4/x86-64/libsignal_jni.so b/ext/libraries/libsignal-client/v0.87.4/x86-64/libsignal_jni.so new file mode 100644 index 0000000..fdcd355 Binary files /dev/null and b/ext/libraries/libsignal-client/v0.87.4/x86-64/libsignal_jni.so differ