Skip to content

Conversation

@aanand
Copy link

@aanand aanand commented Mar 21, 2016

shin- and others added 5 commits March 21, 2016 12:12
Signed-off-by: Joffrey F <joffrey@docker.com>
Signed-off-by: Joffrey F <joffrey@docker.com>
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
@dnephin
Copy link

dnephin commented Mar 21, 2016

LGTM

@aanand
Copy link
Author

aanand commented Mar 21, 2016

Bit confused by the test failure, which I can't reproduce locally:

____________________________ ServiceTest.test_tmpfs ____________________________
tests/integration/service_test.py:881: in test_tmpfs
    container = create_and_start_container(service)
tests/integration/service_test.py:35: in create_and_start_container
    container = service.create_container(**override_options)
compose/service.py:269: in create_container
    previous_container=previous_container,
compose/service.py:634: in _get_container_create_options
    one_off=one_off)
compose/service.py:671: in _get_container_host_config
    tmpfs=options.get('tmpfs'),
.tox/py34/lib/python3.4/site-packages/docker/api/container.py:141: in create_host_config
    return utils.create_host_config(*args, **kwargs)
.tox/py34/lib/python3.4/site-packages/docker/utils/utils.py:785: in create_host_config
    raise host_config_version_error('tmpfs', '1.22')
E   docker.errors.InvalidVersion: tmpfs param is not supported in API versions < 1.22

@aanand
Copy link
Author

aanand commented Mar 21, 2016

Just realised down still doesn't clean up still-running one-off containers. Working on a fix now.

@dnephin
Copy link

dnephin commented Mar 21, 2016

I think this test is missing a skip for the Docker 1.9, I'll prepare a fix.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
@aanand
Copy link
Author

aanand commented Mar 21, 2016

Pushed fix for still-running one-off containers

@dnephin
Copy link

dnephin commented Mar 21, 2016

Fix for the test failure: #3179
LGTM

@shin-
Copy link

shin- commented Mar 21, 2016

LGTM!

aanand added a commit that referenced this pull request Mar 22, 2016
Remove one-off containers in `rm` and `down`
@aanand aanand merged commit a20b84e into docker:master Mar 22, 2016
@aanand aanand deleted the 2774-off-one-offs branch March 22, 2016 10:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants