From fc9a78b451211061e8a764fcbda9308300d4c326 Mon Sep 17 00:00:00 2001 From: Bernhard B Date: Sun, 24 May 2026 21:27:07 +0200 Subject: [PATCH] build json-schemas directly from the signal-cli source --- Dockerfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0b20c07..6dfa74a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ RUN dpkg-reconfigure debconf --frontend=noninteractive \ && apt-get update \ && apt-get -y install --no-install-recommends \ wget git locales zip unzip \ - file build-essential libz-dev zlib1g-dev binutils \ + file build-essential libz-dev zlib1g-dev binutils openjdk-25-jdk \ && rm -rf /var/lib/apt/lists/* #COPY ext/libraries/libsignal-client/v${LIBSIGNAL_CLIENT_VERSION} /tmp/libsignal-client-libraries @@ -42,6 +42,11 @@ ENV JAVA_OPTS="-Djdk.lang.Process.launchMechanism=vfork" ENV LANG=en_US.UTF-8 +RUN cd /tmp \ + && git clone https://github.com/AsamK/signal-cli.git --branch v${SIGNAL_CLI_VERSION} --single-branch signal-cli-source \ + && cd signal-cli-source \ + && ./gradlew jsonSchemas + RUN go install github.com/swaggo/swag/cmd/swag@v${SWAG_VERSION} RUN cd /tmp/ \ @@ -103,9 +108,7 @@ RUN cd /tmp/signal-cli-rest-api-src && ${GOPATH}/bin/swag init --requiredByDefau # manually add the json schemas for the receive V1 endpoint to the docs RUN cd /tmp/signal-cli-rest-api-src/docs \ - && wget https://github.com/Gara-Dorta/signal-cli/releases/download/v${SIGNAL_CLI_VERSION}/signal-cli-${SIGNAL_CLI_VERSION}-json-schemas.tar.gz \ - && mkdir signal-cli-schemas \ - && tar xf signal-cli-${SIGNAL_CLI_VERSION}-json-schemas.tar.gz -C signal-cli-schemas \ + && cp -r /tmp/signal-cli-source/build/generated/META-INF/schemas signal-cli-schemas \ && go run add_v1_receive_schemas.go signal-cli-schemas # build signal-cli-rest-api