Skip to content

Commit

Permalink
Add environment variables for service identification (#123)
Browse files Browse the repository at this point in the history
  • Loading branch information
Andilun authored Jan 23, 2024
1 parent 293aafe commit 906b2f6
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 deletions.
3 changes: 2 additions & 1 deletion docker/jupyterhub/.env.prod
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ STATBANK_AUTHENTICATOR_IMAGE=nexus.ssb.no:8437/prod-bip/ssb/dapla/dapla-statbank
STATBANK_BASE_URL=https://i.ssb.no/
JUPYTERHUB_HTTP_REFERER=https://sl-jupyter-p.ssb.no/
POETRY_EXPERIMENTAL_SYSTEM_GIT_CLIENT=true # Needs to be enabled until this issue is fixed
# https://github.com/jelmer/dulwich/issues/1227
# https://github.com/jelmer/dulwich/issues/1227
DAPLA_ENVIRONMENT=PROD
3 changes: 2 additions & 1 deletion docker/jupyterhub/.env.staging
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ STATBANK_AUTHENTICATOR_IMAGE=nexus.ssb.no:8437/prod-bip/ssb/dapla/dapla-statbank
STATBANK_BASE_URL=https://i.test.ssb.no/
JUPYTERHUB_HTTP_REFERER=https://sl-jupyter-t.ssb.no/
POETRY_EXPERIMENTAL_SYSTEM_GIT_CLIENT=true # Needs to be enabled until this issue is fixed
# https://github.com/jelmer/dulwich/issues/1227
# https://github.com/jelmer/dulwich/issues/1227
DAPLA_ENVIRONMENT=TEST
1 change: 1 addition & 0 deletions docker/jupyterhub/jupyterhub_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,5 @@
# Set the hostname of the server. We use this environment variable to match with the
# one used in Dapla Jupyterhub.
"JUPYTERHUB_HTTP_REFERER": os.environ.get("JUPYTERHUB_HTTP_REFERER", "UNKNOWN"),
"DAPLA_ENVIRONMENT": os.environ.get("DAPLA_ENVIRONMENT", "UNKNOWN"),
}
3 changes: 3 additions & 0 deletions docker/jupyterlab/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -128,5 +128,8 @@ ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/oracle/21/client64/lib

# Add conda lib to LD_LIBRARY_PATH
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/conda/lib
# Set Dapla environment variables used to identify the service.
ENV DAPLA_SERVICE=JUPYTERLAB
ENV DAPLA_REGION=ON_PREM

USER $NB_UID

0 comments on commit 906b2f6

Please sign in to comment.