Skip to content
Snippets Groups Projects
Commit 0b618b59 authored by Stefano Alberto Russo's avatar Stefano Alberto Russo
Browse files

Fixed bug in starting tasks on the internal computing resource on port 22....

Fixed bug in starting tasks on the internal computing resource on port 22. Removed old internal computing resource volumes.
parent 45339d9e
No related branches found
No related tags found
No related merge requests found
...@@ -94,18 +94,21 @@ class InternalSingleNodeComputingManager(SingleNodeComputingManager): ...@@ -94,18 +94,21 @@ class InternalSingleNodeComputingManager(SingleNodeComputingManager):
# Init run command #--cap-add=NET_ADMIN --cap-add=NET_RAW # Init run command #--cap-add=NET_ADMIN --cap-add=NET_RAW
run_command = 'sudo docker run --network=rosetta_default --name {}'.format(task.uuid) run_command = 'sudo docker run --network=rosetta_default --name {}'.format(task.uuid)
if task.container.interface_port == 22:
if not task.container.supports_custom_interface_port:
raise ErrorMessage('This task container use the port number 22 which often has issues on the internal computing resource, and does not support custom interface ports, so we cannot run it.')
else:
task_port = 2222
run_command += ' -eBASE_PORT={} '.format(task_port)
else:
task_port = task.container.interface_port
# Pass if any # Pass if any
if not task.requires_proxy and task.password: if not task.requires_proxy and task.password:
run_command += ' -eAUTH_PASS={} '.format(task.password) run_command += ' -eAUTH_PASS={} '.format(task.password)
# User data volume # User data volume
run_command += ' -v {}/user-{}:/data'.format(settings.LOCAL_USER_DATA_DIR, task.user.id) #run_command += ' -v {}/user-{}:/data'.format(settings.LOCAL_USER_DATA_DIR, task.user.id)
# Set registry string
#if task.container.registry == 'local':
# registry_string = 'localhost:5000/'
#else:
# registry_string = 'docker.io/'
# Host name, image entry command # Host name, image entry command
run_command += ' -h task-{} -d -t {}/{}:{}'.format(task.uuid, task.container.registry, task.container.image, task.container.tag) run_command += ' -h task-{} -d -t {}/{}:{}'.format(task.uuid, task.container.registry, task.container.image, task.container.tag)
...@@ -131,11 +134,13 @@ class InternalSingleNodeComputingManager(SingleNodeComputingManager): ...@@ -131,11 +134,13 @@ class InternalSingleNodeComputingManager(SingleNodeComputingManager):
task.id = tid task.id = tid
task.status = TaskStatuses.running task.status = TaskStatuses.running
task.interface_ip = task_ip task.interface_ip = task_ip
task.interface_port = task.container.interface_port task.interface_port = task_port
# Save # Save
task.save() task.save()
# Wait 10 seconds to see if the task is still up...
def _stop_task(self, task): def _stop_task(self, task):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment