diff --git a/Dockerfile b/Dockerfile index 399d11d..df8a7c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,9 +16,19 @@ ARG GRAALVM_VERSION ARG BUILD_VERSION_ARG ARG SIGNAL_CLI_NATIVE_PACKAGE_VERSION -COPY ext/libraries/libsignal-client/v${LIBSIGNAL_CLIENT_VERSION} /tmp/libsignal-client-libraries +RUN dpkg-reconfigure debconf --frontend=noninteractive \ + && apt-get update \ + && apt-get -y install --no-install-recommends \ + wget git locales zip unzip \ + file build-essential libz-dev zlib1g-dev binutils \ + && rm -rf /var/lib/apt/lists/* + COPY ext/libraries/libsignal-client/signal-cli-native.patch /tmp/signal-cli-native.patch +#COPY ext/libraries/libsignal-client/v${LIBSIGNAL_CLIENT_VERSION} /tmp/libsignal-client-libraries +RUN wget https://github.com/bbernhard/libsignal-client-builds/releases/download/v${LIBSIGNAL_CLIENT_VERSION}/libsignal-client-build-v${LIBSIGNAL_CLIENT_VERSION}.tar.gz -O /tmp/libsignal-client.tar.gz +RUN cd /tmp && mkdir -p /tmp/libsignal-client-libraries && tar xf libsignal-client.tar.gz && mv x86-64 armv7 arm64 -t libsignal-client-libraries + # use architecture specific libsignal_jni.so RUN arch="$(uname -m)"; \ case "$arch" in \ @@ -28,13 +38,6 @@ RUN arch="$(uname -m)"; \ *) echo "Unknown architecture" && exit 1 ;; \ esac; -RUN dpkg-reconfigure debconf --frontend=noninteractive \ - && apt-get update \ - && apt-get -y install --no-install-recommends \ - wget git locales zip unzip \ - file build-essential libz-dev zlib1g-dev binutils \ - && rm -rf /var/lib/apt/lists/* - RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ dpkg-reconfigure --frontend=noninteractive locales && \ update-locale LANG=en_US.UTF-8