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
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
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
a278656330
Merge pull request #4991 from ruphin/fix_name_typo
...
Fix typo in names-generator
2014-04-03 16:24:14 -07:00
6cf1378601
Fix typo in names-generator
...
Docker-DCO-1.1-Signed-off-by: Goffert van Gool <ruphin@ruphin.net> (github: ruphin)
2014-04-04 00:57:43 +02:00
55729ab4cb
Merge pull request #5000 from shykes/skip-login-tests
...
Skip login tests because of external dependency to a hosted service.
2014-04-04 01:11:09 +03:00
afc56e8d6d
Merge pull request #4993 from crosbymichael/remove-loopback-setup
...
Remove loopback setup for native driver
2014-04-03 15:09:09 -07:00
7c3b955b90
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)
2014-04-03 22:03:23 +00:00
887eeb2b02
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)
2014-04-03 21:55:33 +00:00
9e29d65aad
Merge pull request #4994 from crosbymichael/remove-start-test
...
Remove racy test causing tests to stall
2014-04-03 14:49:35 -07:00
32d6041cc3
Update nodejs_web_app.rst
2014-04-03 21:05:50 +01:00
3c36f82f18
Update nodejs_web_app.rst
2014-04-03 20:54:57 +01:00
95d07b52b3
Merge pull request #4992 from crosbymichael/fix-mknod-test
...
Fix configuration test for MKNOD
2014-04-03 12:21:30 -07:00
5864a3ff77
Merge pull request #4980 from creack/update_signal_management
...
Return correct exit code upon signal + SIGQUIT now quits without cleanup
2014-04-03 11:58:19 -07:00
e21607341c
Add myself to AUTHORS.
...
Docker-DCO-1.1-Signed-off-by: Kevin Wallace <kevin@pentabarf.net> (github: kevinwallace)
2014-04-03 18:44:13 +00:00
c94111b619
Allow non-privileged containers to create device nodes.
...
Such nodes could already be created by importing a tarball to a container; now
they can be created from within the container itself.
This gives non-privileged containers the mknod kernel capability, and modifies
their cgroup settings to allow creation of *any* node, not just whitelisted
ones. Use of such nodes is still controlled by the existing cgroup whitelist.
Docker-DCO-1.1-Signed-off-by: Kevin Wallace <kevin@pentabarf.net> (github: kevinwallace)
2014-04-03 18:44:13 +00:00
5844920185
Merge pull request #4989 from alexlarsson/fix-volumes-from
...
Fix --volumes-from mount failure
2014-04-03 11:27:18 -07:00
fee16d4216
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)
2014-04-03 11:52:19 -06:00
9712f8127a
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)
2014-04-03 11:46:24 -06:00
bd94f84ded
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)
2014-04-03 19:33:20 +02:00
cd910cb685
Allow force sigint and allow sigquit after sigint
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
2014-04-03 10:07:42 -07:00
be882d989a
Merge pull request #4984 from michaelneale/master
...
explained what authConfig actually is
2014-04-03 09:20:24 -04:00
cb824f4093
Merge pull request #4985 from drothlis/patch-1
...
docs: Fix typo in hello world example
2014-04-03 20:07:44 +10:00
75633a0451
explained what authConfig actually is.
...
Docker-DCO-1.1-Signed-off-by: Michael Neale <michael.neale@gmail.com> (github: michaelneale)
2014-04-03 19:43:21 +11:00
8c4617e0ae
docs: Fix typo in hello world example
2014-04-03 09:40:28 +01:00
24e8b1b834
Merge pull request #4924 from msabramo/move_installmirrors_anchor_in_docs
...
Move installmirrors anchor in doc
2014-04-03 12:48:01 +10:00
e8cb65b3cc
Merge pull request #4972 from unclejack/document_a_flag
...
docs: explain what docker run -a does
2014-04-03 10:23:39 +10:00
9687c087ab
Merge pull request #4953 from rhatdan/selinux
...
These two patches should fix problems we see with running docker in the wild.
2014-04-02 16:36:41 -07:00
9cc7eb4ab3
Merge pull request #3971 from creack/fix_add_ownership
...
Change ownership to root for ADD file/directory
2014-04-02 12:22:09 -07:00
8aa3dc681d
Merge pull request #4965 from tianon/update-makefile
...
Update Makefile with several improvements
2014-04-02 12:03:12 -06:00
Kato Kazuyoshi
Victor Vieux
unclejack
Michael Crosby
unclejack
Sven Dowideit
Michael Crosby
Solomon Hykes
Goffert van Gool
Guillaume J. Charmes
Rajat Pandit
Kevin Wallace
Tianon Gravi
Alexander Larsson
Guillaume J. Charmes
James Turnbull
Michael Neale
David Röthlisberger