Daniel Nephin
709bd9c363
Bump 1.5.0rc1
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 12:59:31 -04:00
Daniel Nephin
8cecf2e02d
Merge remote-tracking branch 'docker/release' into bump-1.5.0rc1
2015-10-14 12:59:25 -04:00
Daniel Nephin
d59c759cdd
Merge pull request #2082 from dnephin/bump-1.4.2
...
[WIP] Release 1.4.2
2015-09-22 14:17:04 -04:00
Daniel Nephin
7b5d5fcd58
Bump 1.4.2
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-22 12:26:51 -04:00
Daniel Nephin
d01f712376
Fix a test case that assumes busybox image id.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-22 12:26:51 -04:00
Daniel Nephin
ac75d35927
Fix #1961 - docker-compose up should attach to all containers with no service names are specified, and add tests.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-22 11:09:59 -04:00
Daniel Nephin
605d7f26e7
Merge pull request #2027 from dnephin/bump-1.4.1
...
Bump 1.4.1
2015-09-15 17:47:09 -04:00
Daniel Nephin
b24ca75914
Bump 1.4.1
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-14 18:18:01 -04:00
Daniel Nephin
2b75741e5a
Fix cherry-pick errors.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-11 14:22:35 -04:00
Daniel Nephin
7ff8c2b224
Resolves #1804
...
Fix mutation of service.options when a label or environment variable is specified in the config.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-10 19:32:30 -04:00
Daniel Nephin
db31adc208
Extract link names into a function.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-10 19:32:30 -04:00
Daniel Nephin
805f6a7683
Refactor network_mode logic out of Service.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-10 19:32:30 -04:00
Daniel Nephin
d92f323e6d
Fixes #1757 - include all service properties in the config_dict()
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-10 19:32:30 -04:00
Daniel Nephin
cf2dbf55b8
Cleanup some project logic.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-10 19:32:30 -04:00
Daniel Nephin
8d4c724c2d
Sort config keys
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-10 19:32:30 -04:00
Daniel Nephin
9cb2770da4
Make external_links a regular service.option so that it's part of the config hash
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-10 19:32:30 -04:00
Daniel Nephin
6a23491fa9
Resolves #1856 , fix regression in #1645 . Includes some refactoring to make testing easier.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-10 19:32:30 -04:00
Mazz Mosley
294b9742be
Handle all exceptions
...
If we get back an error that wasn't an APIError, it was causing the
thread to hang. This catch all, while I appreciate feels risky to
have a catch all, is better than not catching and silently failing,
with a never ending thread.
If something worse than an APIError has gone wrong, we want to stop
the incredible journey of what we're doing.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-10 19:32:30 -04:00
Aanand Prasad
a9b1f15f92
Fix volume path warning
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-10 19:32:29 -04:00
Aanand Prasad
aa7c7cdf93
Merge pull request #1763 from aanand/bump-1.4.0
...
Bump 1.4.0
2015-08-11 18:38:49 +01:00
Aanand Prasad
28139ab90d
Bump 1.4.0
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-11 16:00:20 +01:00
Aanand Prasad
d0792b49fa
Merge pull request #1846 from aanand/fix-mem-limit-options
...
Fix mem_limit and memswap_limit regression
(cherry picked from commit 93cc7e3751 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-11 16:00:20 +01:00
Mazz Mosley
5548aa5c79
Merge pull request #1833 from aanand/deprecate-relative-volumes-without-dot
...
Show a warning when a relative path is specified without "./"
(cherry picked from commit 52733f6996 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Conflicts:
compose/config.py
tests/unit/config_test.py
2015-08-11 12:57:42 +01:00
Ben Firshman
16440ff055
Merge pull request #1829 from vlajos/typofixes-vlajos-20150807
...
typofix - https://github.com/vlajos/misspell_fixer
(cherry picked from commit b7baa899e2 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-11 09:44:28 +01:00
Ben Firshman
7850d6de45
Merge pull request #1832 from aanand/use-docker-1.8.0-rc3
...
Test against Docker 1.8.0 RC3
(cherry picked from commit afc9629c59 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-11 09:44:28 +01:00
Ben Firshman
74b4fb89bb
Merge pull request #1835 from aanand/fix-crash-when-container-has-no-name
...
Ignore containers that don't have a name
(cherry picked from commit 4e12ce39b3 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-11 09:44:27 +01:00
Ben Firshman
22ccf35fa1
Merge pull request #1836 from aanand/use-overlay-driver-in-tests
...
Use overlay driver in tests
(cherry picked from commit 197d332620 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-11 09:44:27 +01:00
Aanand Prasad
7ad1fe24bd
Merge pull request #1815 from aanand/abort-if-daemon-cant-start
...
Abort tests if daemon fails to start
(cherry picked from commit f7b9daf927 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-11 09:44:27 +01:00
Aanand Prasad
450ba978c1
Merge pull request #1812 from moxiegirl/install-update-for-1811
...
Closes #1811 for Toolbox
(cherry picked from commit 6cb8e512f2 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Conflicts:
docs/install.md
2015-08-10 12:51:10 +01:00
Aanand Prasad
3d6946417d
Merge pull request #1800 from aanand/volume-driver-support
...
Support volume_driver
(cherry picked from commit 41b9df7639 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-31 16:29:24 +01:00
Daniel Nephin
31cf63b374
Merge pull request #1799 from d2bit/clean-rails-quickstart-guide-db-config
...
Remove useless postgres 'port' configuration
(cherry picked from commit b25f05bed4 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-31 15:46:07 +01:00
Daniel Nephin
5c853c4a2c
Merge pull request #1794 from aanand/add-test-for-trailing-slash-volume-copy
...
Add test for trailing slash volume copying bug
(cherry picked from commit ea7276031c )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-31 15:29:44 +01:00
Aanand Prasad
ad922cd7a1
Merge pull request #1787 from aanand/fix-duplicate-volume-bind
...
Fix "Duplicate volume mount" error when config has trailing slashes
(cherry picked from commit dc7bdd10d4 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-31 15:29:44 +01:00
Aanand Prasad
49bafdc4cd
Merge pull request #1777 from aanand/update-api-version
...
Update API version to 1.19
(cherry picked from commit 276e369c31 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-31 15:29:44 +01:00
Aanand Prasad
989b2491b9
Merge pull request #1780 from gheart/specify_api_version_via_env
...
Allow API version specification via env var
(cherry picked from commit 2759ab5ab6 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-31 15:29:44 +01:00
Aanand Prasad
ca2ce3a034
Merge pull request #1779 from aanand/mac-binary-error-hint
...
Add hint about OS X binary compatibility
(cherry picked from commit 1496734cbb )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-31 15:29:43 +01:00
Aanand Prasad
dfe9dccab8
Merge pull request #1774 from moxiegirl/test-entire-build
...
Contributors can build public docs with compose docs in context
(cherry picked from commit 487eae3b7b )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-31 15:29:43 +01:00
Aanand Prasad
d456c3909d
Merge remote-tracking branch 'origin/release' into bump-1.4.0
2015-07-23 16:46:57 +01:00
Aanand Prasad
29ceef6d93
Merge pull request #1706 from aanand/bump-1.3.3
...
Bump 1.3.3
2015-07-16 11:40:20 +01:00
Aanand Prasad
8cff440800
Bump 1.3.3
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-16 11:21:01 +01:00
Mazz Mosley
e5f6ae767d
Merge pull request #1704 from aanand/fix-timeout-type
...
Make sure up/restart/stop timeout is an int
(cherry picked from commit c7dccccd1f )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-16 11:19:21 +01:00
Aanand Prasad
cd44179305
Merge pull request #1705 from aanand/fix-labels-null
...
Handle case where /containers/json returns "Labels": null
(cherry picked from commit 7b9664be8e )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-15 17:33:08 +01:00
Aanand Prasad
c3c5b354b8
Merge pull request #1690 from aanand/bump-1.3.2
...
Bump 1.3.2
2015-07-14 18:04:22 +01:00
Aanand Prasad
95cf195dbd
Bump 1.3.2
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-14 17:40:43 +01:00
Aanand Prasad
a80afd67ab
Merge pull request #1688 from aanand/use-docker-py-1.3.0
...
Use docker-py 1.3.0
(cherry picked from commit 1e71eebc74 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-14 17:29:25 +01:00
Aanand Prasad
4bc4d273ac
Merge pull request #1643 from aanand/warn-about-legacy-one-off-containers
...
Show an error on 'run' when there are legacy one-off containers
(cherry picked from commit 81707ef1ad )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-14 17:29:12 +01:00
Aanand Prasad
4911c77134
Merge pull request #1489 from dnephin/faster_integration_tests
...
Faster integration tests
(cherry picked from commit 5231288b4e )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Conflicts:
compose/cli/main.py
2015-07-14 17:28:54 +01:00
Aanand Prasad
c1b9a76a54
Merge pull request #1658 from aanand/fix-smart-recreate-nonexistent-image
...
Fix smart recreate when 'image' is changed to something nonexistent
(cherry picked from commit 2bc10db545 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-14 17:25:33 +01:00
Aanand Prasad
c31e25af72
Merge pull request #1642 from aanand/fix-1573
...
Fix bug where duplicate container is leftover after 'up' fails
(cherry picked from commit f42fd6a3ad )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-14 17:25:03 +01:00
Aanand Prasad
c8295d36cc
Merge pull request #1644 from aanand/fix-rm-bug
...
Stop 'rm' and 'ps' listing services not defined in the current file
(cherry picked from commit d85688892c )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-14 17:24:15 +01:00
Aanand Prasad
b12c29479e
Merge pull request #1521 from dano/validate-service-names
...
Validate that service names passed to Project.containers aren't bogus.
(cherry picked from commit bc14c473c9 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-14 17:24:15 +01:00
Aanand Prasad
cd47829f3d
Merge pull request #1588 from aanand/bump-1.3.1
...
Bump 1.3.1
2015-06-22 08:01:13 -07:00
Aanand Prasad
4d4ef4e0b3
Bump 1.3.1
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-21 17:32:36 -07:00
Aanand Prasad
882ef2ccd8
Merge pull request #1578 from aanand/fix-migrate-help
...
Fix 'docker-compose help migrate-to-labels'
(cherry picked from commit c8751980f9 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-21 17:28:18 -07:00
Aanand Prasad
d6cd76c3c1
Merge pull request #1570 from aanand/fix-build-pull
...
Explicitly set pull=False when building
(cherry picked from commit 4f83a18912 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-21 17:28:09 -07:00
Ben Firshman
bd0be2cdc7
Merge pull request #1580 from aanand/dont-set-network-mode-when-none-is-specified
...
Don't set network mode when none is specified
(cherry picked from commit 911cd60360 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-21 17:27:59 -07:00
Aanand Prasad
a8d7ebd987
Merge pull request #1461 from aanand/bump-1.3.0
...
Bump 1.3.0
2015-06-18 11:41:40 -07:00
Aanand Prasad
00f61196a4
Bump 1.3.0
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-18 11:25:10 -07:00
Aanand Prasad
c21d6706b6
Merge pull request #1565 from aanand/use-docker-1.7.0
...
Use docker 1.7.0 and docker-py 1.2.3
(cherry picked from commit 8ffeaf2a54 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Conflicts:
Dockerfile
2015-06-18 11:25:10 -07:00
Aanand Prasad
c3c5d91c47
Merge pull request #1563 from moxiegirl/hugo-test-fixes
...
Hugo final 1.7 Documentation PR -- please read carefully
(cherry picked from commit 4e73e86d94 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-18 11:25:10 -07:00
Aanand Prasad
7fa4cd1214
Merge pull request #1552 from aanand/add-upgrade-instructions
...
Add upgrading instructions to install docs
(cherry picked from commit bc7161b475 )
2015-06-16 16:29:18 -07:00
Aanand Prasad
f353d9fbc0
Merge pull request #1406 from vdemeester/667-compose-port-scale
...
Fixing docker-compose port with scale (#667 )
(cherry picked from commit 5b2a0cc73d )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-15 11:22:08 -07:00
Daniel Nephin
09018855ce
Merge pull request #1550 from aanand/update-docker-py
...
Update setup.py with new docker-py minimum
(cherry picked from commit b3b44b8e4c )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-15 11:22:08 -07:00
Aanand Prasad
719954b02f
Merge pull request #1545 from moxiegirl/test-tooling
...
Updated for new documentation tooling
(cherry picked from commit aaccd12d3d )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-15 11:22:08 -07:00
Daniel Nephin
67bc3fabe4
Merge pull request #1544 from aanand/fix-volume-deduping
...
Fix volume binds de-duplication
(cherry picked from commit 77e594dc94 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-15 11:22:08 -07:00
Daniel Nephin
e724a346c7
Merge pull request #1526 from aanand/remove-start-or-create-containers
...
Remove Service.start_or_create_containers()
(cherry picked from commit 38a11c4c28 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-15 11:22:08 -07:00
Daniel Nephin
87b4545b44
Merge pull request #1508 from thaJeztah/update-dockerproject-links
...
Update dockerproject.com links
(cherry picked from commit 417e6ce0c9 )
2015-06-15 11:22:07 -07:00
Aanand Prasad
58a7844129
Merge pull request #1482 from bfirsh/add-build-and-dist-to-dockerignore
...
Make it possible to run tests remotely
(cherry picked from commit c8e096e089 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-15 11:22:07 -07:00
Daniel Nephin
4353f7b9f9
Merge pull request #1475 from fordhurley/patch-1
...
Fix markdown formatting for `--service-ports` example
(cherry picked from commit d64bf88e26 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-15 11:22:07 -07:00
Aanand Prasad
8f8693e13e
Merge pull request #1480 from bfirsh/change-sigint-test-to-use-sigstop
...
Change kill SIGINT test to use SIGSTOP
(cherry picked from commit a15f996744 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-15 11:22:07 -07:00
Ben Firshman
363a6563c7
Merge pull request #1537 from aanand/reorder-service-utils
...
Reorder service.py utility methods
(cherry picked from commit e3525d64b5 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-15 11:22:07 -07:00
Aanand Prasad
59d6af73fa
Merge pull request #1539 from bfirsh/add-image-affinity-to-test
...
Add image affinity to test script
(cherry picked from commit 4c2112dbfd )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-15 11:22:07 -07:00
Aanand Prasad
cd7f67018e
Merge pull request #1466 from noironetworks/changing-scale-to-warning
...
Modified scale awareness from exception to warning
(cherry picked from commit 7d2a89427c )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-15 11:22:07 -07:00
Ben Firshman
b7e8770c4f
Merge pull request #1538 from thieman/tnt-serivce-misspelled
...
Correct misspelling of "Service" in an error message
(cherry picked from commit bd246fb011 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-15 11:22:07 -07:00
Aanand Prasad
ad4cc5d6df
Merge pull request #1497 from aanand/use-1.7-rc1
...
Run tests against Docker 1.7 RC2
(cherry picked from commit 0e9ccd36f3 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-15 11:22:06 -07:00
Aanand Prasad
ca14ed68f7
Merge pull request #1533 from edmorley/update-b2d-shellinit-example
...
Docs: Update boot2docker shellinit example to use 'eval'
(cherry picked from commit 17e03b29f9 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-15 11:22:06 -07:00
Daniel Nephin
71514cb380
Merge pull request #1531 from aanand/test-crash-resilience
...
Test that data volumes now survive a crash when recreating
(cherry picked from commit 87c30ae6e4 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-15 11:22:06 -07:00
Daniel Nephin
8212f1bd45
Merge pull request #1529 from aanand/update-dockerpty
...
Update dockerpty to 0.3.4
(cherry picked from commit 95b2eaac04 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-09 18:24:14 -04:00
Daniel Nephin
dca3bbdea3
Merge pull request #1527 from aanand/remove-logging-on-run-rm
...
Remove logging on run --rm
(cherry picked from commit 5578ccbb01 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-09 14:39:53 -04:00
Daniel Nephin
8ed7dfef6f
Merge pull request #1525 from aanand/fix-duplicate-logging
...
Fix duplicate logging on up/run
(cherry picked from commit e2b790f732 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-09 14:39:52 -04:00
Daniel Nephin
631f5be02f
Merge pull request #1481 from albers/completion-smart-recreate
...
Support --x-smart-recreate in bash completion
(cherry picked from commit 9a0bb325f2 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-09 14:39:52 -04:00
Ben Firshman
4f4ea2a402
Merge pull request #1325 from sdurrheimer/master
...
Zsh completion for docker-compose
(cherry picked from commit b638728d6c )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Conflicts:
docs/completion.md
2015-06-09 14:39:50 -04:00
Aanand Prasad
5a5bffebd1
Merge pull request #1464 from twhiteman/bug1461
...
Possible division by zero error when pulling an image - fixes #1463
(cherry picked from commit d0e87929a1 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-09 14:39:05 -04:00
Aanand Prasad
8749bc0844
Build Python 2.7.9 in Docker image
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-02 11:39:17 +01:00
Aanand Prasad
f3d0c63db2
Make sure we use Python 2.7.9 and OpenSSL 1.0.1 when building OSX binary
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-02 11:39:17 +01:00
Aanand Prasad
93a846db31
Report Python and OpenSSL versions in --version output
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Conflicts:
compose/cli/utils.py
2015-06-02 11:39:17 +01:00
Aanand Prasad
686c25d50f
Script to prepare OSX build environment
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-27 17:52:23 +01:00
Aanand Prasad
ef6555f084
Merge branch 'release' into bump-1.3.0
2015-05-26 17:45:28 +01:00
Ben Firshman
3c6652c101
Merge pull request #1308 from aanand/update-docs-1.2.0
...
Update docs for 1.2.0
2015-04-17 10:35:06 -07:00
Aanand Prasad
43af1684c1
Update docs for 1.2.0
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-17 16:02:57 +01:00
Aanand Prasad
ed549155b3
Merge pull request #1159 from aanand/bump-1.2.0
...
Bump 1.2.0
2015-04-16 17:46:47 +01:00
Aanand Prasad
39ae91c81c
Bump 1.2.0
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-16 13:53:27 +01:00
Daniel Nephin
b6acb3cd8c
Merge pull request #1278 from albers/completion-run-user
...
Add bash completion for docker-compose run --user
(cherry picked from commit 3cd116b99d )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-16 13:50:33 +01:00
Ben Firshman
a467a8a094
Merge pull request #1261 from aanand/fix-vars-in-volume-paths
...
Fix vars in volume paths
(cherry picked from commit 4926f8aef6 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Conflicts:
tests/unit/service_test.py
2015-04-09 15:26:10 +01:00
Aanand Prasad
78227c3c06
Merge pull request #1202 from aanand/jenkins-script
...
WIP: Jenkins script
(cherry picked from commit 853ce255ea )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-01 11:00:51 -04:00
Daniel Nephin
e4e802d1f8
Merge pull request #1213 from moysesb/relative_build
...
Make value of 'build:' relative to the yml file.
(cherry picked from commit 0f70b8638f )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-01 11:00:48 -04:00
Aanand Prasad
b24a60ba9f
Merge pull request #1226 from aanand/merge-multi-value-options
...
Merge multi-value options when extending
(cherry picked from commit e708f4f59d )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-01 11:00:45 -04:00
Aanand Prasad
461b600068
Merge pull request #1225 from aanand/fix-1222
...
When extending, `build` replaces `image` and vice versa
(cherry picked from commit 6dbe321a45 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-01 11:00:40 -04:00