Skip to content

Commit 8a6cd0a

Browse files
committed
chore(controller): remove default bash env
1 parent 6d388e9 commit 8a6cd0a

2 files changed

Lines changed: 8 additions & 16 deletions

File tree

rootfs/api/models/app.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -130,22 +130,14 @@ def _get_command(self, container_type):
130130
if release.build.dockerfile or not release.build.sha:
131131
# has profile
132132
if release.build.procfile and container_type in release.build.procfile:
133-
cmd = release.build.procfile[container_type]
134-
# if the entrypoint is `/bin/bash -c`, we want to supply the list
135-
# as a script. Otherwise, we want to send it as a list of arguments.
136-
if self._get_entrypoint(container_type) == ['/bin/bash', '-c']:
137-
return [cmd]
138-
else:
139-
return cmd.split()
133+
return release.build.procfile[container_type].split()
140134
return []
141135

142136
def _get_entrypoint(self, container_type):
143137
"""
144138
Return the kubernetes "container command" to be sent off to the scheduler.
145139
"""
146-
if container_type == 'cmd':
147-
return []
148-
entrypoint = ['/bin/bash', '-c']
140+
entrypoint = []
149141
release = self.release_set.filter(failed=False).latest()
150142
if release.build.procfile \
151143
and release.build.sha \

rootfs/api/tests/test_pods.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -521,22 +521,22 @@ def test_command_good(self, mock_requests):
521521
# switch to docker image app
522522
build.sha = ''
523523
build.save()
524-
self.assertEqual(app._get_command('web'), ["node server.js"])
524+
self.assertEqual(app._get_command('web'), ["node", "server.js"])
525525

526526
# switch to dockerfile app
527527
build.sha = 'european-swallow'
528528
build.dockerfile = 'dockerdockerdocker'
529529
build.save()
530-
self.assertEqual(app._get_command('web'), ["node server.js"])
530+
self.assertEqual(app._get_command('web'), ["node", "server.js"])
531531
self.assertEqual(app._get_command('cmd'), [])
532532

533533
# ensure we can override the cmd process type in a Procfile
534534
build.procfile['cmd'] = 'node server.js'
535535
build.save()
536536
self.assertEqual(app._get_entrypoint('cmd'), [])
537537
self.assertEqual(app._get_command('cmd'), ["node", "server.js"])
538-
self.assertEqual(app._get_entrypoint('worker'), ["/bin/bash", "-c"])
539-
self.assertEqual(app._get_command('worker'), ["node worker.js"])
538+
self.assertEqual(app._get_entrypoint('worker'), [])
539+
self.assertEqual(app._get_command('worker'), ["node", "worker.js"])
540540

541541
# for backwards compatibility if no Procfile is supplied
542542
build.procfile = {}
@@ -577,7 +577,7 @@ def test_run_command_good(self, mock_requests):
577577
response = self.client.post(url, body)
578578
self.assertEqual(response.status_code, 200, response.data)
579579
app = App.objects.get(id=app_id)
580-
self.assertEqual(app._get_entrypoint('web'), ['/bin/bash', '-c'])
580+
self.assertEqual(app._get_entrypoint('web'), [])
581581

582582
# docker image workflow
583583
build.dockerfile = ''
@@ -637,7 +637,7 @@ def test_run_not_fail_on_debug(self, mock_requests):
637637
response = self.client.post(url, body)
638638
self.assertEqual(response.status_code, 200, response.data)
639639
app = App.objects.get(id=app_id)
640-
self.assertEqual(app._get_entrypoint('web'), ['/bin/bash', '-c'])
640+
self.assertEqual(app._get_entrypoint('web'), [])
641641

642642
def test_scaling_does_not_add_run_proctypes_to_structure(self, mock_requests):
643643
"""Test that app info doesn't show transient "run" proctypes."""

0 commit comments

Comments
 (0)