From 18d80f6a538d41a71744499ed788ebb1ab399c74 Mon Sep 17 00:00:00 2001 From: David Wilkie Date: Fri, 20 Oct 2023 19:10:03 +0700 Subject: [PATCH] WIP --- components/gateway/Dockerfile | 2 +- components/gateway/bootstrap.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/gateway/Dockerfile b/components/gateway/Dockerfile index 51c49ed25..4e01de624 100644 --- a/components/gateway/Dockerfile +++ b/components/gateway/Dockerfile @@ -13,7 +13,7 @@ RUN apt-get -y update -qq && apt-get -y install gnupg2 ca-certificates curl && \ curl https://apt.opensips.org/opensips-org.gpg -o /usr/share/keyrings/opensips-org.gpg && \ echo "deb [signed-by=/usr/share/keyrings/opensips-org.gpg] https://apt.opensips.org bookworm ${OPENSIPS_VERSION}-${OPENSIPS_BUILD}" >/etc/apt/sources.list.d/opensips.list && \ echo "deb [signed-by=/usr/share/keyrings/opensips-org.gpg] https://apt.opensips.org bookworm cli-nightly" >/etc/apt/sources.list.d/opensips-cli.list && \ - apt-get -y update -qq && apt-get -y install opensips opensips-postgres-module opensips-cli python3-psycopg2 m4 && \ + apt-get -y update -qq && apt-get -y install opensips opensips-postgres-module opensips-cli python3-psycopg2 python3-sqlalchemy python3-sqlalchemy-utils && \ apt-get purge -y --auto-remove curl && \ rm -rf /var/lib/apt/lists/* diff --git a/components/gateway/bootstrap.sh b/components/gateway/bootstrap.sh index 50330507d..be515ffcc 100755 --- a/components/gateway/bootstrap.sh +++ b/components/gateway/bootstrap.sh @@ -6,8 +6,8 @@ set -e -ADMIN_DATABASE_URL="postgres://$DATABASE_USERNAME:$DATABASE_PASSWORD@$DATABASE_HOST:$DATABASE_PORT/postgres" -DATABASE_URL="postgres://$DATABASE_USERNAME:$DATABASE_PASSWORD@$DATABASE_HOST:$DATABASE_PORT" +ADMIN_DATABASE_URL="postgresql://$DATABASE_USERNAME:$DATABASE_PASSWORD@$DATABASE_HOST:$DATABASE_PORT/postgres" +DATABASE_URL="postgresql://$DATABASE_USERNAME:$DATABASE_PASSWORD@$DATABASE_HOST:$DATABASE_PORT" if [ "$1" = 'create_db' ]; then if [ "$2" = 'public_gateway' ]; then