diff --git a/Dockerfile b/Dockerfile index 93db634..d672c0f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -ARG SIGNAL_CLI_VERSION=0.9.0 -ARG ZKGROUP_VERSION=0.7.0 -ARG LIBSIGNAL_CLIENT_VERSION=0.9.0 +ARG SIGNAL_CLI_VERSION=0.9.2 +ARG ZKGROUP_VERSION=0.8.2 +ARG LIBSIGNAL_CLIENT_VERSION=0.9.7 ARG SWAG_VERSION=1.6.7 ARG GRAALVM_JAVA_VERSION=11 -ARG GRAALVM_VERSION=21.2.0 +ARG GRAALVM_VERSION=21.3.0 FROM golang:1.17-bullseye AS buildcontainer @@ -78,10 +78,11 @@ RUN arch="$(uname -m)"; \ RUN if [ "$(uname -m)" = "aarch64" ] || [ "$(uname -m)" = "x86_64" ]; then \ cd /tmp && tar xvf gvm.tar.gz \ && export GRAALVM_HOME=/tmp/graalvm-ce-java${GRAALVM_JAVA_VERSION}-${GRAALVM_VERSION} \ + && export PATH=/tmp/graalvm-ce-java${GRAALVM_JAVA_VERSION}-${GRAALVM_VERSION}/bin:$PATH \ && cd /tmp/signal-cli-${SIGNAL_CLI_VERSION} \ && chmod +x /tmp/graalvm-ce-java${GRAALVM_JAVA_VERSION}-${GRAALVM_VERSION}/bin/gu \ && /tmp/graalvm-ce-java${GRAALVM_JAVA_VERSION}-${GRAALVM_VERSION}/bin/gu install native-image \ - && ./gradlew assembleNativeImage; \ + && ./gradlew nativeCompile; \ elif [ "$(uname -m)" = "armv7l" ]; then \ echo "GRAALVM doesn't support 32bit" \ && echo "Creating temporary file, otherwise the below copy doesn't work for armv7" \ @@ -154,7 +155,7 @@ RUN apt-get update \ COPY --from=buildcontainer /tmp/signal-cli-rest-api-src/signal-cli-rest-api /usr/bin/signal-cli-rest-api COPY --from=buildcontainer /tmp/signal-cli-${SIGNAL_CLI_VERSION}/build/distributions/signal-cli-${SIGNAL_CLI_VERSION}.tar /tmp/signal-cli-${SIGNAL_CLI_VERSION}.tar -COPY --from=buildcontainer /tmp/signal-cli-${SIGNAL_CLI_VERSION}/build/native-image/signal-cli /tmp/signal-cli-native +COPY --from=buildcontainer /tmp/signal-cli-${SIGNAL_CLI_VERSION}/build/native/nativeCompile/signal-cli /tmp/signal-cli-native COPY --from=buildcontainer /tmp/signal-cli-rest-api-src/scripts/jsonrpc2-helper /usr/bin/jsonrpc2-helper COPY entrypoint.sh /entrypoint.sh diff --git a/ext/libraries/libsignal-client/v0.9.7/arm64/libsignal_jni.so b/ext/libraries/libsignal-client/v0.9.7/arm64/libsignal_jni.so new file mode 100644 index 0000000..e431de5 Binary files /dev/null and b/ext/libraries/libsignal-client/v0.9.7/arm64/libsignal_jni.so differ diff --git a/ext/libraries/libsignal-client/v0.9.7/armv7/libsignal_jni.so b/ext/libraries/libsignal-client/v0.9.7/armv7/libsignal_jni.so new file mode 100644 index 0000000..e7cfa83 Binary files /dev/null and b/ext/libraries/libsignal-client/v0.9.7/armv7/libsignal_jni.so differ diff --git a/ext/libraries/libsignal-client/v0.9.7/x86-64/libsignal_jni.so b/ext/libraries/libsignal-client/v0.9.7/x86-64/libsignal_jni.so new file mode 100644 index 0000000..5f2d5bb Binary files /dev/null and b/ext/libraries/libsignal-client/v0.9.7/x86-64/libsignal_jni.so differ diff --git a/ext/libraries/zkgroup/v0.8.0/arm64/libzkgroup.so b/ext/libraries/zkgroup/v0.8.0/arm64/libzkgroup.so new file mode 100644 index 0000000..1ed4f09 Binary files /dev/null and b/ext/libraries/zkgroup/v0.8.0/arm64/libzkgroup.so differ diff --git a/ext/libraries/zkgroup/v0.8.0/armv7/libzkgroup.so b/ext/libraries/zkgroup/v0.8.0/armv7/libzkgroup.so new file mode 100644 index 0000000..38273eb Binary files /dev/null and b/ext/libraries/zkgroup/v0.8.0/armv7/libzkgroup.so differ diff --git a/ext/libraries/zkgroup/v0.8.0/x86-64/libzkgroup.so b/ext/libraries/zkgroup/v0.8.0/x86-64/libzkgroup.so new file mode 100644 index 0000000..22c3d91 Binary files /dev/null and b/ext/libraries/zkgroup/v0.8.0/x86-64/libzkgroup.so differ diff --git a/ext/libraries/zkgroup/v0.8.2/arm64/libzkgroup.so b/ext/libraries/zkgroup/v0.8.2/arm64/libzkgroup.so new file mode 100644 index 0000000..b390724 Binary files /dev/null and b/ext/libraries/zkgroup/v0.8.2/arm64/libzkgroup.so differ diff --git a/ext/libraries/zkgroup/v0.8.2/armv7/libzkgroup.so b/ext/libraries/zkgroup/v0.8.2/armv7/libzkgroup.so new file mode 100644 index 0000000..7a44d89 Binary files /dev/null and b/ext/libraries/zkgroup/v0.8.2/armv7/libzkgroup.so differ diff --git a/ext/libraries/zkgroup/v0.8.2/x86-64/libzkgroup.so b/ext/libraries/zkgroup/v0.8.2/x86-64/libzkgroup.so new file mode 100644 index 0000000..9c85dbf Binary files /dev/null and b/ext/libraries/zkgroup/v0.8.2/x86-64/libzkgroup.so differ