Commit a279ef74 authored by Pascal Meunier's avatar Pascal Meunier

use valid Docker mount options for hydroshare on mygeohub

parent a4717523
......@@ -1619,7 +1619,8 @@ class ContainerDocker(Container):
if not os.path.exists(mount_pt):
log("trying to mount '%s' but it doesn't exist" % mount_pt)
continue
self.mounts += [[mount_pt, 'rw,noatime']]
# docker: noatime isn't a valid mount option
self.mounts += [[mount_pt, '']]
def groups(self):
""" find last user in /etc/passwd, and get the groups"""
......@@ -2296,7 +2297,7 @@ class ContainerDocker(Container):
for mount in self.mounts:
if not os.path.exists(mount[0]):
continue
args += ['-v', mount[0] + ':' + mount[0] + ':' + mount[0]]
args += ['-v', mount[0] + ':' + mount[0] + ':' + mount[1]]
# USER environment variable used for xauth operation
# Can't use the --user option because we need root to setup account and group information
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment