Merge f27a3c5206fead40d77aebac4424397b58be7f94 into 8533043ba2b4f03510cfc3ee9839140ec21c4fe2

updated signal-cli-native package
switch back to GraalVM v21.0.0
2026-09-22 06:29:09 +00:00 · 2026-02-18 11:23:55 -08:00 · 2026-02-17 23:51:02 +01:00 · 2026-02-17 23:49:55 +01:00 · 2026-02-17 22:04:07 +01:00 · 2026-02-17 22:02:31 +01:00
3 changed files with 24 additions and 4 deletions
--- a/5
+++ b/5
@ -1,9 +1,10 @@
 ARG SIGNAL_CLI_VERSION=0.13.24
 ARG LIBSIGNAL_CLIENT_VERSION=0.87.0
-ARG SIGNAL_CLI_NATIVE_PACKAGE_VERSION=0.13.24+morph027+1
+ARG SIGNAL_CLI_NATIVE_PACKAGE_VERSION=0.13.24+morph027+2

 ARG SWAG_VERSION=1.16.4
-ARG GRAALVM_VERSION=25.0.2
+ARG GRAALVM_VERSION=21.0.0
+#ARG GRAALVM_VERSION=25.0.2

 ARG BUILD_VERSION_ARG=unset

--- a/entrypoint.sh
+++ b/entrypoint.sh
@ -3,8 +3,27 @@
 set -x
 set -e

+[ -d /etc/docker ] && echo "$FILE is a directory."
+
 [ -z "${SIGNAL_CLI_CONFIG_DIR}" ] && echo "SIGNAL_CLI_CONFIG_DIR environmental variable needs to be set! Aborting!" && exit 1;

+if [ "$(id -u)" -eq "${SIGNAL_CLI_UID}" ] && [ "$(id -g)" -eq "${SIGNAL_CLI_GID}" ]]
+then
+  echo "UID and GID are already correct. Trying to start Signal Api"
+
+  # TODO: check mode
+  if [ "$MODE" = "json-rpc" ]
+  then
+  /usr/bin/jsonrpc2-helper
+  if [ -n "$JAVA_OPTS" ] ; then
+      echo "export JAVA_OPTS='$JAVA_OPTS'" >> /etc/default/supervisor
+  fi
+  service supervisor start
+  supervisorctl start all
+  fi
+  signal-cli-rest-api -signal-cli-config=${SIGNAL_CLI_CONFIG_DIR};
+fi
+
 usermod -u ${SIGNAL_CLI_UID} signal-api
 groupmod -o -g ${SIGNAL_CLI_GID} signal-api

--- a/src/client/client.go
+++ b/src/client/client.go
@ -1168,7 +1168,6 @@ func prefixUsernameMembers(members []string) []string {
 }

 func (s *SignalClient) updateGroupMembers(number string, groupId string, members []string, add bool) error {
-	var err error

 	if len(members) == 0 {
 		return nil
@ -1207,6 +1206,7 @@ func (s *SignalClient) updateGroupMembers(number string, groupId string, members
 			return err
 		}
 		_, err = jsonRpc2Client.getRaw("updateGroup", &number, request)
+		return err
 	} else {
 		cmd := []string{"--config", s.signalCliConfig, "-a", number, "updateGroup", "-g", internalGroupId}

@ -1218,8 +1218,8 @@ func (s *SignalClient) updateGroupMembers(number string, groupId string, members
 		cmd = append(cmd, members...)

 		_, err = s.cliClient.Execute(true, cmd, "")
+		return err
 	}
-	return err
 }

 func (s *SignalClient) AddMembersToGroup(number string, groupId string, members []string) error {
Author	SHA1	Message	Date
Lukas f. Paluch	1f43522d60	Merge f27a3c5206fead40d77aebac4424397b58be7f94 into 8533043ba2b4f03510cfc3ee9839140ec21c4fe2	2026-02-18 11:23:55 -08:00
Bernhard B	8533043ba2	updated signal-cli-native package	2026-02-17 23:51:02 +01:00
Bernhard B	9a24992b94	switch back to GraalVM v21.0.0 * accidentally switched to early to GraalVM 25.0.0 - signal-cli v0.13.24 requires still GraalVM v21.0.0.	2026-02-17 23:49:55 +01:00
Bernhard B	5d5fa64f01	code cleanup: removed unused variable	2026-02-17 22:04:07 +01:00
Bernhard B	6c5dcdad2e	fixed error handling in updateGroupMembers function see #790	2026-02-17 22:02:31 +01:00
Lukas Paluch	f27a3c5206	fix rootless entrypoint - clarify and append jsonrpc - rework statemant to be more clear - append check of json-rpc mode to rootless part	2024-02-27 08:54:33 +01:00
Lukas f. Paluch	1be5684ae3	enable rootless start fixes bbernhard/signal-cli-rest-api#490	2024-02-23 15:10:57 +01:00