From 2645b60d7f7d09b96e48df3fa0c44f6646c91c5c Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Mon, 14 Aug 2023 09:17:19 +1000 Subject: [PATCH] Make sub path in volume match mount path for consistency. --- session-manager/handlers/workshopsession.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/session-manager/handlers/workshopsession.py b/session-manager/handlers/workshopsession.py index bfb05e58..05e5454d 100644 --- a/session-manager/handlers/workshopsession.py +++ b/session-manager/handlers/workshopsession.py @@ -1658,17 +1658,17 @@ def resolve_security_policy(name): }, ) - workshop_volume_subpath = "workshop" + workshop_volume_subpath = "home/eduk8s" if storage_volume_subpath: workshop_volume_subpath = f"{storage_volume_subpath}/{workshop_volume_subpath}" - assets_volume_subpath = "assets" + assets_volume_subpath = "opt/assets" if storage_volume_subpath: assets_volume_subpath = f"{storage_volume_subpath}/{assets_volume_subpath}" - packages_volume_subpath = "packages" + packages_volume_subpath = "opt/packages" if storage_volume_subpath: packages_volume_subpath = f"{storage_volume_subpath}/{packages_volume_subpath}" @@ -2038,7 +2038,7 @@ def _apply_environment_patch(patch): if applications.is_enabled("docker"): docker_volumes = [{"name": "docker-socket", "emptyDir": {}}] - docker_volume_subpath = "docker" + docker_volume_subpath = "var/lib/docker" if storage_volume_subpath: docker_volume_subpath = f"{storage_volume_subpath}/{docker_volume_subpath}" @@ -2387,12 +2387,12 @@ def _apply_environment_patch(patch): ) if registry_volume_subpath: - registry_volume_subpath = f"{registry_volume_subpath}/registry" + registry_volume_subpath = f"{registry_volume_subpath}/var/lib/registry" else: - registry_volume_subpath = "registry" + registry_volume_subpath = "var/lib/registry" else: - registry_volume_subpath = "registry" + registry_volume_subpath = "var/lib/registry" if not registry_volume_name: registry_volume_name = f"{session_namespace}-registry"