diff options
| author | Marc van den Hoogen <marc@vandenhoogen.eu> | 2017-08-18 13:40:11 +0200 |
|---|---|---|
| committer | Joffrey F <f.joffrey@gmail.com> | 2017-09-29 15:50:17 -0700 |
| commit | dc838067fd4ccdf381108acb03bac261924fd297 (patch) | |
| tree | d186d5383765f9b490c3465792895996b9d6558d /tests/acceptance/cli_test.py | |
| parent | 9430e5bf9d39bb72cd5f0914a1f52c3999234c08 (diff) | |
Add shm_size to build-options (issue #3866)
* Add shm_size to build configuration
* Make it possible to enlarge/customize shm size during build
* Value in bytes, or use string like "512M" or "1G" ...
* Add to compose format 2.3 and (provisionally) >=3.5 format
* Add automated test for shm_size in build-opts
Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>
Made unit tests compatible with previously added shm_size build-option
Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>
Also support shm_size build-opt when conf override
Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>
Automated test for shm_size build-option
Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>
Schema 3.4, add shm_size to schema 2.3, updated const.py
Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>
Corrected typo in config_schema_v3.4
Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>
Add support for g/m/k units for shm_size in build-opts
Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>
Reorder imports in service.py
Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>
Diffstat (limited to 'tests/acceptance/cli_test.py')
| -rw-r--r-- | tests/acceptance/cli_test.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py index b8cece49..d84c4715 100644 --- a/tests/acceptance/cli_test.py +++ b/tests/acceptance/cli_test.py @@ -527,6 +527,12 @@ class CLITestCase(DockerClientTestCase): ] assert not containers + def test_build_shm_size_build_option(self): + pull_busybox(self.client) + self.base_dir = 'tests/fixtures/build-shm-size' + result = self.dispatch(['build', '--no-cache'], None) + assert 'shm_size: 96' in result.stdout + def test_bundle_with_digests(self): self.base_dir = 'tests/fixtures/bundle-with-digests/' tmpdir = py.test.ensuretemp('cli_test_bundle') |