Skip to content

Commit 4a11a45

Browse files
author
Bernhard B
committed
Update Android version to get rid of deprecation warning
* this is just a temporary workaround until the upstream fixes that issue.
1 parent a118929 commit 4a11a45

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

Dockerfile

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ RUN if [ "$(uname -m)" = "x86_64" ]; then \
7575
&& export GRAALVM_HOME=/tmp/graalvm-ce-java${GRAALVM_JAVA_VERSION}-${GRAALVM_VERSION} \
7676
&& export PATH=/tmp/graalvm-ce-java${GRAALVM_JAVA_VERSION}-${GRAALVM_VERSION}/bin:$PATH \
7777
&& cd /tmp/signal-cli-${SIGNAL_CLI_VERSION}-source \
78+
&& sed -i 's/Signal-Android\/5.22.3/Signal-Android\/5.51.7/g' src/main/java/org/asamk/signal/BaseConfig.java \
7879
&& chmod +x /tmp/graalvm-ce-java${GRAALVM_JAVA_VERSION}-${GRAALVM_VERSION}/bin/gu \
7980
&& /tmp/graalvm-ce-java${GRAALVM_JAVA_VERSION}-${GRAALVM_VERSION}/bin/gu install native-image \
8081
&& ./gradlew -q nativeCompile; \
@@ -84,8 +85,10 @@ RUN if [ "$(uname -m)" = "x86_64" ]; then \
8485
&& echo "deb https://packaging.gitlab.io/signal-cli focal main" > /etc/apt/sources.list.d/morph027-signal-cli.list \
8586
&& mkdir -p /tmp/signal-cli-native \
8687
&& cd /tmp/signal-cli-native \
87-
&& apt-get -qq update \
88-
&& apt-get -qq download signal-cli-native=${SIGNAL_CLI_NATIVE_PACKAGE_VERSION} < /dev/null > /dev/null \
88+
&& wget https://gitlab.com/packaging/signal-cli/-/jobs/2730692987/artifacts/download?file_type=archive -O /tmp/signal-cli-native/archive.zip \
89+
&& unzip archive.zip \
90+
#&& apt-get -qq update \
91+
#&& apt-get -qq download signal-cli-native=${SIGNAL_CLI_NATIVE_PACKAGE_VERSION} < /dev/null > /dev/null \
8992
&& ar x *.deb \
9093
&& tar xf data.tar.gz \
9194
&& mkdir -p /tmp/signal-cli-${SIGNAL_CLI_VERSION}-source/build/native/nativeCompile \
@@ -103,6 +106,14 @@ RUN if [ "$(uname -m)" = "x86_64" ]; then \
103106

104107
RUN ls /tmp/signal-cli-${SIGNAL_CLI_VERSION}/lib/libsignal-client-${LIBSIGNAL_CLIENT_VERSION}.jar || (echo "\n\nsignal-client jar file with version ${LIBSIGNAL_CLIENT_VERSION} not found. Maybe the version needs to be bumped in the signal-cli-rest-api Dockerfile?\n\n" && echo "Available version: \n" && ls /tmp/signal-cli-${SIGNAL_CLI_VERSION}/lib/libsignal-client-* && echo "\n\n" && exit 1)
105108

109+
# workaround until upstream is fixed
110+
RUN cd /tmp/signal-cli-${SIGNAL_CLI_VERSION}/lib \
111+
&& unzip signal-cli-${SIGNAL_CLI_VERSION}.jar \
112+
&& sed -i 's/Signal-Android\/5.22.3/Signal-Android\/5.51.7/g' org/asamk/signal/BaseConfig.class \
113+
&& zip -r signal-cli-${SIGNAL_CLI_VERSION}.jar org/ META-INF/ \
114+
&& rm -rf META-INF \
115+
&& rm -rf org
116+
106117
RUN cd /tmp/ \
107118
&& zip -qu /tmp/signal-cli-${SIGNAL_CLI_VERSION}/lib/libsignal-client-${LIBSIGNAL_CLIENT_VERSION}.jar libsignal_jni.so \
108119
&& zip -qr signal-cli-${SIGNAL_CLI_VERSION}.zip signal-cli-${SIGNAL_CLI_VERSION}/* \

0 commit comments

Comments
 (0)