tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-10-31 19:24:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,257 Commits 22 Branches 289 Tags
Commit Graph

30 Commits

Author SHA1 Message Date
Joffrey F
66ed9b492e Don't append slugs to containers created by "up" 
This change reverts the new naming convention introduced in 1.23 for service containers.
One-off containers will now use a slug instead of a sequential number as they do not
present addressability concerns and benefit from being capable of running in parallel.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-28 14:24:30 -08:00
Joffrey F
187f48e338 Don't attempt to truncate a None value in Container.slug 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-31 14:46:18 -07:00
Joffrey F
5916639383 Preserve container numbers, add slug to prevent name collisions 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-12 12:07:52 -07:00
Joffrey F
4e2de3c1ff Replace sequential container indexes with randomly generated IDs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-11 15:26:58 -07:00
Sorawis Nilparuk
bb16d9e951 Add health string generator to match docker ps output 2018-02-12 12:10:05 -08:00
Joffrey F
b13ec16e11 Replace unittest-style asserts with pytest asserts 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-04 14:38:28 -08:00
Joffrey F
04e5925a23 Use docker SDK 2.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-14 15:36:08 -08:00
Joffrey F
7dd2e33057 Only allow log streaming if logdriver is json-file or journald 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-13 11:56:26 -07:00
Aanand Prasad
adb8de367e Merge pull request #2388 from dnephin/fix_long_lines 
Wrap long lines
 2016-02-25 16:52:33 -08:00
Daniel Nephin
421981e7d2 Use 12 characters for the short id to match docker and fix backwards compatibility. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-08 12:18:48 -05:00
Daniel Nephin
57fc85b457 Wrap long lines and restrict lines to 105 characters. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-04 19:05:39 -05:00
Daniel Nephin
475a091768 Update pre-commit config to enforace that future imports exist in all files. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-07 13:09:03 -05:00
Karol Duleba
d83d6306c9 Use custom container name in logs. Fixes #1851 
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
 2015-09-07 14:03:00 +01:00
Daniel Nephin
54973e8200 Remove flake8 ignores and wrap the longest lines to 140 char. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-26 12:53:11 -04:00
Daniel Nephin
809443d6d0 Support python 3 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 10:37:29 -04:00
Daniel Nephin
59d4f304ee Run pre-commit on all files 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-24 17:04:50 -04:00
Aanand Prasad
b0cb31c186 Use 'top' instead of 'sleep' as a dummy command 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-05-21 16:24:29 +01:00
Daniel Nephin
62059d55e6 Add migration warning and option to migrate to labels. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-05-18 10:55:12 -04:00
Daniel Nephin
ed50a0a3a0 Resolves #1066, use labels to identify containers 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-05-18 10:47:26 -04:00
akoskaaa
f9ea5ecf40 [pep8] make test files and config files pep8 valid 
Signed-off-by: akoskaaa <akos.hochrein@prezi.com>
 2015-03-25 20:20:38 -07:00
Aanand Prasad
2af7693e64 WIP: rename Fig to Compose 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:00:23 +00:00
Aanand Prasad
cbd3ca07c4 Handle Swarm-style prefixed names in Container.from_ps() 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 20:38:06 +00:00
Daniel Nephin
dbd723659b Add container.get() which removes the duplication of container.inspect() in every property, and provides a nicer interface for querying container data. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-09-09 20:59:28 -04:00
Daniel Nephin
7fd37c89b9 Remove fig.packages replace with real deps. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-09-05 11:44:49 -07:00
Daniel Nephin
c48ee5caef Add a new fig command for retrieving the locally bound port of a service. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-09-04 22:09:12 -04:00
Daniel Nephin
294453433d Remove extra calls to docker server. 
Fix broken integration tests

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-08-10 11:24:20 -04:00
Ben Firshman
d0f65906ed Update to docker-py 0.3.2 
From 59ced5700c

Now only supports Docker 1.0.0 / remote API v1.12.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-06-25 11:56:20 +01:00
d11wtq
3a342fb25d Use busybox in fixtures, instead of ubuntu 
Signed-off-by: d11wtq <chris@w3style.co.uk>
 2014-06-11 10:25:50 +00:00
Ben Firshman
10725136d8 Add tests for names on containers 2014-04-29 09:20:29 +01:00
Ben Firshman
ca7151aeb1 Split tests into unit and integration 2014-04-25 22:58:21 +01:00