Граф коммитов

7525 Коммитов

Автор SHA1 Сообщение Дата
Michael Crosby 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
Michael Crosby 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
Solomon Hykes ea2fba5ce0 Engine: optional Logging field to disable custom logging in engine.
* The default behavior is preserved
* This disables the use of the `TEST` environment variable in engine.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-04-07 21:41:25 +00:00
unclejack 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
Solomon Hykes 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
unclejack 902f88ea15 Merge pull request #5057 from crosbymichael/refactor-runtime-create
Refactor runtime create and history
2014-04-07 23:24:46 +03:00
Michael Crosby 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
James Turnbull 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
Jérôme Petazzoni 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
Michael Crosby 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
Victor Vieux 2fde8dfb83 Merge pull request #5040 from crosbymichael/remove-context-from-config
Remove context from config
2014-04-07 10:48:15 -07:00
Victor Vieux 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
unclejack 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
unclejack 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
Sven Dowideit 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
Michael Brown 726206f2aa apparmor: pull in variables from tunables/global
The variables that were defined at the top of the apparmor profile are best
pulled in via the <tunables/global> include.

Docker-DCO-1.1-Signed-off-by: Michael Brown <michael.brown@discourse.org> (github: Supermathie)
2014-04-07 03:04:27 -04:00
Michael Brown 320b3e0d21 apparmor: abstractions/base expects pid variable
Add 'pid' variable pointing to 'self' to allow parsing of profile to succeed

Docker-DCO-1.1-Signed-off-by: Michael Brown <michael.brown@discourse.org> (github: Supermathie)
2014-04-07 02:47:43 -04:00
Michael Brown e35c23311f apparmor: docker-default: Include base abstraction
Encountered problems on 14.04 relating to signals between container
processes being blocked by apparmor. The base abstraction contains
appropriate rules to allow this communication.

Docker-DCO-1.1-Signed-off-by: Michael Brown <michael.brown@discourse.org> (github: Supermathie)
2014-04-07 02:19:38 -04:00
Sven Dowideit 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
Kato Kazuyoshi 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
Kato Kazuyoshi da8aa712d2 Remove archive/stat_unsupported.go because it is not used
LUtimesNano and all other functions were implemented on pkg/system after
d6114c0da0.

Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
2014-04-05 10:09:04 +09:00
Victor Vieux 36af2936af Merge pull request #5031 from crosbymichael/revert-env
Revert env changes
2014-04-04 13:19:08 -07:00
unclejack 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
Michael Crosby 07887f65de Revert "remove hack in version"
This reverts commit b2b9334f27.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-04 11:38:03 -07:00
Michael Crosby 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
Michael Crosby 95e6fd819b Revert "engine: fix engine.Env.Encode() to stop auto-guessing types."
This reverts commit 76057addb2.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-04 11:29:56 -07:00
Victor Vieux 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
unclejack 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
unclejack 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
Dan Stine bea71245c8 fixed two readme typos 2014-04-04 08:12:17 -04:00
Tianon Gravi 919fe7a3a1 Remove the old Travis-specific files that are no longer necessary
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-04-04 00:46:47 -06:00
Tianon Gravi 81370b5b0f Add new validate-dco and validate-gofmt bundlescripts for DCO and gofmt validation
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-04-04 00:41:33 -06:00
Sven Dowideit 031e288075 Merge pull request #4996 from rajatpandit/patch-2
Update nodejs_web_app.rst
2014-04-04 14:41:32 +10:00
Sven Dowideit b811ac523a Merge pull request #4995 from rajatpandit/patch-1
Update nodejs_web_app.rst
2014-04-04 14:40:55 +10:00
unclejack 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
unclejack a255849129 Merge pull request #5002 from crosbymichael/rhatdan-selinux
Improve selinux label handling
2014-04-04 04:43:16 +03:00
unclejack 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
Michael Crosby 09aa28eca0 Merge pull request #5005 from shykes/deprecate-insert
Deprecate 'docker insert'
2014-04-03 17:16:25 -07:00
Victor Vieux 468cb80c59 Merge pull request #5006 from vieux/remove_dirty_hack
remove hack in version
2014-04-03 17:09:56 -07:00
Victor Vieux 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
Victor Vieux 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
Victor Vieux 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
Solomon Hykes 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
Solomon Hykes 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
Solomon Hykes 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
Solomon Hykes 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
Victor Vieux a278656330 Merge pull request #4991 from ruphin/fix_name_typo
Fix typo in names-generator
2014-04-03 16:24:14 -07:00
Goffert van Gool 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
unclejack 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
Michael Crosby afc56e8d6d Merge pull request #4993 from crosbymichael/remove-loopback-setup
Remove loopback setup for native driver
2014-04-03 15:09:09 -07:00