From 989685b1d4c84ad39104aa11bcfcde14ea578600 Mon Sep 17 00:00:00 2001 From: Jailson Dias Date: Mon, 14 Oct 2024 08:57:06 -0300 Subject: [PATCH 1/4] remove dockerfile empty spaces --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2379223..cbe1502 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,7 +34,7 @@ RUN dpkg-reconfigure debconf --frontend=noninteractive \ && apt-get -qqy install --no-install-recommends \ wget software-properties-common git locales zip unzip \ file build-essential libz-dev zlib1g-dev < /dev/null > /dev/null \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ dpkg-reconfigure --frontend=noninteractive locales && \ @@ -45,7 +45,7 @@ ENV JAVA_OPTS="-Djdk.lang.Process.launchMechanism=vfork" ENV LANG en_US.UTF-8 RUN cd /tmp/ \ - && git clone https://github.com/swaggo/swag.git swag-${SWAG_VERSION} \ + && git clone https://github.com/swaggo/swag.git swag-${SWAG_VERSION} \ && cd swag-${SWAG_VERSION} \ && git checkout -q v${SWAG_VERSION} \ && make -s < /dev/null > /dev/null \ @@ -141,7 +141,7 @@ COPY src/go.sum /tmp/signal-cli-rest-api-src/ RUN cd /tmp/signal-cli-rest-api-src && swag init && go test ./client -v && go build # build supervisorctl_config_creator -RUN cd /tmp/signal-cli-rest-api-src/scripts && go build -o jsonrpc2-helper +RUN cd /tmp/signal-cli-rest-api-src/scripts && go build -o jsonrpc2-helper # Start a fresh container for release container @@ -163,7 +163,7 @@ ENV BUILD_VERSION=$BUILD_VERSION_ARG RUN dpkg-reconfigure debconf --frontend=noninteractive \ && apt-get -qq update \ && apt-get -qq install -y --no-install-recommends util-linux supervisor netcat openjdk-21-jre curl < /dev/null > /dev/null \ - && 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 /opt/signal-cli-${SIGNAL_CLI_VERSION} /opt/signal-cli-${SIGNAL_CLI_VERSION} From bc0000e030bc566f361c3d934ed8427c0be99bf0 Mon Sep 17 00:00:00 2001 From: Jailson Dias Date: Mon, 14 Oct 2024 08:58:21 -0300 Subject: [PATCH 2/4] added JoinGroupByInviteLink feature --- src/api/api.go | 27 +++++++++++++++++++++++++++ src/client/client.go | 21 ++++++++++++++++++++- src/main.go | 10 ++++++---- 3 files changed, 53 insertions(+), 5 deletions(-) diff --git a/src/api/api.go b/src/api/api.go index addc9e3..c4d2042 100644 --- a/src/api/api.go +++ b/src/api/api.go @@ -1334,6 +1334,33 @@ func (a *Api) JoinGroup(c *gin.Context) { c.Status(http.StatusNoContent) } +// @Summary Join a Signal Group by invite link. +// @Tags Groups +// @Description Join the specified Signal Group by invite link. +// @Accept json +// @Produce json +// @Success 204 {string} OK +// @Failure 400 {object} Error +// @Param number path string true "Registered Phone Number" +// @Query invite_link query string true "Invite Link" +// @Router /v1/groups/{number}/join_by_invite_link [post] +func (a *Api) JoinGroupByInviteLink(c *gin.Context) { + number := c.Param("number") + if number == "" { + c.JSON(400, Error{Msg: "Couldn't process request - number missing"}) + return + } + + inviteLink := c.Query("invite_link") + err := a.signalClient.JoinGroupByInviteLink(number, inviteLink) + if err != nil { + c.JSON(400, Error{Msg: err.Error()}) + return + } + + c.Status(http.StatusNoContent) +} + // @Summary Quit a Signal Group. // @Tags Groups // @Description Quit the specified Signal Group. diff --git a/src/client/client.go b/src/client/client.go index ef6bc66..48397d3 100644 --- a/src/client/client.go +++ b/src/client/client.go @@ -5,13 +5,14 @@ import ( "encoding/json" "errors" "fmt" - log "github.com/sirupsen/logrus" "io/ioutil" "os" "path/filepath" "strconv" "strings" + log "github.com/sirupsen/logrus" + securejoin "github.com/cyphar/filepath-securejoin" "github.com/h2non/filetype" @@ -1549,6 +1550,24 @@ func (s *SignalClient) JoinGroup(number string, groupId string) error { return err } +func (s *SignalClient) JoinGroupByInviteLink(number string, inviteLink string) error { + var err error + if s.signalCliMode == JsonRpc { + type Request struct { + InviteLink string `json:"uri"` + } + request := Request{InviteLink: inviteLink} + jsonRpc2Client, err := s.getJsonRpc2Client() + if err != nil { + return err + } + _, err = jsonRpc2Client.getRaw("joinGroup", &number, request) + } else { + _, err = s.cliClient.Execute(true, []string{"--config", s.signalCliConfig, "-a", number, "joinGroup", "--uri", inviteLink}, "") + } + return err +} + func (s *SignalClient) QuitGroup(number string, groupId string) error { var err error if s.signalCliMode == JsonRpc { diff --git a/src/main.go b/src/main.go index 8e51733..1abd6be 100644 --- a/src/main.go +++ b/src/main.go @@ -3,6 +3,11 @@ package main import ( "encoding/json" "flag" + "io/ioutil" + "net/http" + "os" + "strconv" + "github.com/bbernhard/signal-cli-rest-api/api" "github.com/bbernhard/signal-cli-rest-api/client" docs "github.com/bbernhard/signal-cli-rest-api/docs" @@ -12,10 +17,6 @@ import ( log "github.com/sirupsen/logrus" swaggerFiles "github.com/swaggo/files" ginSwagger "github.com/swaggo/gin-swagger" - "io/ioutil" - "net/http" - "os" - "strconv" ) // @title Signal Cli REST API @@ -191,6 +192,7 @@ func main() { { groups.POST(":number", api.CreateGroup) groups.GET(":number", api.GetGroups) + groups.POST(":number/join_by_invite_link", api.JoinGroupByInviteLink) groups.GET(":number/:groupid", api.GetGroup) groups.DELETE(":number/:groupid", api.DeleteGroup) groups.POST(":number/:groupid/block", api.BlockGroup) From 531970570107664da570c19ce411199a6d1bc658 Mon Sep 17 00:00:00 2001 From: Jailson Dias Date: Wed, 13 Nov 2024 18:05:12 -0300 Subject: [PATCH 3/4] added the feature to get join group info by invite link --- src/api/api.go | 27 +++++++++++++++++++++++++++ src/client/client.go | 8 ++++++++ src/main.go | 1 + 3 files changed, 36 insertions(+) diff --git a/src/api/api.go b/src/api/api.go index d8c2d7f..986ccbb 100644 --- a/src/api/api.go +++ b/src/api/api.go @@ -1431,6 +1431,33 @@ func (a *Api) JoinGroupByInviteLink(c *gin.Context) { c.Status(http.StatusNoContent) } +// @Summary Get a Signal Group info by invite link. +// @Tags Groups +// @Description Get the specified Signal Group info by invite link. +// @Accept json +// @Produce json +// @Success 200 {string} OK +// @Failure 400 {object} Error +// @Param number path string true "Registered Phone Number" +// @Query invite_link query string true "Invite Link" +// @Router /v1/groups/{number}/join_info_by_invite_link [get] +func (a *Api) GetJoinGroupInfoByInviteLink(c *gin.Context) { + number := c.Param("number") + if number == "" { + c.JSON(400, Error{Msg: "Couldn't process request - number missing"}) + return + } + + inviteLink := c.Query("invite_link") + jsonStr, err := a.signalClient.GetJoinGroupInfoByInviteLink(number, inviteLink) + if err != nil { + c.JSON(400, Error{Msg: err.Error()}) + return + } + + c.String(200, jsonStr) +} + // @Summary Quit a Signal Group. // @Tags Groups // @Description Quit the specified Signal Group. diff --git a/src/client/client.go b/src/client/client.go index cf852f0..6a5b7ff 100644 --- a/src/client/client.go +++ b/src/client/client.go @@ -1578,6 +1578,14 @@ func (s *SignalClient) JoinGroupByInviteLink(number string, inviteLink string) e return err } +func (s *SignalClient) GetJoinGroupInfoByInviteLink(number string, inviteLink string) (string, error) { + if s.signalCliMode == JsonRpc { + return "", errors.New("Not implemented") + } + + return s.cliClient.Execute(true, []string{"--config", s.signalCliConfig, "--output", "json", "-a", number, "getJoinGroupInfo", "--uri", inviteLink}, "") +} + func (s *SignalClient) QuitGroup(number string, groupId string) error { var err error if s.signalCliMode == JsonRpc { diff --git a/src/main.go b/src/main.go index 1d6b0b1..baf29f7 100644 --- a/src/main.go +++ b/src/main.go @@ -195,6 +195,7 @@ func main() { groups.POST(":number", api.CreateGroup) groups.GET(":number", api.GetGroups) groups.POST(":number/join_by_invite_link", api.JoinGroupByInviteLink) + groups.GET(":number/join_info_by_invite_link", api.GetJoinGroupInfoByInviteLink) groups.GET(":number/:groupid", api.GetGroup) groups.DELETE(":number/:groupid", api.DeleteGroup) groups.POST(":number/:groupid/block", api.BlockGroup) From 7daeecb867e4c2946119c95daebd62941a285e2e Mon Sep 17 00:00:00 2001 From: Jailson Dias Date: Sun, 16 Nov 2025 00:27:31 -0300 Subject: [PATCH 4/4] add signal --- Dockerfile | 182 +++++++++++++++++++++++++++++---------------- README.md | 14 ++++ docker-compose.yml | 11 ++- 3 files changed, 139 insertions(+), 68 deletions(-) diff --git a/Dockerfile b/Dockerfile index 236139a..b58f2d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,9 +16,9 @@ ARG GRAALVM_VERSION ARG BUILD_VERSION_ARG ARG SIGNAL_CLI_NATIVE_PACKAGE_VERSION -COPY ext/libraries/libsignal-client/v${LIBSIGNAL_CLIENT_VERSION} /tmp/libsignal-client-libraries -COPY ext/libraries/libsignal-client/signal-cli-native.patch /tmp/signal-cli-native.patch -COPY ext/patches/signal-cli-native-arch.patch /tmp/signal-cli-native-arch.patch +COPY signal-cli-rest-api/ext/libraries/libsignal-client/v${LIBSIGNAL_CLIENT_VERSION} /tmp/libsignal-client-libraries +COPY signal-cli-rest-api/ext/libraries/libsignal-client/signal-cli-native.patch /tmp/signal-cli-native.patch +COPY signal-cli-rest-api/ext/patches/signal-cli-native-arch.patch /tmp/signal-cli-native-arch.patch # use architecture specific libsignal_jni.so RUN arch="$(uname -m)"; \ @@ -52,9 +52,9 @@ RUN cd /tmp/ \ && cp /tmp/swag-${SWAG_VERSION}/swag /usr/bin/swag \ && rm -r /tmp/swag-${SWAG_VERSION} -RUN cd /tmp/ \ - && wget -nv https://github.com/AsamK/signal-cli/releases/download/v${SIGNAL_CLI_VERSION}/signal-cli-${SIGNAL_CLI_VERSION}.tar.gz -O /tmp/signal-cli.tar.gz \ - && tar xf signal-cli.tar.gz +# RUN cd /tmp/ \ +# && wget -nv https://github.com/AsamK/signal-cli/releases/download/v${SIGNAL_CLI_VERSION}/signal-cli-${SIGNAL_CLI_VERSION}.tar.gz -O /tmp/signal-cli.tar.gz \ +# && tar xf signal-cli.tar.gz # build native image with graalvm @@ -66,76 +66,130 @@ RUN arch="$(uname -m)"; \ *) echo "Invalid architecture" ;; \ esac; -RUN if [ "$(uname -m)" = "x86_64" ]; then \ - cd /tmp \ - && git clone https://github.com/AsamK/signal-cli.git signal-cli-${SIGNAL_CLI_VERSION}-source \ - && cd signal-cli-${SIGNAL_CLI_VERSION}-source \ - && git checkout -q v${SIGNAL_CLI_VERSION} \ - && cd /tmp && mkdir -p /tmp/graalvm && tar xf gvm.tar.gz -C /tmp/graalvm --strip-components=1 \ +COPY signal-cli /tmp/signal-cli + +# RUN if [ "$(uname -m)" = "x86_64" ]; then \ +# cd /tmp \ +# && git clone https://github.com/AsamK/signal-cli.git signal-cli-${SIGNAL_CLI_VERSION}-source \ +# && cd signal-cli-${SIGNAL_CLI_VERSION}-source \ +# && git checkout -q v${SIGNAL_CLI_VERSION} \ +# && cd /tmp && mkdir -p /tmp/graalvm && tar xf gvm.tar.gz -C /tmp/graalvm --strip-components=1 \ +# && export GRAALVM_HOME=/tmp/graalvm \ +# && export PATH=/tmp/graalvm/bin:$PATH \ +# && cd /tmp/signal-cli-${SIGNAL_CLI_VERSION}-source \ +# && sed -i 's/Signal-Android\/5.22.3/Signal-Android\/5.51.7/g' src/main/java/org/asamk/signal/BaseConfig.java \ +# && ./gradlew build \ +# && ./gradlew installDist \ +# && ls build/install/signal-cli/lib/libsignal-client-${LIBSIGNAL_CLIENT_VERSION}.jar || (echo "\n\nsignal-client jar file with version ${LIBSIGNAL_CLIENT_VERSION} not found. Maybe the version needs to be bumped in the signal-cli-rest-api Dockerfile?\n\n" && echo "Available version: \n" && ls build/install/signal-cli/lib/libsignal-client-* && echo "\n\n" && exit 1) \ +# && cd /tmp \ +# && cp signal-cli-${SIGNAL_CLI_VERSION}-source/build/install/signal-cli/lib/libsignal-client-${LIBSIGNAL_CLIENT_VERSION}.jar libsignal-client.jar \ +# && zip -qu libsignal-client.jar libsignal_jni.so \ +# && cd /tmp/signal-cli-${SIGNAL_CLI_VERSION}-source \ +# && git apply /tmp/signal-cli-native.patch \ +# && git apply /tmp/signal-cli-native-arch.patch \ +# && ./gradlew -q nativeCompile; \ +# elif [ "$(uname -m)" = "aarch64" ] ; then \ +# echo "Use native image from @morph027 (https://packaging.gitlab.io/signal-cli/) for arm64 - many thanks to @morph027" \ +# && curl -fsSL https://packaging.gitlab.io/signal-cli/gpg.key | apt-key add - \ +# && echo "deb https://packaging.gitlab.io/signal-cli focal main" > /etc/apt/sources.list.d/morph027-signal-cli.list \ +# && mkdir -p /tmp/signal-cli-native \ +# && cd /tmp/signal-cli-native \ +# #&& wget https://gitlab.com/packaging/signal-cli/-/jobs/3716873649/artifacts/download?file_type=archive -O /tmp/signal-cli-native/archive.zip \ +# #&& unzip archive.zip \ +# #&& mv signal-cli-native-arm64/*deb . \ +# && apt-get -qq update \ +# && apt-get -qq download signal-cli-native=${SIGNAL_CLI_NATIVE_PACKAGE_VERSION} < /dev/null > /dev/null \ +# && ar x *.deb \ +# && tar xf data.tar.gz \ +# && mkdir -p /tmp/signal-cli-${SIGNAL_CLI_VERSION}-source/build/native/nativeCompile \ +# && cp /tmp/signal-cli-native/usr/bin/signal-cli-native /tmp/signal-cli-${SIGNAL_CLI_VERSION}-source/build/native/nativeCompile/signal-cli; \ +# elif [ "$(uname -m)" = "armv7l" ] ; then \ +# echo "GRAALVM doesn't support 32bit" \ +# && echo "Creating temporary file, otherwise the below copy doesn't work for armv7" \ +# && mkdir -p /tmp/signal-cli-${SIGNAL_CLI_VERSION}-source/build/native/nativeCompile \ +# && touch /tmp/signal-cli-${SIGNAL_CLI_VERSION}-source/build/native/nativeCompile/signal-cli; \ +# else \ +# echo "Unknown architecture"; \ +# fi; +RUN cd /tmp && mkdir -p /tmp/graalvm && tar xf gvm.tar.gz -C /tmp/graalvm --strip-components=1 + +RUN cd /tmp/signal-cli \ + && sed -i 's/Signal-Android\/5.22.3/Signal-Android\/5.51.7/g' src/main/java/org/asamk/signal/BaseConfig.java + +RUN cd /tmp/signal-cli \ + && export GRAALVM_HOME=/tmp/graalvm \ + && export PATH=/tmp/graalvm/bin:$PATH \ + && ./gradlew build + +RUN cd /tmp/signal-cli \ + && export GRAALVM_HOME=/tmp/graalvm \ + && export PATH=/tmp/graalvm/bin:$PATH \ + && ./gradlew installDist + +RUN cd /tmp/signal-cli \ + && export GRAALVM_HOME=/tmp/graalvm \ + && export PATH=/tmp/graalvm/bin:$PATH \ + && ./gradlew distTar + +RUN cd /tmp/signal-cli \ + && export GRAALVM_HOME=/tmp/graalvm \ + && export PATH=/tmp/graalvm/bin:$PATH \ + && ./gradlew fatJar + +RUN cd /tmp/signal-cli \ + && export GRAALVM_HOME=/tmp/graalvm \ + && export PATH=/tmp/graalvm/bin:$PATH \ + && ./gradlew run --args="--help" + +RUN cd /tmp/signal-cli \ + && ls build/install/signal-cli/lib/libsignal-client-${LIBSIGNAL_CLIENT_VERSION}.jar || (echo "\n\nsignal-client jar file with version ${LIBSIGNAL_CLIENT_VERSION} not found. Maybe the version needs to be bumped in the signal-cli-rest-api Dockerfile?\n\n" && echo "Available version: \n" && ls build/install/signal-cli/lib/libsignal-client-* && echo "\n\n" && exit 1) + +RUN cd /tmp \ + && cp signal-cli/build/install/signal-cli/lib/libsignal-client-${LIBSIGNAL_CLIENT_VERSION}.jar libsignal-client.jar \ + && zip -qu libsignal-client.jar libsignal_jni.so + +RUN cd /tmp/signal-cli \ && export GRAALVM_HOME=/tmp/graalvm \ && export PATH=/tmp/graalvm/bin:$PATH \ - && cd /tmp/signal-cli-${SIGNAL_CLI_VERSION}-source \ - && sed -i 's/Signal-Android\/5.22.3/Signal-Android\/5.51.7/g' src/main/java/org/asamk/signal/BaseConfig.java \ - && ./gradlew build \ - && ./gradlew installDist \ - && ls build/install/signal-cli/lib/libsignal-client-${LIBSIGNAL_CLIENT_VERSION}.jar || (echo "\n\nsignal-client jar file with version ${LIBSIGNAL_CLIENT_VERSION} not found. Maybe the version needs to be bumped in the signal-cli-rest-api Dockerfile?\n\n" && echo "Available version: \n" && ls build/install/signal-cli/lib/libsignal-client-* && echo "\n\n" && exit 1) \ - && cd /tmp \ - && cp signal-cli-${SIGNAL_CLI_VERSION}-source/build/install/signal-cli/lib/libsignal-client-${LIBSIGNAL_CLIENT_VERSION}.jar libsignal-client.jar \ - && zip -qu libsignal-client.jar libsignal_jni.so \ - && cd /tmp/signal-cli-${SIGNAL_CLI_VERSION}-source \ && git apply /tmp/signal-cli-native.patch \ && git apply /tmp/signal-cli-native-arch.patch \ - && ./gradlew -q nativeCompile; \ - elif [ "$(uname -m)" = "aarch64" ] ; then \ - echo "Use native image from @morph027 (https://packaging.gitlab.io/signal-cli/) for arm64 - many thanks to @morph027" \ - && curl -fsSL https://packaging.gitlab.io/signal-cli/gpg.key | apt-key add - \ - && echo "deb https://packaging.gitlab.io/signal-cli focal main" > /etc/apt/sources.list.d/morph027-signal-cli.list \ - && mkdir -p /tmp/signal-cli-native \ - && cd /tmp/signal-cli-native \ - #&& wget https://gitlab.com/packaging/signal-cli/-/jobs/3716873649/artifacts/download?file_type=archive -O /tmp/signal-cli-native/archive.zip \ - #&& unzip archive.zip \ - #&& mv signal-cli-native-arm64/*deb . \ - && apt-get -qq update \ - && apt-get -qq download signal-cli-native=${SIGNAL_CLI_NATIVE_PACKAGE_VERSION} < /dev/null > /dev/null \ - && ar x *.deb \ - && tar xf data.tar.gz \ - && mkdir -p /tmp/signal-cli-${SIGNAL_CLI_VERSION}-source/build/native/nativeCompile \ - && cp /tmp/signal-cli-native/usr/bin/signal-cli-native /tmp/signal-cli-${SIGNAL_CLI_VERSION}-source/build/native/nativeCompile/signal-cli; \ - elif [ "$(uname -m)" = "armv7l" ] ; then \ - echo "GRAALVM doesn't support 32bit" \ - && echo "Creating temporary file, otherwise the below copy doesn't work for armv7" \ - && mkdir -p /tmp/signal-cli-${SIGNAL_CLI_VERSION}-source/build/native/nativeCompile \ - && touch /tmp/signal-cli-${SIGNAL_CLI_VERSION}-source/build/native/nativeCompile/signal-cli; \ - else \ - echo "Unknown architecture"; \ - fi; + && ./gradlew -q nativeCompile; # replace libsignal-client -RUN ls /tmp/signal-cli-${SIGNAL_CLI_VERSION}/lib/libsignal-client-${LIBSIGNAL_CLIENT_VERSION}.jar || (echo "\n\nsignal-client jar file with version ${LIBSIGNAL_CLIENT_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-${SIGNAL_CLI_VERSION}/lib/libsignal-client-* && echo "\n\n" && exit 1) +RUN cp /tmp/signal-cli/build/install/signal-cli/lib/libsignal-client-${LIBSIGNAL_CLIENT_VERSION}.jar /tmp/signal-cli/lib/libsignal-client-${LIBSIGNAL_CLIENT_VERSION}.jar + +# RUN ls /tmp/signal-cli/lib/libsignal-client-${LIBSIGNAL_CLIENT_VERSION}.jar || (echo "\n\nsignal-client jar file with version ${LIBSIGNAL_CLIENT_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/libsignal-client-* && echo "\n\n" && exit 1) + +RUN cp /tmp/signal-cli/build/install/signal-cli/lib/signal-cli-*.jar /tmp/signal-cli/lib/ + +# replace libsignal-client + +# RUN ls /tmp/signal-cli-${SIGNAL_CLI_VERSION}/lib/libsignal-client-${LIBSIGNAL_CLIENT_VERSION}.jar || (echo "\n\nsignal-client jar file with version ${LIBSIGNAL_CLIENT_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-${SIGNAL_CLI_VERSION}/lib/libsignal-client-* && echo "\n\n" && exit 1) +RUN ls /tmp/signal-cli/lib/libsignal-client-${LIBSIGNAL_CLIENT_VERSION}.jar || (echo "\n\nsignal-client jar file with version ${LIBSIGNAL_CLIENT_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/libsignal-client-* && echo "\n\n" && exit 1) # workaround until upstream is fixed -RUN cd /tmp/signal-cli-${SIGNAL_CLI_VERSION}/lib \ - && unzip signal-cli-${SIGNAL_CLI_VERSION}.jar \ +RUN cd /tmp/signal-cli/lib \ + && unzip signal-cli*.jar \ && sed -i 's/Signal-Android\/5.22.3/Signal-Android\/5.51.7/g' org/asamk/signal/BaseConfig.class \ - && zip -r signal-cli-${SIGNAL_CLI_VERSION}.jar org/ META-INF/ \ + && zip -r signal-cli*.jar org/ META-INF/ \ && rm -rf META-INF \ && rm -rf org RUN cd /tmp/ \ - && zip -qu /tmp/signal-cli-${SIGNAL_CLI_VERSION}/lib/libsignal-client-${LIBSIGNAL_CLIENT_VERSION}.jar libsignal_jni.so \ - && zip -qr signal-cli-${SIGNAL_CLI_VERSION}.zip signal-cli-${SIGNAL_CLI_VERSION}/* \ - && unzip -q /tmp/signal-cli-${SIGNAL_CLI_VERSION}.zip -d /opt \ - && rm -f /tmp/signal-cli-${SIGNAL_CLI_VERSION}.zip + && zip -qu /tmp/signal-cli/lib/libsignal-client-${LIBSIGNAL_CLIENT_VERSION}.jar libsignal_jni.so \ + && zip -qr signal-cli.zip signal-cli/* \ + && unzip -q /tmp/signal-cli.zip -d /opt \ + && rm -f /tmp/signal-cli.zip -COPY src/api /tmp/signal-cli-rest-api-src/api -COPY src/client /tmp/signal-cli-rest-api-src/client -COPY src/datastructs /tmp/signal-cli-rest-api-src/datastructs -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/ +COPY signal-cli-rest-api/src/api /tmp/signal-cli-rest-api-src/api +COPY signal-cli-rest-api/src/client /tmp/signal-cli-rest-api-src/client +COPY signal-cli-rest-api/src/datastructs /tmp/signal-cli-rest-api-src/datastructs +COPY signal-cli-rest-api/src/utils /tmp/signal-cli-rest-api-src/utils +COPY signal-cli-rest-api/src/scripts /tmp/signal-cli-rest-api-src/scripts +COPY signal-cli-rest-api/src/main.go /tmp/signal-cli-rest-api-src/ +COPY signal-cli-rest-api/src/go.mod /tmp/signal-cli-rest-api-src/ +COPY signal-cli-rest-api/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 test ./client -v && go build @@ -166,10 +220,10 @@ RUN dpkg-reconfigure debconf --frontend=noninteractive \ && 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 /opt/signal-cli-${SIGNAL_CLI_VERSION} /opt/signal-cli-${SIGNAL_CLI_VERSION} -COPY --from=buildcontainer /tmp/signal-cli-${SIGNAL_CLI_VERSION}-source/build/native/nativeCompile/signal-cli /opt/signal-cli-${SIGNAL_CLI_VERSION}/bin/signal-cli-native +COPY --from=buildcontainer /tmp/signal-cli/build/install/signal-cli /opt/signal-cli-${SIGNAL_CLI_VERSION} +COPY --from=buildcontainer /tmp/signal-cli/build/native/nativeCompile/signal-cli /opt/signal-cli-${SIGNAL_CLI_VERSION}/bin/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 signal-cli-rest-api/entrypoint.sh /entrypoint.sh RUN groupadd -g 1000 signal-api \ diff --git a/README.md b/README.md index c567c08..334e3b5 100644 --- a/README.md +++ b/README.md @@ -139,3 +139,17 @@ There are a bunch of environmental variables that can be set inside the docker c * `SWAGGER_IP`: The IP that's used in the Swagger UI for the interactive examples. Defaults to the container ip. * `PORT`: Defaults to port `8080` unless this env var is set to tell it otherwise. + + + + +remove-cache: + docker builder prune --all --force + docker buildx prune --all -f + + +docker builder prune --all --force + + + +docker buildx build --memory=8g --memory-swap=8g --platform linux/amd64 -f ./Dockerfile -t jailsondias/signal:latest .. --progress=plain diff --git a/docker-compose.yml b/docker-compose.yml index 194f112..1b7f495 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,11 +1,14 @@ version: "3" services: - signal-cli-rest-api: - image: bbernhard/signal-cli-rest-api:latest + signal: + # image: bbernhard/signal-cli-rest-api:latest + build: + context: ../ + dockerfile: signal-cli-rest-api/Dockerfile environment: - - MODE=normal #supported modes: json-rpc, native, normal + - MODE=native #supported modes: json-rpc, native, normal #- AUTO_RECEIVE_SCHEDULE=0 22 * * * #enable this parameter on demand (see description below) ports: - "8080:8080" #map docker port 8080 to host port 8080. volumes: - - "./signal-cli-config:/home/.local/share/signal-cli" #map "signal-cli-config" folder on host system into docker container. the folder contains the password and cryptographic keys when a new number is registered + - "../tip-crawlers-v2/cf/services/signal/signal:/home/.local/share/signal-cli" #map "signal-cli-config" folder on host system into docker container. the folder contains the password and cryptographic keys when a new number is registered