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

improved Dockerfile

Browse Source
This commit is contained in:
Bernhard B
2021-01-15 15:07:22 +01:00
parent 5ad455e493
commit c5dfed4a0b
1 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Dockerfile
View File

@@ -14,7 +14,7 @@ RUN cd /tmp/zkgroup-${ZKGROUP_VERSION} \
&& cargo vendor > /tmp/zkgroup-${ZKGROUP_VERSION}/.cargo/config && cargo vendor > /tmp/zkgroup-${ZKGROUP_VERSION}/.cargo/config
FROM golang:1.13-buster AS buildcontainer FROM golang:1.14-buster AS buildcontainer
ARG SIGNAL_CLI_VERSION ARG SIGNAL_CLI_VERSION
ARG ZKGROUP_VERSION ARG ZKGROUP_VERSION
@@ -50,21 +50,35 @@ RUN cd /tmp/ \
&& git checkout v${SIGNAL_CLI_VERSION} \ && git checkout v${SIGNAL_CLI_VERSION} \
&& ./gradlew build \ && ./gradlew build \
&& ./gradlew installDist \ && ./gradlew installDist \
&& ln -s /tmp/signal-cli-${SIGNAL_CLI_VERSION}/build/install/signal-cli/ /tmp/signal-cli && ./gradlew distTar
#\
#&& ln -s /tmp/signal-cli-${SIGNAL_CLI_VERSION}/build/install/signal-cli/ /tmp/signal-cli
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)
COPY --from=rust-sources-downloader /tmp/zkgroup-${ZKGROUP_VERSION} /tmp/zkgroup-${ZKGROUP_VERSION} COPY --from=rust-sources-downloader /tmp/zkgroup-${ZKGROUP_VERSION} /tmp/zkgroup-${ZKGROUP_VERSION}
#run cargo in offline mode (i.e fetch resources from local cache instead of network)
ENV CARGO_NET_OFFLINE true ENV CARGO_NET_OFFLINE true
RUN cd /tmp/zkgroup-${ZKGROUP_VERSION} \ RUN cd /tmp/zkgroup-${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/zkgroup-${ZKGROUP_VERSION}/target/release \
&& cd /tmp/zkgroup-${ZKGROUP_VERSION}/target/release/ \ && zip -u /tmp/signal-cli-${SIGNAL_CLI_VERSION}/build/install/signal-cli/lib/zkgroup-${ZKGROUP_VERSION}.jar libzkgroup.so
&& zip -u /tmp/signal-cli/lib/zkgroup-java-*.jar libzkgroup.so
RUN cd /tmp/signal-cli-${SIGNAL_CLI_VERSION}/build/distributions/ \
&& mkdir -p signal-cli-${SIGNAL_CLI_VERSION}/lib/ \
&& cp /tmp/signal-cli-${SIGNAL_CLI_VERSION}/build/install/signal-cli/lib/zkgroup-java-${ZKGROUP_VERSION}.jar signal-cli-${SIGNAL_CLI_VERSION}/lib/ \
# update zip
&& zip -u /tmp/signal-cli-${SIGNAL_CLI_VERSION}/build/distributions/signal-cli-${SIGNAL_CLI_VERSION}.zip signal-cli-${SIGNAL_CLI_VERSION}/lib/zkgroup-java-${ZKGROUP_VERSION}.jar \
# update tar
&& tar --delete -vPf /tmp/signal-cli-${SIGNAL_CLI_VERSION}/build/distributions/signal-cli-${SIGNAL_CLI_VERSION}.tar signal-cli-${SIGNAL_CLI_VERSION}/lib/zkgroup-java-${ZKGROUP_VERSION}.jar \
&& tar --owner='' --group='' -rvPf /tmp/signal-cli-${SIGNAL_CLI_VERSION}/build/distributions/signal-cli-${SIGNAL_CLI_VERSION}.tar signal-cli-${SIGNAL_CLI_VERSION}/lib/zkgroup-java-${ZKGROUP_VERSION}.jar
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/
@@ -76,17 +90,22 @@ RUN cd /tmp/signal-cli-rest-api-src && swag init && go build
# Start a fresh container for release container # Start a fresh container for release container
FROM adoptopenjdk:11-jdk-hotspot-bionic FROM adoptopenjdk:11-jdk-hotspot-bionic
ARG SIGNAL_CLI_VERSION
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --no-install-recommends setpriv \ && apt-get install -y --no-install-recommends setpriv \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
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-rest-api-src/signal-cli-rest-api /usr/bin/signal-cli-rest-api
COPY --from=buildcontainer /tmp/signal-cli /opt/signal-cli 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 entrypoint.sh /entrypoint.sh COPY entrypoint.sh /entrypoint.sh
RUN tar xf /tmp/signal-cli-${SIGNAL_CLI_VERSION}.tar -C /opt
RUN rm -rf /tmp/signal-cli-${SIGNAL_CLI_VERSION}
RUN groupadd -g 1000 signal-api \ RUN groupadd -g 1000 signal-api \
&& useradd --no-log-init -M -d /home -s /bin/bash -u 1000 -g 1000 signal-api \ && useradd --no-log-init -M -d /home -s /bin/bash -u 1000 -g 1000 signal-api \
&& ln -s /opt/signal-cli/bin/signal-cli /usr/bin/signal-cli \ && ln -s /opt/signal-cli-${SIGNAL_CLI_VERSION}/bin/signal-cli /usr/bin/signal-cli \
&& mkdir -p /signal-cli-config/ \ && mkdir -p /signal-cli-config/ \
&& mkdir -p /home/.local/share/signal-cli && mkdir -p /home/.local/share/signal-cli