From 87e917486e82e0a35eba4ca2e8550c2d3ce38797 Mon Sep 17 00:00:00 2001 From: Bernhard B Date: Fri, 15 Jan 2021 21:21:47 +0100 Subject: [PATCH] improved Dockerfile * added check to verify that we are linking against the correct libzkgroup.so file. --- Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index fb03974..a4f95cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,12 +17,11 @@ RUN ls -la /tmp/zkgroup-libraries/x86-64 RUN arch="$(uname -m)"; \ case "$arch" in \ - armv7l) cp /tmp/zkgroup-libraries/armv7/libzkgroup.so /tmp/libzkgroup.so ;; \ + aarch64) cp /tmp/zkgroup-libraries/arm64/libzkgroup.so /tmp/libzkgroup.so ;; \ + armv7l) cp /tmp/zkgroup-libraries/armv7/libzkgroup.so /tmp/libzkgroup.so ;; \ x86_64) cp /tmp/zkgroup-libraries/x86-64/libzkgroup.so /tmp/libzkgroup.so ;; \ esac; -RUN ls -la /tmp - RUN apt-get update \ && apt-get install -y --no-install-recommends wget default-jre software-properties-common git locales zip file \ && rm -rf /var/lib/apt/lists/* @@ -51,7 +50,7 @@ RUN cd /tmp/ \ && ./gradlew installDist \ && ./gradlew distTar -#RUN ls /tmp/signal-cli/lib/zkgroup-java-${ZKGROUP_VERSION}.jar || (echo "\n\nzkgroup jar file with version ${ZKGROUP_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/lib/zkgroup-java-* && echo "\n\n" && exit 1) +RUN ls /tmp/signal-cli-${SIGNAL_CLI_VERSION}/build/install/signal-cli/lib/zkgroup-java-${ZKGROUP_VERSION}.jar || (echo "\n\nzkgroup jar file with version ${ZKGROUP_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}/build/install/signal-cli/lib/zkgroup-java-* && echo "\n\n" && exit 1) RUN cd /tmp/ \ && zip -u /tmp/signal-cli-${SIGNAL_CLI_VERSION}/build/install/signal-cli/lib/zkgroup-java-${ZKGROUP_VERSION}.jar libzkgroup.so