084cb15f1a
Allow drivers to implement ApplyDiff in Differ interface
...
Upstream-commit: 5d9723002bc764e2c768e5184994d7949f55fc49
Component: engine
2013-11-11 19:09:57 -08:00
f4f11a5ecb
Allow driver to provide changes if it impl the Changer interface
...
Upstream-commit: 95147675870e9e84deb354f09f0f670a5cb2b1e1
Component: engine
2013-11-08 14:54:20 -08:00
164d9c3b6b
Create new network on dead ghosts on restart.
...
Fixes #2089
Upstream-commit: 95708dd35cd94a2c849e37efa05bb4e01ed36bb8
Component: engine
2013-11-03 14:13:18 -05:00
af2d5e1f07
Introduce failing test case for #2089
...
Upstream-commit: 4cbb6ce13bf93df2a9e251dfa87fbce9952ab8a6
Component: engine
2013-11-03 11:14:59 -05:00
5e4f415366
Refactor HostConfig and escape apparmor confinement
...
Upstream-commit: 31638ab2ad2a5380d447780f05f7aa078c9421f5
Component: engine
2013-11-01 13:55:19 -07:00
67465c23f0
Fixed problem with variables containing \n.
...
The /.dockerenv file is now a marshalled json array so that environment
variables with \n and other weird values are supported.
Upstream-commit: 1c3a674444c6a6f08ea5ce3812046a00678e4a29
Component: engine
2013-10-31 01:19:32 +01:00
fe428bd3cd
Support copying value from env with -e option.
...
Upstream-commit: 25c4c87c86aca2f17363dbcd9d7bc47640ff9c23
Component: engine
2013-10-31 01:19:09 +01:00
7ce1e20657
Add -name for docker run
...
Remove docker link
Do not add container id as default name
Create an auto generated container name if not
specified at runtime.
Upstream-commit: 0d2924408bad7aa797bfaf0610e836d82928296f
Component: engine
2013-10-28 18:09:08 -07:00
dab2931cd1
Updated fixes post rebase from master
...
Removed test cases that are no longer
applicable with links and the port changes.
Remove test case where a test was hitting an
external ip.
Upstream-commit: 0e24db3a68cabed1ff8cf8dd10854c5de201329f
Component: engine
2013-10-25 15:13:24 -07:00
9f5ddf8e54
Add a network test
...
This just tries pinging first 127.0.0.1 and then 8.8.8.8.
We can't ping via a dns name, because libresolv.so is missing
from the test image, so dns resolving doesn't work.
Upstream-commit: 249f5a65a55ac9f68c65d57a7e7b5ac486060b97
Component: engine
2013-10-25 15:13:24 -07:00
952ac8a789
Add links for container relationships and introspection
...
Upstream-commit: 1cbdaebaa1c2326e57945333420d25d6f77011d5
Component: engine
2013-10-25 15:13:24 -07:00
264d4e8059
remove log
...
Upstream-commit: acc2aec988450b117c183f35a4e743b882a55113
Component: engine
2013-10-24 15:13:47 -07:00
c53c4a96f0
Hack: fix tests which didn't cleanup properly
...
Upstream-commit: 5c175357aaa7e011e3535eeb1ee162450f390b9e
Component: engine
2013-10-18 02:13:36 +00:00
f4fdcdb53f
Merge pull request #1934 from dotcloud/host-permissions
...
Only copy files and change permissions with non bindmount
Upstream-commit: 23cf3c7a3318b893ea1dd50cc9f05d4705bcc6df
Component: engine
2013-09-22 09:40:52 -07:00
99d2e0befc
Only copy files and change permissions with non bindmount
...
Upstream-commit: b45e280ee8161b38127b90e718945130bc1e935a
Component: engine
2013-09-19 20:35:05 -07:00
2e27a64777
Allow multiple volumes-from
...
Upstream-commit: b79bd4e864d53e927a9480374646d5e94d12141c
Component: engine
2013-09-14 20:09:15 +00:00
3604478445
Transfer uid and gid to volume. Fixes #1737 .
...
Upstream-commit: 9cfbaecfe5b1ccb1ab21c66400f3a1ba1b33da1e
Component: engine
2013-09-11 03:17:42 +02:00
62ef8f176e
Merge branch '1582_fix_volume_content' of https://github.com/griff/docker into griff-1582_fix_volume_content
...
Upstream-commit: 27ca0c225aebfe93c4edd2d39d188175f4b2f516
Component: engine
2013-09-10 16:52:46 +00:00
aa0ad01db6
Merge builder.go into runtime.go
...
Upstream-commit: 24e02043a2672320abebc3bd5fa6a592e2ebd082
Component: engine
2013-09-06 17:33:05 -07:00
77d05d40bc
Made calling changelog before run return empty. Fixes #1705 .
...
Upstream-commit: 46c9c5c84317907153f06284dc5110b53a0fbf3c
Component: engine
2013-08-30 22:46:07 +02:00
8de9407f39
Copies content from image to volumne if non-empty. Fixes #1582 .
...
Upstream-commit: 7a9c71183212a40fdd10369d009a9f97b56fe359
Component: engine
2013-08-30 22:02:05 +02:00
dfb6c3c80f
Add lxc-conf flag to allow custom lxc options
...
Upstream-commit: 551092f9c0da2244c60b75d893ef847f915ca604
Component: engine
2013-08-22 16:05:21 +00:00
9147a2b4d7
Merge pull request #1496 from xdissent/1351-volumes-from-before-volumes
...
* Runtime: Apply volumes-from before creating volumes
Upstream-commit: 631c4491838e982697f596518f588fda5f9ae73d
Component: engine
2013-08-14 15:10:41 -07:00
9defd8d614
Merge pull request #1478 from jpetazzo/929-insecure-flag
...
add -privileged flag and relevant tests, docs, and examples
Upstream-commit: 9662f9e56adeb92d3749c12bc1ce08928bbfc54b
Component: engine
2013-08-14 13:55:18 -07:00
43b59cff4b
add -insecure flag and relevant tests
...
Upstream-commit: 280901e5fbd0c2dabd14d7a9b69a073f6e8f87e4
Component: engine
2013-08-13 16:20:22 -07:00
62138d17f2
Merge pull request #1508 from pborreli/typos
...
Fixed typos
Upstream-commit: 90cb66f08d139079601dbbedf1fa9706d1bf5738
Component: engine
2013-08-12 15:17:02 -07:00
efc4a51c0c
Fixed typos
...
Upstream-commit: 9b2a5964fc2067014f24e26bd2f99873751ebdc3
Component: engine
2013-08-12 18:53:06 +01:00
48e3692cf2
Merge pull request #1476 from dotcloud/improve_TestKillDifferentUser
...
* Tests: Improve TestKillDifferentUser to prevent timeout on buildbot
Upstream-commit: 1110bb8e9855ee58a913289d4333a5baeb72bd53
Component: engine
2013-08-12 10:23:08 -07:00
35109f9244
Skip existing volumes in volumes-from
...
Removes the error when a container already has a volume that would otherwise
be created by `Config.VolumesFrom`. Allows restarting containers with a
`Config.VolumesFrom` set.
Upstream-commit: 57b49efc98d2f4605c95d5579a6cd952dfd6f124
Component: engine
2013-08-10 06:37:57 +00:00
9d2142818e
Apply volumes-from before creating volumes
...
Copies the volumes from the container specified in `Config.VolumesFrom` before
creating volumes from `Config.Volumes`. Skips any preexisting volumes when
processing `Config.Volumes`. Fixes #1351
Upstream-commit: 3bd73a96333e011738136f6a9eda23642cc204ab
Component: engine
2013-08-10 04:55:23 +00:00
ca934a037f
fix typo in TestBindMounts (runContainer called without image)
...
Upstream-commit: 68b09cbe3d0a13bd1dbcaa39a63788fe938d0ae7
Component: engine
2013-08-09 16:03:05 -07:00
f19e3a94a2
Improve TestKillDifferentUser to prevent timeout on buildbot
...
Upstream-commit: db9d68c3e42a187a735082776b671d23651f4334
Component: engine
2013-08-09 10:50:58 -07:00
faa72ea812
relax the lo interface test to allow iface index != 1
...
Upstream-commit: 84790aafd8b3050e502a16f03ee288c1bb9c21b6
Component: engine
2013-08-06 18:31:05 -07:00
d445832a9e
added tests for 1405
...
Upstream-commit: d00fb4096700cd8feed06ca32c93f080fb6446b1
Component: engine
2013-08-05 09:30:27 -05:00
46b9c95887
Fix TestEnv
...
Upstream-commit: dde8f74ceae83f26386ec29e42f615fdc7945e80
Component: engine
2013-08-02 15:58:10 -07:00
be9f5063e4
Merge branch '858-disable-network-configuration' of https://github.com/stfp/docker into stfp-858-disable-network-configuration
...
Upstream-commit: 8165e51eccd15b7eed3939ada6017ed12b9e81b3
Component: engine
2013-07-23 08:44:12 +00:00
48287f8a5d
fix test env
...
Upstream-commit: 5c1af383eb14121174b43fa706f524d4eedd5cad
Component: engine
2013-07-22 16:26:05 +00:00
edbf8f58a1
Support networkless containers with new docker run option '-n'
...
Upstream-commit: 3342bdb33184b83cac66921807c5403168d13f6b
Component: engine
2013-07-21 17:11:47 -07:00
c311fa3aa0
rebase master
...
Upstream-commit: 2e0e455fa696db7a16a08b6c7dd2def7c5ff837f
Component: engine
2013-07-19 14:48:32 +00:00
148c813e5f
Merge pull request #1207 from crosbymichael/819-use-persistent-volume
...
* Runtime: Do not overwrite container volumes from config
Upstream-commit: d6fb313220c2275c4e76f6191905fb382e54a58d
Component: engine
2013-07-18 18:51:00 -07:00
df2dfb45a8
Merge -b and -v options
...
Upstream-commit: eefbadd230d2788b0bdf0daac38ada0d145e3861
Component: engine
2013-07-15 17:51:32 -07:00
f98fac335f
Do not overwrite container volumes from config
...
Fixes #819 Use same persistent volume when a container is restarted
Upstream-commit: 92cbb7cc80a63299b5670a9fcbb2d11789200696
Component: engine
2013-07-15 11:59:11 -09:00
6a9b073bb8
Merge pull request #1208 from crosbymichael/1201-rw-volumes-from
...
- Volumes: Copy VolumesRW values when using --volumes-from
Upstream-commit: c8efd0838430aeeaef15bfd5ef62aecee4cdc603
Component: engine
2013-07-15 10:59:51 -07:00
ff7fe2dacd
Merge pull request #1096 from dotcloud/remove_os_user
...
* Runtime: Remove the os.user dependency and manually lookup /etc/passwd instead
Upstream-commit: 454cd147fb6133319ecdcda962b6aa137f28f32a
Component: engine
2013-07-15 10:19:09 -07:00
08204dd54e
Add unit test to check wrong uid case
...
Upstream-commit: e41507bde2d87cb9bbb0c328e414a39354dae10e
Component: engine
2013-07-15 10:05:09 -07:00
6fdf5346ea
Copy VolumesRW values when using --volumes-from
...
Fixes #1201
Upstream-commit: 5ae8c7a98592f83a31f3f45fc22728e45e95626c
Component: engine
2013-07-14 18:23:20 -09:00
1aa0235482
Hack: use helper functions in tests for less copy-pasting
...
Upstream-commit: 080243f0407a90cdacf128dc3b53a802549d7797
Component: engine
2013-07-12 17:56:55 -07:00
6c9e32ae32
Simplify unit tests code with mkRuntime()
...
Upstream-commit: 6bdb6f226b13d5fdd47f3665c9fb753207bf473b
Component: engine
2013-07-11 17:59:25 -07:00
438fda3245
add sleep in tests and go fmt
...
Upstream-commit: ebba0a60245b487e6d3d242f47c8999321ec5d29
Component: engine
2013-07-02 10:47:37 +00:00
40f3d8b8b8
More unit test fixes
...
- Fix TestGetImagesJSON when there is more than one image in the test
repository;
- Remove an hardcoded constant use in TestGetImagesByName;
- Wait in a loop in TestKillDifferentUser;
- Use env instead of /usr/bin/env in TestEnv;
- Create a daemon user in contrib/mkimage-unittest.sh.
Upstream-commit: f03c1b8eeb367beefa91046e2fa114af9a816aaa
Component: engine
2013-07-01 17:24:21 -07:00
