1d2126be6c
Merge pull request #5025 from dstine/readme-fix
...
fixed two readme typos
2014-04-07 19:31:16 -07:00
9c4d10b9a9
fixed three more typos
2014-04-07 22:09:15 -04:00
6bf7104271
Merge pull request #5064 from crosbymichael/remount-bind-mount
...
Ensure that ro mounts are remounted
2014-04-07 19:04:25 -07:00
02c5a87b40
Merge pull request #4997 from jpetazzo/apt-should-always-use-https
...
Use https://get.docker.io/ubuntu consistently
2014-04-08 11:24:07 +10:00
b6042f252d
Ensure that ro mounts are remounted
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-07 18:23:22 -07:00
6e0d8ce8c3
Merge pull request #4715 from sebsto/patch-1
...
Include instruction for AMI 2014.03
2014-04-08 11:02:54 +10:00
8c3eb900de
Merge pull request #5058 from crosbymichael/remove-opts
...
Remove -o cli flag and DriverConfig from HostConfig
2014-04-07 16:45:54 -07:00
028d44d126
Remove and unexport selinux functions
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-07 14:59:44 -07:00
82f37b874e
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)
2014-04-07 14:44:53 -07:00
aaf018017c
Add more label checks for selinux enabled
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-07 14:44:53 -07:00
b1e98e06dc
Remove selinux build tag
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-07 14:44:52 -07:00
ffebcb660f
Move -o cli flag and DriverConfig from HostConfig
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-07 14:44:52 -07:00
d8fc3eecf5
Merge pull request #5010 from shykes/cli-tests
...
Convert a legacy integration test to a clean v2 CLI integration test.
2014-04-08 00:34:58 +03:00
30f22ee9e3
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)
2014-04-07 20:34:21 +00:00
902f88ea15
Merge pull request #5057 from crosbymichael/refactor-runtime-create
...
Refactor runtime create and history
2014-04-07 23:24:46 +03:00
1277885420
Clean runtime create and make it simple
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-07 12:20:23 -07:00
7fddec4a65
Merge pull request #4764 from SvenDowideit/use-docker-tgz
...
Use docker tgz file to download on OSX
2014-04-07 11:54:27 -07:00
dc7fefc16b
Use https://get.docker.io/ubuntu consistently
...
The install script (on https://get.docker.io/ ) installs an APT sources.list
entry referencing an HTTPS repository, and takes care of installing the
apt-transport-https package. However, the Debian/Ubuntu specific installation
script (on https://get.docker.io/ubuntu ) used an HTTPS repository but without
installing that package, causing the installation to fail on some platforms.
This will use HTTPS everywhere, and updates the documentation accordingly.
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com> (github: jpetazzo)
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com> (github: jpetazzo)
2014-04-07 11:32:12 -07:00
c987aa09d8
Move history to separate file
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-07 11:01:35 -07:00
2fde8dfb83
Merge pull request #5040 from crosbymichael/remove-context-from-config
...
Remove context from config
2014-04-07 10:48:15 -07:00
73a22fc6b3
Merge pull request #5039 from kzys/freebsd-timestamp
...
Don't assume the file system has sub-second precision timestamp
2014-04-07 10:28:22 -07:00
2f292a97de
Merge pull request #5038 from kzys/remove-archive-stat
...
Remove archive/stat_unsupported.go because it is not used
2014-04-07 19:50:31 +03:00
1a3eb4967b
Merge pull request #5051 from SvenDowideit/build-rm-help
...
intermediate image layers are used for more than the build
2014-04-07 18:59:41 +03:00
87ea27e80b
intermediate image layers are used for more than the build
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-04-07 18:37:52 +10:00
a4b4448009
Merge pull request #4799 from tianon/no-more-inotifywait
...
Remove the inotifywait hack from our upstart host-integration example
2014-04-06 08:34:50 +10:00
794b5de749
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)
2014-04-05 10:30:37 +09:00
da8aa712d2
Remove archive/stat_unsupported.go because it is not used
...
LUtimesNano and all other functions were implemented on pkg/system after
d6114c0da0
2014-04-05 10:09:04 +09:00
36af2936af
Merge pull request #5031 from crosbymichael/revert-env
...
Revert env changes
2014-04-04 13:19:08 -07:00
0fb76839ad
Merge pull request #5027 from unclejack/cli_integration_add_docker_options
...
Cli integration: add docker options & fix the wait at the end
2014-04-04 22:07:31 +03:00
07887f65de
Revert "remove hack in version"
...
This reverts commit b2b9334f27
2014-04-04 11:38:03 -07:00
4c6cf9e27f
Use setjson hack again for version
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-04 11:37:08 -07:00
95e6fd819b
Revert "engine: fix engine.Env.Encode() to stop auto-guessing types."
...
This reverts commit 76057addb2
2014-04-04 11:29:56 -07:00
a97305e4c0
Merge pull request #5008 from unclejack/sync_cli_integration_ops
...
cli integration: sync container & image deletion
2014-04-04 11:16:08 -07:00
22152ccc47
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)
2014-04-04 19:06:55 +03:00
62b08f557d
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)
2014-04-04 19:03:07 +03:00
bea71245c8
fixed two readme typos
2014-04-04 08:12:17 -04:00
031e288075
Merge pull request #4996 from rajatpandit/patch-2
...
Update nodejs_web_app.rst
2014-04-04 14:41:32 +10:00
b811ac523a
Merge pull request #4995 from rajatpandit/patch-1
...
Update nodejs_web_app.rst
2014-04-04 14:40:55 +10:00
65eeb0fce0
Merge pull request #4968 from tianon/enhanced-check-config
...
Add more color and cgroupfs hierarchy verification to check-config.sh
2014-04-04 04:49:05 +03:00
a255849129
Merge pull request #5002 from crosbymichael/rhatdan-selinux
...
Improve selinux label handling
2014-04-04 04:43:16 +03:00
e09274476f
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)
2014-04-04 03:22:32 +03:00
09aa28eca0
Merge pull request #5005 from shykes/deprecate-insert
...
Deprecate 'docker insert'
2014-04-03 17:16:25 -07:00
468cb80c59
Merge pull request #5006 from vieux/remove_dirty_hack
...
remove hack in version
2014-04-03 17:09:56 -07:00
b2b9334f27
remove hack in version
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-04-04 00:08:51 +00:00
dbd1e304f5
Merge pull request #5004 from shykes/api-unit-tests
...
Replace integration tests with unit tests for the remote API
2014-04-03 17:06:05 -07:00
9f68b934d3
Merge pull request #5001 from shykes/deprecate-images-viz-tree
...
Deprecate 'docker images --tree' and 'docker images --viz'
2014-04-03 17:05:59 -07:00
2cb560988b
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)
2014-04-04 00:02:44 +00:00
76057addb2
engine: fix engine.Env.Encode() to stop auto-guessing types.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-04-03 23:53:42 +00:00
c8f437aee0
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)
2014-04-03 23:53:39 +00:00
615ac8feb2
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)
2014-04-03 23:52:09 +00:00
Guillaume J. Charmes
Dan Stine
Michael Crosby
Sven Dowideit
Michael Crosby
Victor Vieux
unclejack
Solomon Hykes
James Turnbull
Jérôme Petazzoni
Kato Kazuyoshi
unclejack