aljaz/signal-cli-rest-api
1
0
Fork 0
mirror of https://github.com/aljazceru/signal-cli-rest-api.git synced 2025-12-19 23:54:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed zkgroup build for ARM

Browse Source
This commit is contained in:
Bernhard B
2021-01-03 19:38:21 +01:00
parent 8bef9fca9d
commit c554319d74
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Dockerfile
View File

@@ -1,11 +1,23 @@
FROM golang:1.13-buster AS buildcontainer
ARG SIGNAL_CLI_VERSION=0.7.1 ARG SIGNAL_CLI_VERSION=0.7.1
ARG ZKGROUP_VERSION=0.7.0 ARG ZKGROUP_VERSION=0.7.0
ARG SWAG_VERSION=1.6.7 ARG SWAG_VERSION=1.6.7
# fetch the vendor with the builder platform to avoid qemu issues
FROM --platform=$BUILDPLATFORM rust:1-buster AS rust-sources-downloader
ARG ZKGROUP_VERSION
RUN cd /tmp/ && git clone https://github.com/signalapp/zkgroup.git zkgroup-${ZKGROUP_VERSION}
RUN cd /tmp/zkgroup-${ZKGROUP_VERSION} && cargo fetch
FROM golang:1.13-buster AS buildcontainer
ARG SIGNAL_CLI_VERSION
ARG ZKGROUP_VERSION
ARG SWAG_VERSION
ENV GIN_MODE=release ENV GIN_MODE=release
RUN apt-get update \ RUN apt-get update \
@@ -40,18 +52,15 @@ RUN cd /tmp/ \
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/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 cd /tmp/ \ COPY --from=rust-sources-downloader /tmp/zkgroup-${ZKGROUP_VERSION} /tmp/zkgroup-${ZKGROUP_VERSION}
&& git clone https://github.com/signalapp/zkgroup.git zkgroup-${ZKGROUP_VERSION} \
&& cd zkgroup-${ZKGROUP_VERSION} \ RUN cd /tmp/zkgroup-${ZKGROUP_VERSION} \
&& git checkout v${ZKGROUP_VERSION} \
&& make libzkgroup \ && make libzkgroup \
&& ln -s /tmp/zkgroup-${ZKGROUP_VERSION} /tmp/zkgroup && ln -s /tmp/zkgroup-${ZKGROUP_VERSION} /tmp/zkgroup
RUN cd /tmp/signal-cli \ RUN cd /tmp/signal-cli \
&& cd /tmp/zkgroup-${ZKGROUP_VERSION}/target/release/ \ && cd /tmp/zkgroup-${ZKGROUP_VERSION}/target/release/ \
&& zip -u /tmp/signal-cli/lib/zkgroup-java-*.jar libzkgroup.so && zip -u /tmp/signal-cli/lib/zkgroup-java-*.jar libzkgroup.so
#\
#&& jar uf /tmp/signal-cli/lib/zkgroup-java-*.jar -C /tmp/zkgroup/
COPY src/api /tmp/signal-cli-rest-api-src/api COPY src/api /tmp/signal-cli-rest-api-src/api
COPY src/main.go /tmp/signal-cli-rest-api-src/ COPY src/main.go /tmp/signal-cli-rest-api-src/