diff --git a/signal-server-patches/apply-patches.sh b/signal-server-patches/apply-patches.sh deleted file mode 100755 index c4ac067..0000000 --- a/signal-server-patches/apply-patches.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -euo pipefail -for patch in /tmp/signal-server-patches/*.patch; do - echo "patch -p1 < ${patch}" - patch -p1 < "${patch}" -done diff --git a/signal-server.Dockerfile b/signal-server.Dockerfile index fe4f504..b2f737e 100644 --- a/signal-server.Dockerfile +++ b/signal-server.Dockerfile @@ -11,7 +11,7 @@ RUN apt-get install -y openjdk-11-jdk-headless maven git RUN git -C /usr/local/src clone https://github.com/signalapp/Signal-Server WORKDIR /usr/local/src/Signal-Server COPY signal-server-patches /tmp/signal-server-patches -RUN /tmp/signal-server-patches/apply-patches.sh +RUN cat /tmp/signal-server-patches/*.patch | patch -p1 RUN mvn install -DskipTests FROM debian:buster