Fix all integrations
This commit is contained in:
@@ -114,12 +114,14 @@ run_worker_container() {
|
||||
local cmd="$2"
|
||||
local with_uwsgi="${3:-0}"
|
||||
local with_whatsapp="${4:-0}"
|
||||
local cpu_limit="${5:-0.5}"
|
||||
|
||||
rm_if_exists "$name"
|
||||
local args=(
|
||||
--replace
|
||||
--name "$name"
|
||||
--pod "$POD_NAME"
|
||||
--cpus "$cpu_limit"
|
||||
--user "$(id -u):$(id -g)"
|
||||
--env-file "$STACK_ENV"
|
||||
--env "SIGNAL_HTTP_URL=http://127.0.0.1:8080"
|
||||
@@ -147,6 +149,7 @@ run_oneshot_container() {
|
||||
--replace
|
||||
--name "$name"
|
||||
--pod "$POD_NAME"
|
||||
--cpus "0.5"
|
||||
--user "$(id -u):$(id -g)"
|
||||
--env-file "$STACK_ENV"
|
||||
--env "SIGNAL_HTTP_URL=http://127.0.0.1:8080"
|
||||
@@ -223,6 +226,7 @@ start_stack() {
|
||||
--replace \
|
||||
--name "$REDIS_CONTAINER" \
|
||||
--pod "$POD_NAME" \
|
||||
--cpus "0.1" \
|
||||
-v "$REPO_DIR/docker/redis.conf:/etc/redis.conf:ro" \
|
||||
-v "$REDIS_DATA_DIR:/data" \
|
||||
-v "$VRUN_DIR:/var/run" \
|
||||
@@ -233,15 +237,17 @@ start_stack() {
|
||||
--replace \
|
||||
--name "$SIGNAL_CONTAINER" \
|
||||
--pod "$POD_NAME" \
|
||||
-e MODE=json-rpc \
|
||||
--cpus "0.2" \
|
||||
-e MODE=native \
|
||||
-v "$ROOT_DIR/signal-cli-config:/home/.local/share/signal-cli" \
|
||||
docker.io/bbernhard/signal-cli-rest-api:latest >/dev/null
|
||||
localhost/gia-signal:latest >/dev/null
|
||||
|
||||
if [[ "$PROSODY_ENABLED" == "true" ]]; then
|
||||
podman run -d \
|
||||
--replace \
|
||||
--name "$PROSODY_CONTAINER" \
|
||||
--pod "$POD_NAME" \
|
||||
--cpus "0.2" \
|
||||
--env-file "$STACK_ENV" \
|
||||
--user "$PROSODY_RUN_USER" \
|
||||
--entrypoint prosody \
|
||||
@@ -259,11 +265,11 @@ start_stack() {
|
||||
run_oneshot_container "$MIGRATION_CONTAINER" ". /venv/bin/activate && python manage.py migrate --noinput"
|
||||
run_oneshot_container "$COLLECTSTATIC_CONTAINER" ". /venv/bin/activate && python manage.py collectstatic --noinput"
|
||||
|
||||
run_worker_container "$APP_CONTAINER" "if [ \"\$OPERATION\" = \"uwsgi\" ] ; then . /venv/bin/activate && uwsgi --ini /conf/uwsgi.ini ; else . /venv/bin/activate && exec python manage.py runserver 0.0.0.0:8000; fi" 1 1
|
||||
run_worker_container "$ASGI_CONTAINER" "rm -f /var/run/asgi-gia.sock && . /venv/bin/activate && python -m pip install --disable-pip-version-check -q uvicorn && python -m uvicorn app.asgi:application --uds /var/run/asgi-gia.sock --workers 1" 0 1
|
||||
run_worker_container "$UR_CONTAINER" ". /venv/bin/activate && python manage.py ur" 1 1
|
||||
run_worker_container "$SCHED_CONTAINER" ". /venv/bin/activate && python manage.py scheduling" 1 0
|
||||
run_worker_container "$CODEX_WORKER_CONTAINER" ". /venv/bin/activate && python manage.py codex_worker" 1 0
|
||||
run_worker_container "$APP_CONTAINER" "if [ \"\$OPERATION\" = \"uwsgi\" ] ; then . /venv/bin/activate && uwsgi --ini /conf/uwsgi.ini ; else . /venv/bin/activate && exec python manage.py runserver 0.0.0.0:8000; fi" 1 1 0.5
|
||||
run_worker_container "$ASGI_CONTAINER" "rm -f /var/run/asgi-gia.sock && . /venv/bin/activate && python -m pip install --disable-pip-version-check -q uvicorn && python -m uvicorn app.asgi:application --uds /var/run/asgi-gia.sock --workers 1" 0 1 0.3
|
||||
run_worker_container "$UR_CONTAINER" ". /venv/bin/activate && python manage.py ur" 1 1 0.5
|
||||
run_worker_container "$SCHED_CONTAINER" ". /venv/bin/activate && python manage.py scheduling" 1 0 0.3
|
||||
run_worker_container "$CODEX_WORKER_CONTAINER" ". /venv/bin/activate && python manage.py codex_worker" 1 0 0.4
|
||||
}
|
||||
|
||||
render_units() {
|
||||
|
||||
@@ -186,7 +186,7 @@ Image=docker.io/bbernhard/signal-cli-rest-api:latest
|
||||
ContainerName={with_stack('signal')}
|
||||
Pod={pod_ref}
|
||||
Volume={signal_cli_dir}:/home/.local/share/signal-cli
|
||||
Environment=MODE=json-rpc
|
||||
Environment=MODE=native
|
||||
|
||||
[Service]
|
||||
Restart=always
|
||||
|
||||
Reference in New Issue
Block a user