diff --git a/Dockerfile b/Dockerfile index 7d06f31..eed7aaf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,14 +14,24 @@ RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ ENV LANG en_US.UTF-8 +#RUN cd /tmp/ \ +# && wget -P /tmp/ https://github.com/AsamK/signal-cli/archive/v${SIGNAL_CLI_VERSION}.tar.gz \ +# && tar -xvf /tmp/v${SIGNAL_CLI_VERSION}.tar.gz \ +# && cd signal-cli-${SIGNAL_CLI_VERSION} \ +# && ./gradlew build \ +# && ./gradlew installDist \ +# && ln -s /tmp/signal-cli-${SIGNAL_CLI_VERSION}/build/install/signal-cli/bin/signal-cli /usr/bin/signal-cli \ +# && rm -rf /tmp/v${SIGNAL_CLI_VERSION}.tar.gz + +# https://github.com/AsamK/signal-cli/issues/259 is not yet in a release, so we need to check out the repository + + RUN cd /tmp/ \ - && wget -P /tmp/ https://github.com/AsamK/signal-cli/archive/v${SIGNAL_CLI_VERSION}.tar.gz \ - && tar -xvf /tmp/v${SIGNAL_CLI_VERSION}.tar.gz \ + && git clone https://github.com/AsamK/signal-cli.git signal-cli-${SIGNAL_CLI_VERSION} \ && cd signal-cli-${SIGNAL_CLI_VERSION} \ && ./gradlew build \ && ./gradlew installDist \ - && ln -s /tmp/signal-cli-${SIGNAL_CLI_VERSION}/build/install/signal-cli/bin/signal-cli /usr/bin/signal-cli \ - && rm -rf /tmp/v${SIGNAL_CLI_VERSION}.tar.gz + && ln -s /tmp/signal-cli-${SIGNAL_CLI_VERSION}/build/install/signal-cli/bin/signal-cli /usr/bin/signal-cli RUN mkdir -p /signal-cli-config/ RUN mkdir -p /home/.local/share/signal-cli