From 16164edad764696f0209b996de6aa5e07c6f90dd Mon Sep 17 00:00:00 2001
From: yacchin1205 <968739+yacchin1205@users.noreply.github.com>
Date: Wed, 8 Apr 2026 07:13:46 +0900
Subject: [PATCH 1/2] Add MYNERVA_* environment variable forwarding for
 jupyter-mynerva

---
 README.md                              | 10 ++++++++++
 docker-compose.yml                     |  7 +++++++
 images/jupyterhub/jupyterhub_config.py |  4 ++++
 3 files changed, 21 insertions(+)

diff --git a/README.md b/README.md
index 687ac89..6b354c6 100644
--- a/README.md
+++ b/README.md
@@ -347,6 +347,16 @@ The configurations for (legacy) [NBWhisper](https://github.com/NII-cloud-operati
 
 See https://github.com/NII-cloud-operation/Jupyter-LC_docker#using-nbwhisper about details.
 
+**MYNERVA_SECRET_KEY**,
+**MYNERVA_OPENAI_API_KEY**, **MYNERVA_OPENAI_BASE_URL**,
+**MYNERVA_ANTHROPIC_API_KEY**,
+**MYNERVA_DEFAULT_PROVIDER**, **MYNERVA_DEFAULT_MODEL**,
+**MYNERVA_DEFAULTS_ONLY**
+
+The configurations for [jupyter-mynerva](https://github.com/NII-cloud-operation/jupyter-mynerva).
+
+See https://github.com/NII-cloud-operation/Jupyter-LC_docker#using-jupyter-mynerva about details.
+
 # Collecting container logs
 
 OperationHub outputs logs such as Nginx access logs and JupyterHub logs to docker logs.
diff --git a/docker-compose.yml b/docker-compose.yml
index f9e2dfd..ec34e4b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -69,6 +69,13 @@ services:
             NBWHISPER_SKYWAY_API_TOKEN: "${NBWHISPER_SKYWAY_API_TOKEN:-}"
             NBWHISPER_ROOM_MODE_FOR_WAITING_ROOM: "${NBWHISPER_ROOM_MODE_FOR_WAITING_ROOM:-}"
             NBWHISPER_ROOM_MODE_FOR_TALKING_ROOM: "${NBWHISPER_ROOM_MODE_FOR_TALKING_ROOM:-}"
+            MYNERVA_SECRET_KEY: "${MYNERVA_SECRET_KEY:-}"
+            MYNERVA_OPENAI_API_KEY: "${MYNERVA_OPENAI_API_KEY:-}"
+            MYNERVA_OPENAI_BASE_URL: "${MYNERVA_OPENAI_BASE_URL:-}"
+            MYNERVA_ANTHROPIC_API_KEY: "${MYNERVA_ANTHROPIC_API_KEY:-}"
+            MYNERVA_DEFAULT_PROVIDER: "${MYNERVA_DEFAULT_PROVIDER:-}"
+            MYNERVA_DEFAULT_MODEL: "${MYNERVA_DEFAULT_MODEL:-}"
+            MYNERVA_DEFAULTS_ONLY: "${MYNERVA_DEFAULTS_ONLY:-}"
         networks:
             - backend
         volumes:
diff --git a/images/jupyterhub/jupyterhub_config.py b/images/jupyterhub/jupyterhub_config.py
index 6a6424e..2d8c86f 100644
--- a/images/jupyterhub/jupyterhub_config.py
+++ b/images/jupyterhub/jupyterhub_config.py
@@ -158,6 +158,10 @@ def get_nbsearch_basedir(spawner):
     if key.startswith('NBWHISPER_') and os.environ[key]:
         c.Spawner.environment[key] = os.environ[key]
 
+for key in os.environ.keys():
+    if key.startswith('MYNERVA_') and os.environ[key]:
+        c.Spawner.environment[key] = os.environ[key]
+
 def mount_user_nbdir(spawner):
     spawner.authenticator.mount_nbdir(spawner.user.name)
 

From 81751c8f5a2282f535b76e38b16c51f93702793a Mon Sep 17 00:00:00 2001
From: yacchin1205 <968739+yacchin1205@users.noreply.github.com>
Date: Wed, 8 Apr 2026 07:24:45 +0900
Subject: [PATCH 2/2] Replace bitnami/oauth2-proxy:7 with official upstream
 image

---
 docker-compose.nbsearch.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.nbsearch.yml b/docker-compose.nbsearch.yml
index 49c0b86..611c72f 100644
--- a/docker-compose.nbsearch.yml
+++ b/docker-compose.nbsearch.yml
@@ -24,7 +24,7 @@ services:
       - backend
 
   nbsearch-solr-proxy:
-    image: bitnami/oauth2-proxy:7
+    image: quay.io/oauth2-proxy/oauth2-proxy:v7.15.1
     depends_on:
       - jupyterhub
       - nbsearch-solr-base-proxy