Commit Graph

145 Commits

Author SHA1 Message Date
Tianon Gravi 98435ab7c4 Switch docker run --username to docker run --user which is more accurate (while we can still do so without breaking anyone's scripts)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: fb981bdace66e5b34d41125beb16e450998fd1e7
Component: engine
2014-01-20 00:28:55 -07:00
Tianon Gravi 38cccce275 Resync bash completion to include all flags defined in the code, and to autocomplete properly on all parameters that are reasonably possible to do so on today
This also includes several new minor features that are interesting, so do explore a little. :)

Finally, this also fixes a few bugs where commands would complete parameters that they won't necessarily accept.  We still have a few of these cases, but they're reduced to a minimum now.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: c6e43154f186c9fac8501016473b459db3130222
Component: engine
2014-01-20 00:28:55 -07:00
Victor Vieux 7822beced6 update commands.go
update docker.go

move to pkg

update docs

update name and copyright

change --sinceId to --since-id, update completion and docs

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor@docker.com> (github: vieux)
Upstream-commit: e71dbf4ee5add5736f595948fc20bd01af56a744
Component: engine
2014-01-17 17:33:15 -08:00
Tianon Gravi e0dd1f369c Merge pull request #3508 from tutumcloud/seccomp
Add capabilities needed by new sysinit to mkseccomp.pl sample list
Upstream-commit: dbf249e23925decac52c0176d716c0ce205d4326
Component: engine
2014-01-14 18:55:53 -08:00
Fernando b0844afbd1 added capabilities needed by new sysinit
Docker-DCO-1.1-Signed-off-by: Fernando Mayo <fernando@tutum.co> (github: fermayo)
Upstream-commit: 32565a4451c9c7f929a37d61ded70fc1de7fe993
Component: engine
2014-01-14 19:27:31 +01:00
Tianon Gravi 72bcbfd669 Fix a few miscellaneous typos (Unkown -> Unknown, Recieve -> Receive)
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: e525ad3f9be05bfab388896ae559411650429553
Component: engine
2014-01-07 22:15:53 -07:00
Tianon Gravi f320db2b17 Merge pull request #3398 from thomasleveil/bash_completion_names
support for container names in bash completion
Upstream-commit: c23b15b9d84ed7d9421d8946c4e0a309e12cecf3
Component: engine
2013-12-31 08:28:21 -08:00
Thomas LEVEIL deba21c185 support for container names in bash completion
Upstream-commit: 055b32e3f4adfd490449b41d0cd6bc6ad5b7466a
Component: engine
2013-12-31 11:34:23 +00:00
Tianon Gravi e302881b24 Reorganize the syntax highlighting files in contrib under a common directory to match "contrib/init" and "contrib/completion"
This is split off from #2970.
Upstream-commit: 06a818616bfce86e90152aeaffaf9394a085c356
Component: engine
2013-12-29 01:46:00 -07:00
Asbjørn Enge 1bab794e11 Apply automatically to files named 'Dockerfile'
Upstream-commit: a1a4a99d7e80cadb97bf58963b76cd0c762888a6
Component: engine
2013-12-27 10:05:25 +01:00
Tatsuki Sugiura d4d3461e31 Fix glob expansion for no-cache setting.
On previous version, glob pattern will be expanded to actual file
names when writing setting to etc/apt/apt.conf.d/no-cache.

