7ceff89f33
Merge pull request #4715 from sebsto/patch-1
...
Include instruction for AMI 2014.03
Upstream-commit: 6e0d8ce8c350c32dcde79fdd34e414e8d28f53d7
Component: engine
2014-04-08 11:02:54 +10:00
bbc3856401
Remove and unexport selinux functions
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 028d44d12683b170704537c3435361ae8a4e74d8
Component: engine
2014-04-07 14:59:44 -07:00
3a7c03a563
Ensure that selinux is disabled by default
...
This also includes some portability changes so that the package can be
imported with the top level runtime.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 82f37b874ea17c5e0040f3e41dc761c88d576e33
Component: engine
2014-04-07 14:44:53 -07:00
b9794db272
Add more label checks for selinux enabled
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: aaf018017c88a707b35115a9411e4069d9356748
Component: engine
2014-04-07 14:44:53 -07:00
f0b2c345c0
Remove selinux build tag
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: b1e98e06dc62b0d25f98ea9a2fd94e41cc1d20e2
Component: engine
2014-04-07 14:44:52 -07:00
84a11b7762
Move -o cli flag and DriverConfig from HostConfig
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: ffebcb660f666e3a2a7be6b838ebd55f524d5b5d
Component: engine
2014-04-07 14:44:52 -07:00
42a6758106
Convert a legacy integration test to a clean v2 CLI integration test.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 30f22ee9e3ea1012ca663a0383c8c9c2330c52cc
Component: engine
2014-04-07 20:34:21 +00:00
a8e470f581
Merge pull request #5057 from crosbymichael/refactor-runtime-create
...
Refactor runtime create and history
Upstream-commit: 902f88ea156179d2d8095b34556738258792ca45
Component: engine
2014-04-07 23:24:46 +03:00
8770121953
Clean runtime create and make it simple
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 1277885420b069abd7468fe3e69deb4fb0a3f4fc
Component: engine
2014-04-07 12:20:23 -07:00
4684a5ac26
Merge pull request #4764 from SvenDowideit/use-docker-tgz
...
Use docker tgz file to download on OSX
Upstream-commit: 7fddec4a65656844fd8c6aad85198273185450a2
Component: engine
2014-04-07 11:54:27 -07:00
786c7662ab
Move history to separate file
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: c987aa09d81a6916e3893c41b7ec2880570b5c65
Component: engine
2014-04-07 11:01:35 -07:00
1e0b068ff4
Merge pull request #5040 from crosbymichael/remove-context-from-config
...
Remove context from config
Upstream-commit: 2fde8dfb832b9041364e3f87b8d145256f3f0891
Component: engine
2014-04-07 10:48:15 -07:00
0834ef63f2
Merge pull request #5039 from kzys/freebsd-timestamp
...
Don't assume the file system has sub-second precision timestamp
Upstream-commit: 73a22fc6b31ad17ea5f1f51d54c445473e43655a
Component: engine
2014-04-07 10:28:22 -07:00
f31296dbf7
Merge pull request #5038 from kzys/remove-archive-stat
...
Remove archive/stat_unsupported.go because it is not used
Upstream-commit: 2f292a97de79a4fac698c91e328c06ea711b3632
Component: engine
2014-04-07 19:50:31 +03:00
dbddde5f2d
intermediate image layers are used for more than the build
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: 87ea27e80b131ca11d74c89446d4992af0f6c5b9
Component: engine
2014-04-07 18:37:52 +10:00
b3cdaaecc8
Merge pull request #4799 from tianon/no-more-inotifywait
...
Remove the inotifywait hack from our upstart host-integration example
Upstream-commit: a4b4448009587e79a7a2ddef0178860fd3c01de7
Component: engine
2014-04-06 08:34:50 +10:00
c723ea81f4
Don't assume the file system has sub-second precision timestamp
...
For example, FreeBSD doesn't have that
(see http://lists.freebsd.org/pipermail/freebsd-fs/2012-February/013677.html ).
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
Upstream-commit: 794b5de749fceea906222917e90bbc19e131ecc3
Component: engine
2014-04-05 10:30:37 +09:00
53fdad7724
Remove archive/stat_unsupported.go because it is not used
...
LUtimesNano and all other functions were implemented on pkg/system after
d6114c0da0e844199e3d23c60a04434566fb5392.
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
Upstream-commit: da8aa712d28cb7177b0fe5b4cc9d7de33ea1da60
Component: engine
2014-04-05 10:09:04 +09:00
2ff6ba10e5
Merge pull request #5031 from crosbymichael/revert-env
...
Revert env changes
Upstream-commit: 36af2936af2e55216456dbe62e7fcbeff9b630d5
Component: engine
2014-04-04 13:19:08 -07:00
a988fa74b7
Merge pull request #5027 from unclejack/cli_integration_add_docker_options
...
Cli integration: add docker options & fix the wait at the end
Upstream-commit: 0fb76839adacc7ffe84cbe545aecf7f1e6f3464e
Component: engine
2014-04-04 22:07:31 +03:00
0b7d68cb7c
Revert "remove hack in version"
...
This reverts commit b2b9334f27e1a773b77241efa214af2e87439d3b.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 07887f65de7f909e56bf965b3875a1dd46bd3619
Component: engine
2014-04-04 11:38:03 -07:00
0f551f19fb
Use setjson hack again for version
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 4c6cf9e27fd0ee6c09e836f03722d1c679b6bd29
Component: engine
2014-04-04 11:37:08 -07:00
76c76ce8f5
Revert "engine: fix engine.Env.Encode() to stop auto-guessing types."
...
This reverts commit 76057addb255e6f14dd03c276317abc759a15a80.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 95e6fd819bbef09032bf680e0f7dadd7fbf44559
Component: engine
2014-04-04 11:29:56 -07:00
990afa43fd
Merge pull request #5008 from unclejack/sync_cli_integration_ops
...
cli integration: sync container & image deletion
Upstream-commit: a97305e4c04fc3f5062076230e6ce0e66860e2fd
Component: engine
2014-04-04 11:16:08 -07:00
010f288951
cli integration: fix wait race
...
The wait at the end of cli integration script could end up failing if
the process had already exited. This was making it look like the tests
have failed.
This change fixes the problem.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 22152ccc47e641050da85b80cebf2912b42fd122
Component: engine
2014-04-04 19:06:55 +03:00
3057a30784
cli integration: allow driver selection via vars
...
This makes it possible to choose the graphdriver and the execdriver
which is going to be used for the cli integration tests.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 62b08f557db91cc5cd12ea9ceb0a4d8cf3d6e0f1
Component: engine
2014-04-04 19:03:07 +03:00
b8c51a787b
Merge pull request #4996 from rajatpandit/patch-2
...
Update nodejs_web_app.rst
Upstream-commit: 031e2880756155c26a2eac0e81275b7e0330db39
Component: engine
2014-04-04 14:41:32 +10:00
616b4d686e
Merge pull request #4995 from rajatpandit/patch-1
...
Update nodejs_web_app.rst
Upstream-commit: b811ac523a966af3e663f46b3b7b0afb2b7918b0
Component: engine
2014-04-04 14:40:55 +10:00
46ea726816
Merge pull request #4968 from tianon/enhanced-check-config
...
Add more color and cgroupfs hierarchy verification to check-config.sh
Upstream-commit: 65eeb0fce076f580ce5b428ed5ad68a345e0fb2d
Component: engine
2014-04-04 04:49:05 +03:00
878341f623
Merge pull request #5002 from crosbymichael/rhatdan-selinux
...
Improve selinux label handling
Upstream-commit: a255849129f931cf3c5c7a4bf3acba921a5b71e7
Component: engine
2014-04-04 04:43:16 +03:00
375b426ef6
cli integration: sync container & image deletion
...
This makes container and image removal in the tests run synchronously.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: e09274476f889c08416a819dfb28f2c425868c6b
Component: engine
2014-04-04 03:22:32 +03:00
bc3cbf9f38
Merge pull request #5005 from shykes/deprecate-insert
...
Deprecate 'docker insert'
Upstream-commit: 09aa28eca049320f53300f9d7ba9bc28c1033d3b
Component: engine
2014-04-03 17:16:25 -07:00
b846e60f58
remove hack in version
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: b2b9334f27e1a773b77241efa214af2e87439d3b
Component: engine
2014-04-04 00:08:51 +00:00
7664a42a38
Merge pull request #5004 from shykes/api-unit-tests
...
Replace integration tests with unit tests for the remote API
Upstream-commit: dbd1e304f57c40d0cac925727832d588d453c414
Component: engine
2014-04-03 17:06:05 -07:00
7e7d23974d
Merge pull request #5001 from shykes/deprecate-images-viz-tree
...
Deprecate 'docker images --tree' and 'docker images --viz'
Upstream-commit: 9f68b934d38b8873a32c5323981bea867316259a
Component: engine
2014-04-03 17:05:59 -07:00
8e7c545689
api/server: convert TestGetInfo from an integration test to a unit test.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 2cb560988b111ee736c4ab22588d2091cb04075e
Component: engine
2014-04-04 00:02:44 +00:00
53e20d9286
engine: fix engine.Env.Encode() to stop auto-guessing types.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 76057addb255e6f14dd03c276317abc759a15a80
Component: engine
2014-04-03 23:53:42 +00:00
2948228586
api/server: replace an integration test with a unit test using engine mocking.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: c8f437aee0d90d4955a6aaa35f8e0b74e7ac99a3
Component: engine
2014-04-03 23:53:39 +00:00
96808698c3
Deprecate 'docker insert'
...
'docker insert' is an old command which predates 'docker build'. We no
longer recommend using it, it is not actively maintained, and can be
replaced with the combination of 'docker build' and 'ADD'.
This removes the command from usage and documentation, and prints a
warning when it is called.
The command still works but it will be removed in a future version.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 615ac8feb27b2b3db0c06b37ecd87b710eabffef
Component: engine
2014-04-03 23:52:09 +00:00
6cbdc82faa
Merge pull request #4991 from ruphin/fix_name_typo
...
Fix typo in names-generator
Upstream-commit: a278656330271647b9001ca54bc6ee1447a28715
Component: engine
2014-04-03 16:24:14 -07:00
9ca39a7a4b
Fix typo in names-generator
...
Docker-DCO-1.1-Signed-off-by: Goffert van Gool <ruphin@ruphin.net > (github: ruphin)
Upstream-commit: 6cf137860102b8df5db75dd68924375a7b74c1c3
Component: engine
2014-04-04 00:57:43 +02:00
a3c9583ac0
Merge pull request #5000 from shykes/skip-login-tests
...
Skip login tests because of external dependency to a hosted service.
Upstream-commit: 55729ab4cbce70c5d5b9b89b5e8dbe9a9ee1da6f
Component: engine
2014-04-04 01:11:09 +03:00
b78055588f
Merge pull request #4993 from crosbymichael/remove-loopback-setup
...
Remove loopback setup for native driver
Upstream-commit: afc56e8d6d8f53d84c4e7b090a59356ff65e8add
Component: engine
2014-04-03 15:09:09 -07:00
14694d6df5
Deprecate 'docker images --tree' and 'docker images --viz'
...
* The commands are no longer listed or documented.
* The commands still work but print a deprecation warning.
* The commands should be removed in a future version.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 7c3b955b907c33238c1c155ae8860b2cec929c8b
Component: engine
2014-04-03 22:03:23 +00:00
dd40df5fd3
Skip login tests because of external dependency to a hosted service.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 887eeb2b022a4c6d3de8c9bfc586ee82855d3cb9
Component: engine
2014-04-03 21:55:33 +00:00
b9704b19cb
Update nodejs_web_app.rst
...
Upstream-commit: 32d6041cc30a636de2f8da89f778c4b6c7d4df19
Component: engine
2014-04-03 21:05:50 +01:00
66d94360a3
Update nodejs_web_app.rst
...
Upstream-commit: 3c36f82f181c4ce3b65dd15c4b6cb5699ea75075
Component: engine
2014-04-03 20:54:57 +01:00
c231a5f59a
Update contrib/check-config.sh cgroupfs check to allow for something like '... cgroup rw,cpu' (looking at you, boot2docker)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: fee16d42163822bb23a51c5ebcb1115efc761947
Component: engine
2014-04-03 11:52:19 -06:00
78e32310f2
Update contrib/check-config.sh to use zcat and grep if zgrep isn't available
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 9712f8127a9ac47a3679e20faea08fb971ee1ecc
Component: engine
2014-04-03 11:46:24 -06:00
ba88c545d8
Fix --volumes-from mount failure
...
As explained in https://github.com/dotcloud/docker/issues/4979
--volumes-from fails with ENOFILE errors.
This is because the code tries to look at the "from" volume without
ensuring that it is mounted yet. We fix this by mounting the containers
before stating in it.
Also includes a regression test.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: bd94f84ded944ab69c18cf9d23c35deee3b15963
Component: engine
2014-04-03 19:33:20 +02:00
