Merge feature/split-signal-improvements into combined branch
Combines Signal split/merge improvements with keycloak auth, baileys-7 updates, and signal notifications support. Resolved conflicts: - Kept LID user ID support in bridge-whatsapp - Kept bridge-dev.yml docker compose addition - Used 3.5.0-beta.1 version from split-signal-improvements
This commit is contained in:
commit
38efae02d4
26 changed files with 1604 additions and 24 deletions
|
|
@ -26,6 +26,7 @@ if (devAppsWithZammad.includes(app) && files[app].includes('zammad')) {
|
|||
finalFiles.push('-f', 'docker-compose.bridge-dev.yml');
|
||||
}
|
||||
|
||||
|
||||
const finalCommand = command === "up" ? ["up", "-d", "--remove-orphans"] : [command];
|
||||
const dockerCompose = spawn('docker', ['compose', '--env-file', envFile, ...finalFiles, ...finalCommand]);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue