Skip to content

Localhosting - Manage external database #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mbayangdiop95 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Localhosting - Manage external database #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .env.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ DATABASE_PORT=$DB_PORT
DATABASE_NAME=hexa-app
DATABASE_USER=hexa-app
DATABASE_PASSWORD=hexa-app
DATABASE_HOST=

# Networking
############
Expand Down Expand Up @@ -100,6 +101,7 @@ HUB_API_TOKEN=${HUB_API_TOKEN}
JUPYTERHUB_DATABASE_NAME=hexa-hub
JUPYTERHUB_DATABASE_USER=hexa-hub
JUPYTERHUB_DATABASE_PASSWORD=hexa-hub
JUPYTERHUB_DATABASE_HOST=

# Workspaces
#############
Expand All @@ -109,6 +111,8 @@ WORKSPACES_DATABASE_PORT=$DB_PORT
WORKSPACES_DATABASE_ROLE=hexa-app
WORKSPACES_DATABASE_DEFAULT_DB=hexa-app
WORKSPACES_DATABASE_PASSWORD=hexa-app
WORKSPACES_DATABASE_HOST=
WORKSPACES_DATABASE_PROXY_HOST=

# Proxy host doesn't work on local hostings of OH. This ENV var allows overriding it.
OVERRIDE_WORKSPACES_DATABASE_HOST=
Expand Down
8 changes: 4 additions & 4 deletions compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ x-app: &common
PIPELINE_API_URL: http://app:8000
# The hostname to access the database. It corresponds to an added extra
# host that is the Docker gateway (see above).
DATABASE_HOST: db
WORKSPACES_DATABASE_HOST: db
WORKSPACES_DATABASE_PROXY_HOST: db
DATABASE_HOST: ${DATABASE_HOST:-db}
WORKSPACES_DATABASE_HOST: ${WORKSPACES_DATABASE_HOST:-db}
WORKSPACES_DATABASE_PROXY_HOST: ${WORKSPACES_DATABASE_PROXY_HOST:-db}
# To control what hostname can access the backend
ADDITIONAL_ALLOWED_HOSTS: "app,frontend"
services:
Expand Down Expand Up @@ -135,7 +135,7 @@ services:
# network
HUB_IP: jupyterhub
# The URI of the database dedicated to the Jupyter Hub
HUB_DB_URL: postgresql://${JUPYTERHUB_DATABASE_USER:-hexa-hub}:${JUPYTERHUB_DATABASE_PASSWORD:-hexa-hub}@host.docker.internal:${DATABASE_PORT:-5432}/${JUPYTERHUB_DATABASE_NAME:-hexa-hub}
HUB_DB_URL: postgresql://${JUPYTERHUB_DATABASE_USER:-hexa-hub}:${JUPYTERHUB_DATABASE_PASSWORD:-hexa-hub}@${JUPYTERHUB_DATABASE_HOST:-host.docker.internal}:${DATABASE_PORT:-5432}/${JUPYTERHUB_DATABASE_NAME:-hexa-hub}
# The URI to authenticate by the backend through the local Docker network
AUTHENTICATION_URL: http://app:8000/notebooks/authenticate/
# The URI to get the default credentials by the backend through the local
Expand Down
Loading