htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

just remove subfolders of CONTAINER_WORKSPACE_PATH, do not create target folder manually.

Browse Source
This commit is contained in:
Ralf Teusner
2016-01-25 11:19:56 +01:00
parent d1e0f31963
commit f53457644c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/docker_client.rb
View File

@ -21,7 +21,7 @@ class DockerClient
end end
def self.clean_container_workspace(container) def self.clean_container_workspace(container)
container.exec(['bash', '-c', 'rm -rf ' + CONTAINER_WORKSPACE_PATH]) container.exec(['bash', '-c', 'rm -rf ' + CONTAINER_WORKSPACE_PATH + '/*'])
=begin =begin
local_workspace_path = local_workspace_path(container) local_workspace_path = local_workspace_path(container)
if local_workspace_path && Pathname.new(local_workspace_path).exist? if local_workspace_path && Pathname.new(local_workspace_path).exist?
@ -145,8 +145,8 @@ class DockerClient
begin begin
# create target folder # create target folder, TODO re-active this when we remove shared folder bindings
container.exec(['bash', '-c', 'mkdir ' + CONTAINER_WORKSPACE_PATH]) #container.exec(['bash', '-c', 'mkdir ' + CONTAINER_WORKSPACE_PATH])
#container.exec(['bash', '-c', 'chown -R python ' + CONTAINER_WORKSPACE_PATH]) #container.exec(['bash', '-c', 'chown -R python ' + CONTAINER_WORKSPACE_PATH])
#container.exec(['bash', '-c', 'chgrp -G python ' + CONTAINER_WORKSPACE_PATH]) #container.exec(['bash', '-c', 'chgrp -G python ' + CONTAINER_WORKSPACE_PATH])
rescue StandardError => error rescue StandardError => error
@ -163,7 +163,7 @@ class DockerClient
Rails.logger.error('insert tar: Rescued from StandardError: ' + error.to_s) Rails.logger.error('insert tar: Rescued from StandardError: ' + error.to_s)
end end
Rails.logger.info('command: tar -xf ' + CONTAINER_WORKSPACE_PATH + '/' + dir.split('/tmp/')[1] + ' -C ' + CONTAINER_WORKSPACE_PATH) #Rails.logger.info('command: tar -xf ' + CONTAINER_WORKSPACE_PATH + '/' + dir.split('/tmp/')[1] + ' -C ' + CONTAINER_WORKSPACE_PATH)
begin begin
# untar the tar file placed in the CONTAINER_WORKSPACE_PATH # untar the tar file placed in the CONTAINER_WORKSPACE_PATH