This patch fixes to quote to work cache clean command properly.
Upstream-commit: e3b878ce983e5e01960ba5ec5c330749df7dcac4
Component: engine
2013-12-23 17:27:22 +09:00
Tianon Gravi fa0d9a6f45 Merge pull request #3222 from gurjeet/zfs_driver_owner
Update readme to mark ZFS driver as Alpha quality.
Upstream-commit: 606cacdca0c364b8eead4cb41e0dc04fde6af0ab
Component: engine
2013-12-15 07:09:00 -08:00
Gurjeet Singh 0d59c96419 Update readme to mark ZFS driver as Alpha quality.
Upstream-commit: d526038503d59481965f6614c05ec6acb534b986
Component: engine
2013-12-15 09:17:16 -05:00
Tianon Gravi 5a444e902c Update mkimage-debootstrap with even more tweaks for keeping images tiny by more aggressively removing cache files and by not downloading apt-cache Translations files
Upstream-commit: 78b85220be021bff022e40037693f42575e8ba8d
Component: engine
2013-12-10 10:59:32 -07:00
Tianon Gravi 9b49298d93 Merge pull request #2358 from tianon/mkimage-rinse
Remove mkimage-centos.sh in favor of a new rinse-based script...
Upstream-commit: 584164177ea0036c4d3503bf45645b44a9bb05d5
Component: engine
2013-12-05 16:07:59 -08:00
Tianon Gravi abd44b15ab Merge pull request #2983 from tianon/udev
Add udev rules files for hiding the docker loopback devices from udisks
Upstream-commit: 2acea6090f6071b66f546f4de72a7e59731ab467
Component: engine
2013-12-05 16:01:04 -08:00
Tianon Gravi 2d52207a24 Merge pull request #3005 from gurjeet/zfs_driver_owner
Typo fix
Upstream-commit: 650d4cc64438bd6b1ae12f77aa98a663eec1b4bc
Component: engine
2013-12-02 15:06:05 -08:00
Gurjeet Singh ff0ebd8660 Typo fix
Upstream-commit: d9b742419c48bfe57b16d7bf18915a9b31f3548d
Component: engine
2013-12-02 18:03:54 -05:00
Tianon Gravi e1e3b66771 Remove mkimage-centos.sh in favor of a new rinse-based script, since febootstrap is fragile and picky
Upstream-commit: 9d62dc1a0837e37ce5da01c278ab20f7d32c3774
Component: engine
2013-12-02 14:54:04 -07:00
Tianon Gravi 0d9d61008f Merge pull request #2995 from gurjeet/zfs_driver_owner
Add contrb/zfs/ and add self as maintainer of ZFS storage driver.
Upstream-commit: d9fbdd7b3f8e1507ed6f08ed99fab4d983108719
Component: engine
2013-12-02 11:10:16 -08:00
Gurjeet Singh 8b06459645 Add contrb/zfs/ and add self as maintainer of ZFS storage driver.
Upstream-commit: 70b586702cb1715d4ff4dd7ffe356285df73b18e
Component: engine
2013-12-02 14:03:16 -05:00
Tianon Gravi ec29d1628c Add udev rules files for hiding the docker loopback devices from udisks
This prevents them from showing up on the desktop in a window manager, for example.
Upstream-commit: dbb47f63ab637a4766f72eac55f66493cf1c6f5b
Component: engine
2013-12-02 09:11:06 -07:00
Solomon Hykes c3f280e495 Merge pull request #2925 from tianon/update-systemd-service
Update systemd service file with suggestions from @seblu
Upstream-commit: d8ee08ba7b5885352641b8ec6a9b427fb9bef62f
Component: engine
2013-11-29 21:25:08 -08:00
Ulysse Carion a109c2d18a Document setting up Vagrant-docker with the remote API
Upstream-commit: c226ab6d9edb6b74547348c309c633f207bd4aa4
Component: engine
2013-11-27 20:05:54 -08:00
Tianon Gravi 8a1ed2b1a2 Update systemd service file with suggestions from @seblu
Upstream-commit: 75e9cff98ce585ccd050a4014adb99d95509c9b7
Component: engine
2013-11-27 16:55:37 -07:00
Martijn van Oosterhout 323783b03d Add mkseccomp.pl, helper script to make seccomp profiles.
Upstream-commit: ab3a83c617ec5bfafee117ea0b6e92ce78bd46e5
Component: engine
2013-11-26 17:13:02 +01:00
Guillaume J. Charmes cdf4bbcde9 Merge pull request #41 from alexlarsson/dm-plugin-device-tool
Update docker-device-tool
Upstream-commit: 3e0a5ac48bfc65950b31bc7311d2662816cbe475
Component: engine
2013-11-19 15:38:47 -08:00
Alexander Larsson 339d427535 Move docker-device-tool to contrib
Upstream-commit: 9415c2b1f08ecd168ab5a620a80a5bed34df8adb
Component: engine
2013-11-19 10:03:04 +01:00
Justin Plock 58c14de9fd Fix images not being properly tagged
Upstream-commit: 0e64b987e8cbbd6944bd0594f8173f959867f4fc
Component: engine
2013-11-16 11:05:38 -05:00
Tianon Gravi 6b9d5c5bd5 Merge pull request #2652 from tianon/upstart-defaults-too
Add /etc/default/docker support to upstart, too (mirroring sysvinit)
Upstream-commit: b94e9ed0de0817d07ad590e5d32262016f25e6e8
Component: engine
2013-11-13 10:42:41 -08:00
Andy Rothfusz 30fca0b017 Merge pull request #2646 from fgrehm/contrib-vagrant
Update contrib/vagrant-docker with projects available
Upstream-commit: cb9e0aee485ea5b244cd1153644e7c558cd4b9a7
Component: engine
2013-11-11 13:49:15 -08:00
Tianon Gravi 10393910ab Update upstart check in sysvinit to be exactly the same as the init_is_upstart function from /lib/lsb/init-functions (which isn't available in 12.04 or we'd use it directly)
Upstream-commit: 88edba7e86efc8d7e118a9863ab701f0b5493d62
Component: engine
2013-11-11 11:57:25 -07:00
Tianon Gravi 97bc55ee5d Add /etc/default/docker support to upstart, too (mirroring sysvinit)
Upstream-commit: 7cf7dda87d59981f8a1727725f6d914dcc4c1815
Component: engine
2013-11-11 11:13:16 -07:00
Tianon Gravi 60cd8ebc40 Fix sysvinit upstart detection and give it a pretty message
Upstream-commit: bb76157d240ae871bc3d9b6a945a982abf0473c7
Component: engine
2013-11-11 11:10:19 -07:00
Fabio Rehm f7888fafe9 Update contrib/vagrant-docker with projects available
Upstream-commit: 9c7a8edddd447e64069f0cd108bee4d008049c49
Component: engine
2013-11-11 13:36:44 -02:00
Daniel Mizyrycki 893c4c44a9 contrib: Desktop integration. Firefox usecase.
Upstream-commit: 5af87d147580555c72e6a1d448ab663f991cc737
Component: engine
2013-11-05 13:21:52 -08:00
Victor Vieux 22e1fc60ec Merge pull request #2382 from dotcloud/reflect_future_changes_search_api
Update docker search to reflect future changes of the api
Upstream-commit: a482bfd715c6c33603ee5fbdc27693c942dbef93
Component: engine
2013-11-04 16:14:14 -08:00
Tianon Gravi 4349b8fd0b Merge pull request #2365 from tianon/sysvinit-consistency
Update sysvinit script to fix a few inconsistencies and be more useful/correct downstream
Upstream-commit: 8ad46ef401fd0665efe16f50021a5a48a14b51e5
Component: engine
2013-11-04 15:34:51 -08:00
Victor Vieux 47ebac600d rebase and add some filters
Upstream-commit: 747967b4a4e2bfa429a76d20db77b990d23b1a0f
Component: engine
2013-10-31 19:25:55 -07:00
Brandon Philips 9053b11b66 fix(systemd): provide a better description
Fix-up the docker service file description to declare what the service is not what it does.

