Temporarily revert to use webdav for workspace. Bump to v1.2.1

whole-tale · Dec 30, 2022 · e3b8ddb · e3b8ddb
1 parent ea5510a
commit e3b8ddb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/gwvolman/tasks.py b/gwvolman/tasks.py
@@ -68,7 +68,8 @@ def create_volume(self, instance_id):
     _mount_bind(mountpoint, 'home', user)
 
     if ENABLE_WORKSPACES:
-        _mount_bind(mountpoint, 'workspace', tale)
+        # _mount_bind(mountpoint, 'workspace', tale)
+        _mount_girderfs(mountpoint, 'workspace', 'wt_work', tale['_id'], api_key)
         _mount_girderfs(mountpoint, 'versions', 'wt_versions', tale['_id'], api_key, hostns=True)
         _mount_girderfs(mountpoint, 'runs', 'wt_runs', tale['_id'], api_key, hostns=True)
 
@@ -738,7 +739,8 @@ def set_run_status(run, status):
 
     if session['_id'] is not None:
         _mount_girderfs(mountpoint, 'data', 'wt_dms', session['_id'], api_key, hostns=True)
-    _mount_bind(mountpoint, "run", {"runId": run["_id"], "taleId": tale["_id"]})
+    # _mount_bind(mountpoint, "run", {"runId": run["_id"], "taleId": tale["_id"]})
+    _mount_girderfs(mountpoint, 'workspace', 'wt_run', run["_id"], api_key)
     state.fs_mounted = mountpoint
 
     # Build the image for the run

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='gwvolman',
-    version='1.2',
+    version='1.2.1',
     description='An example girder worker extension',
     author='Kacper Kowalik',
     author_email='[email protected]',