updated Dockerfile to support JSON-RPC

This commit is contained in:
Bernhard B
2021-09-11 22:33:31 +02:00
parent 310d07536e
commit 2debc8554b

View File

@@ -1,6 +1,6 @@
ARG SIGNAL_CLI_VERSION=0.8.5
ARG ZKGROUP_VERSION=0.7.0
ARG LIBSIGNAL_CLIENT_VERSION=0.8.1
ARG LIBSIGNAL_CLIENT_VERSION=0.9.0
ARG SWAG_VERSION=1.6.7
ARG GRAALVM_JAVA_VERSION=11
@@ -127,12 +127,17 @@ RUN cd /tmp/signal-cli-${SIGNAL_CLI_VERSION}/build/distributions/ \
COPY src/api /tmp/signal-cli-rest-api-src/api
COPY src/client /tmp/signal-cli-rest-api-src/client
COPY src/utils /tmp/signal-cli-rest-api-src/utils
COPY src/scripts /tmp/signal-cli-rest-api-src/scripts
COPY src/main.go /tmp/signal-cli-rest-api-src/
COPY src/go.mod /tmp/signal-cli-rest-api-src/
COPY src/go.sum /tmp/signal-cli-rest-api-src/
# build signal-cli-rest-api
RUN cd /tmp/signal-cli-rest-api-src && swag init && go build
# build supervisorctl_config_creator
RUN cd /tmp/signal-cli-rest-api-src/scripts && go build -o jsonrpc2-helper
# Start a fresh container for release container
FROM adoptopenjdk:11-jre-hotspot-bionic
@@ -144,17 +149,21 @@ ENV PORT=8080
ARG SIGNAL_CLI_VERSION
RUN apt-get update \
&& apt-get install -y --no-install-recommends setpriv \
&& apt-get install -y --no-install-recommends setpriv supervisor netcat \
&& 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-${SIGNAL_CLI_VERSION}/build/distributions/signal-cli-${SIGNAL_CLI_VERSION}.tar /tmp/signal-cli-${SIGNAL_CLI_VERSION}.tar
COPY --from=buildcontainer /tmp/signal-cli-${SIGNAL_CLI_VERSION}/build/native-image/signal-cli /tmp/signal-cli-native
COPY --from=buildcontainer /tmp/signal-cli-rest-api-src/scripts/jsonrpc2-helper /usr/bin/jsonrpc2-helper
COPY entrypoint.sh /entrypoint.sh
#COPY conf/supervisor/signal-cli.conf /etc/supervisor/conf.d/
RUN tar xf /tmp/signal-cli-${SIGNAL_CLI_VERSION}.tar -C /opt
RUN rm -rf /tmp/signal-cli-${SIGNAL_CLI_VERSION}.tar
#RUN mkdir -p /var/log/signal-cli
RUN groupadd -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-${SIGNAL_CLI_VERSION}/bin/signal-cli /usr/bin/signal-cli \