Commit e976883a authored by BAIRE Anthony's avatar BAIRE Anthony
Browse files

Ignore the image entrypoint when creating job/sandbox containers

Given that user can now push any docker images (!204), we will
have troubles if the user sets an arbitrary entrypoint (eg: using
the ENTRYPOINT instruction in the Dockerfile).

It is wiser to just ignore the entrypoint for the moment.

Note: in the future, we should remove Webapp.entrypoint and use the
ENTRYPOINT defined in the image instead.
parent 0979ca23
Pipeline #135853 failed with stages
in 1 second
...@@ -731,6 +731,7 @@ exec /.toolbox/bin/sshd -D ...@@ -731,6 +731,7 @@ exec /.toolbox/bin/sshd -D
""".format(prepare=prepare)] """.format(prepare=prepare)]
ctrl.sandbox.create_container(image, name=container, hostname=container, ctrl.sandbox.create_container(image, name=container, hostname=container,
entrypoint = [],
command = command, command = command,
host_config = ctrl.sandbox.create_host_config( host_config = ctrl.sandbox.create_host_config(
binds = { binds = {
...@@ -1175,6 +1176,7 @@ class JobManager(Manager): ...@@ -1175,6 +1176,7 @@ class JobManager(Manager):
# kill and mkfifo) # kill and mkfifo)
# - we display a warning if the memory limit was reached # - we display a warning if the memory limit was reached
# during the job # during the job
entrypoint = [],
command = ["/bin/sh", "-c", """ command = ["/bin/sh", "-c", """
pid= pid=
interrupted= interrupted=
......
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