When a systemd machine starts up the Description of each unit scrolls by instead of the service's filename. Because the current description doesn't say what it is it isn't very friendly:

```
Oct 31 20:40:49 localhost systemd[1]: Started Update Engine.
Oct 31 20:40:49 localhost systemd[1]: Starting Multi-User System.
Oct 31 20:40:49 localhost systemd[1]: Reached target Multi-User System.
Oct 31 20:40:49 localhost systemd[1]: Starting Easily create lightweight, portable, self-sufficient containers from any application!...
Oct 31 20:40:49 localhost systemd[1]: Started Easily create lightweight, portable, self-sufficient containers from any application!.
```
Upstream-commit: 393562340c6f386a837eac9a616c456dc54faa4f
Component: engine
2013-10-31 14:41:49 -07:00
Tianon Gravi f52dcf1ee3 Remove old remnants of stackbrew now that it's a separate project
Upstream-commit: eb79e8c5dd71a70c3d8567a4f3d437a2cd0a5d9c
Component: engine
2013-10-29 13:14:15 -06:00
Tianon Gravi d9388b066c Update sysvinit script to fix a few inconsistencies and be more useful/correct downstream
Upstream-commit: 865649d7ac7e5ebb5b3debf65b626e96a88836b5
Component: engine
2013-10-28 14:08:21 -06:00
Tianon Gravi f677e2e101 Merge pull request #2363 from tianon/mkimage-numeric-owner
Update all the mkimage scripts to use --numeric-owner as a tar argument
Upstream-commit: aa6c99aff604faf3f483372c11e4e10f9d7fc80e
Component: engine
2013-10-24 06:42:52 -07:00
Tianon Gravi bab3ffd21b Merge pull request #2226 from tianon/init
Add initial init scripts library and better/safer Ubuntu packaging that works for Debian, too
Upstream-commit: ef5cf6c1ec88c71465075f272e58150ae26d25fa
Component: engine
2013-10-23 14:29:41 -07:00
Tianon Gravi 24baeed431 Update all the mkimage scripts to use --numeric-owner as a tar argument to properly preserve ownership
Upstream-commit: 8e43db95f2299f9b63ab3d1728e73f2a5f6600b3
Component: engine
2013-10-23 14:08:16 -06:00
Will Rouesnel 47b8397b61 mkimage-debootstrap.sh: Add -p option to invoke debootstrap with http_proxy.
This patch allows debootstrap to be run with the http_proxy environment
variable. This is principally useful when you're using apt-cacher and
apt-cacher-ng locally.
Upstream-commit: bc8a1081b047f6ee4ebf0adb22695fe3c98425c6
Component: engine
2013-10-24 03:21:10 +11:00
Justin Force 22344a9b8e Set commentstring in Vim syntax plugin
By setting the commentstring, you support commenting with plugins like tComment.
Now Vim won't default to incorrect `/* */` comments.
Upstream-commit: ea59ce60c5fc40e6708c22cf90d7cce08d12e294
Component: engine
2013-10-21 16:15:10 -07:00
Tianon Gravi 9e4d782d8f Add POSIX shell version of host_integration/manager.go in the style of hack/make.sh
Rename host_integration to host-integration for consistency
Upstream-commit: 7cf1877098edb7d4874509a338f663d550ef0ede
Component: engine
2013-10-18 16:16:29 -07:00
Guillaume J. Charmes 02bbabf14d Add -nostdin and -proxy to docker attach, allow arbirary signal to be sent via docker kill api endpoint
Allow attach from `docker start`
Add host integration script generation
Update doc with host integration
Upstream-commit: 4918769b1ac2d38f23087b766140e6a7f8979310
Component: engine
2013-10-18 16:16:29 -07:00
Tianon Gravi 4b6a99ff24 Merge pull request #2222 from tianon/debootstrap
Renamed and refactored mkimage-debian to mkimage-debootstrap to more clearly reflect its true function
Upstream-commit: 4b7c071e9c1f2ec839e2d4f5be915850405a8686
Component: engine
2013-10-18 14:46:14 -07:00