commit/galaxy-central: 2 new changesets
2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/ba83dd543a46/ Changeset: ba83dd543a46 Branch: BjoernGruening/add-u-user-argument-to-the-docker-call-1414094590823 User: BjoernGruening Date: 2014-10-23 20:03:49+00:00 Summary: Add `-u $USER` argument to the docker call. Affected #: 1 file diff -r ae33952d52dcf4f682b317aaf01dcaa4d79d79b9 -r ba83dd543a46720653b8d585b09d866d740db1db lib/galaxy/web/base/interactive_environments.py --- a/lib/galaxy/web/base/interactive_environments.py +++ b/lib/galaxy/web/base/interactive_environments.py @@ -159,6 +159,7 @@ """ Generate and return the docker command to execute """ - return '%s run -d --sig-proxy=true -p %s:%s -v "%s:/import/" %s' % \ - (self.attr.viz_config.get("docker", "command"), self.attr.PORT, self.attr.docker_port, - temp_dir, self.attr.viz_config.get("docker", "image")) + return '%s run -d -u %s --sig-proxy=true -p %s:%s -v "%s:/import/" %s' % \ + (self.attr.viz_config.get("docker", "command"), os.geteuid(), + self.attr.PORT, self.attr.docker_port, + temp_dir, self.attr.viz_config.get("docker", "image")) https://bitbucket.org/galaxy/galaxy-central/commits/49996549bac4/ Changeset: 49996549bac4 User: jmchilton Date: 2014-10-24 16:25:18+00:00 Summary: Merged in BjoernGruening/galaxy-central-6/BjoernGruening/add-u-user-argument-to-the-docker-call-1414094590823 (pull request #540) Add `-u $USER` argument to the docker call. Affected #: 1 file diff -r ae33952d52dcf4f682b317aaf01dcaa4d79d79b9 -r 49996549bac445dcda93df7f1ca5010b0dddcc84 lib/galaxy/web/base/interactive_environments.py --- a/lib/galaxy/web/base/interactive_environments.py +++ b/lib/galaxy/web/base/interactive_environments.py @@ -159,6 +159,7 @@ """ Generate and return the docker command to execute """ - return '%s run -d --sig-proxy=true -p %s:%s -v "%s:/import/" %s' % \ - (self.attr.viz_config.get("docker", "command"), self.attr.PORT, self.attr.docker_port, - temp_dir, self.attr.viz_config.get("docker", "image")) + return '%s run -d -u %s --sig-proxy=true -p %s:%s -v "%s:/import/" %s' % \ + (self.attr.viz_config.get("docker", "command"), os.geteuid(), + self.attr.PORT, self.attr.docker_port, + temp_dir, self.attr.viz_config.get("docker", "image")) Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.
participants (1)
-
commits-noreply@bitbucket.org