Commit Graph

103 Commits

Author SHA1 Message Date
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
Travis Cline b7d138e4ad Use heredoc to make expect script more clear
Upstream-commit: f34a62ea19b477bbaa74a09c04d5e8faf67c44a2
Component: engine
2013-10-18 00:35:12 -05:00
Tianon Gravi 82851ecb8f Add initial init scripts library, including systemd, sysvinit, upstart, and openrc
Upstream-commit: c405d53b6e6658b1cbe9ad7ba52ea6dc9330f546
Component: engine
2013-10-17 12:03:49 -06:00
Tianon Gravi 5169a82f2f Merge pull request #2219 from tianon/completion
Reorganize contributed completion scripts to add zsh completion
Upstream-commit: 27fc01271ec3b9f86da415c024d96d79bc23e2fd
Component: engine
2013-10-16 11:40:56 -07:00
Tianon Gravi b798342998 Merge pull request #2220 from tianon/vim
Add vim syntax highlighting for Dockerfiles from @honza
Upstream-commit: 97ab118fbb13c9a9c700a51d58e099f4df3bea05
Component: engine
2013-10-16 11:40:42 -07:00
Tianon Gravi 6de222a908 Merge pull request #2233 from tmc/master
Add mkimage-arch.sh
Upstream-commit: 0ca533ca356872b29586e4f59b443c667709d7e8
Component: engine
2013-10-15 19:27:45 -07:00
Travis Cline c5210160da Add mkimage-arch.sh
Upstream-commit: d94a027da6fc75e856b31246de0b4a49206e942b
Component: engine
2013-10-16 02:26:15 +00:00
Tianon Gravi ef800becac Refactor mkimage-debootstrap.sh to be much more full-featured
This includes the following:
- options to control certain parameters
- an option specifically for creating tarballs directly, esp. for dockerbrew
- the addition of the updates and security repositories for Debian images
- the addition of the universe, updates, and security repositories for Ubuntu images
- more correct tagging of Debian images
- tagging of Ubuntu image versions (12.04, 12.10, etc) and latest tag for LTS
Upstream-commit: 095aab9d975a149c33729a0b4981d5b2649167d2
Component: engine
2013-10-15 03:44:03 -06:00
Tianon Gravi baeaf54d26 Add vim syntax highlighting for Dockerfiles from @honza
See https://github.com/honza/dockerfile.vim
See also https://twitter.com/_honza/status/390046317579620352
Upstream-commit: ace059e409f0df056ace0191b02504d051b81d92
Component: engine
2013-10-15 03:35:13 -06:00
Tianon Gravi 56ffd7de59 Add zsh completion from @felixr with permission
See https://github.com/felixr/docker-zsh-completion for the original.
See also https://github.com/dotcloud/docker/issues/2202#issuecomment-26313287

Fixes #2202
Upstream-commit: 9da2b3590e52d7f3409d70f183382cee6d6ff81f
Component: engine
2013-10-15 03:04:06 -06:00
Tianon Gravi 66869bbf80 Move contrib/docker.bash to contrib/completion/bash/docker for better organization
Upstream-commit: e99ab1df9758bd7bd819e87bf231399ef8f031d6
Component: engine
2013-10-15 03:02:31 -06:00
Tianon Gravi 6d8f5d1b1a Rename mkimage-debian.sh to mkimage-debootstrap.sh to more clearly reflect its true function
Upstream-commit: 4967f9f19ca9ead375f7d0b3252f543082806c36
Component: engine
2013-10-15 02:26:10 -06:00
Tianon Gravi 4181aa5aa7 Remove @KSid from contrib maintainers for now
His availability has been very limited, so I'll take over completely for the short term until he can find more time to help out.
Upstream-commit: a0e5657cb6c795ddc7c124a9dadd10bac26a5ed3
Component: engine
2013-10-15 00:58:34 -06:00
Tianon Gravi b33972f66c Revamp install.sh to be usable by more people, and to use official install methods whenever possible (apt repo, portage tree, etc.), thus making it an official script and moving it to hack/
Upstream-commit: 94bf5b00112890ed84c38b9840802fa0142b507b
Component: engine
2013-10-11 00:53:15 -06:00
Solomon Hykes df618dc294 Merge pull request #2038 from tianon/mkimage-debian-fixes
Fix contrib/mkimage-debian.sh apt caching prevention
Upstream-commit: ee256ce6bfc08fbd6d04f5abd4c69f796145abb2
Component: engine
2013-10-10 17:59:17 -07:00
Tianon Gravi d81c62612b Merge pull request #1956 from tianon/bash-completion
Add proper bash completion for "docker push"
Upstream-commit: d5f9160441eac56448dbf8418e2f178ea2bcdd06
Component: engine
2013-10-09 05:47:55 -07:00
Tianon Gravi eb4a3a8402 Swap contrib MAINTAINERS
Upstream-commit: 4fda3314d871a28e33b0d901d6ca3a6d987c8dfa
Component: engine
2013-10-08 15:15:58 -06:00
Tianon Gravi e8211a620d Fix contrib/mkimage-debian.sh apt caching prevention
Upstream-commit: ee27444098aa91d69f8df6dd07139b9637719b1d
Component: engine
2013-10-07 13:41:10 -06:00
Tianon Gravi 3e9f502097 Merge pull request #1876 from asbjornenge/master
Added Dockerfile.tmLanguage to contrib
Upstream-commit: c52c95f97fe3a596d3114be88d5593f6fb8dba34
Component: engine
2013-10-03 23:52:37 -07:00
Asbjørn Enge 531e0dc8b0 Added Dockerfile.tmLanguage to contrib
Upstream-commit: 85a51396657945613141abb8a521e118db15afe3
Component: engine
2013-10-04 08:45:15 +02:00
Tianon Gravi bda4d2512b Add contrib/mkimage-centos.sh back (from #1621), and associated documentation link
Upstream-commit: d89ce09a76e7934338d4966d05f6b67618c8bfb0
Component: engine
2013-09-28 07:54:34 -06:00
Tianon Gravi 57f2e4e14d Add a few tweaks and fixes to contrib/mkimage-debian.sh
Add simple workaround for #1755 to contrib/mkimage-debian.sh

Add simple echo patch in contrib/mkimage-debian.sh to prevent init scripts from running during apt-get installs/updates

Add `apt-get clean` to mkimage-debian.sh for slightly smaller images

Add more small apt tweaks to mkimage-debian.sh thanks to @jpetazzo and @spahl
Upstream-commit: 10362870dbdd5063e62dde919f4bab764145d3e2
Component: engine
2013-09-23 22:39:57 -06:00
Tianon Gravi da0c0c9f58 Add proper bash completion for "docker push"
Upstream-commit: e37bb506286e7c3dfe29d7d237fa8b5c2304eabb
Component: engine
2013-09-20 21:22:51 -06:00
Tianon Gravi cdb2ec7f94 Remove many remaining docs references to the deprecated base repository and several other minor doc cleanups
Upstream-commit: 47904290a563801b15eb204516f32c9517c11a47
Component: engine
2013-09-19 10:27:08 -06:00
Nick Stinemates da2cdf809a Add Tianon to contrib/ maintainers
He's awesome and always contributing to this area.
Upstream-commit: 9946981c61c5eeafc1a15930e064bce8b7032a71
Component: engine
2013-09-16 04:50:53 +00:00
Michael Crosby bb7df4f70e Update docker.bash script for build -rm
Upstream-commit: 1d935c630745248d5851440eb0907cd363cd88d0
Component: engine
2013-09-12 16:57:10 +00:00
Victor Vieux 35ab6e6649 Merge pull request #1665 from dotcloud/ksid-contrib-maintainer
Make Kawsar Saiyeed @KSid the maintainer for contributed tools
Upstream-commit: 3528990c73e7457aad12093837c51a17fc99b82a
Component: engine
2013-08-30 17:07:03 -07:00
Daniel Mizyrycki 40fb0d73cb Merge pull request #1673 from xdissent/1659-upstart-order
Start docker after lxc-net to prevent ip forwarding race
Upstream-commit: 212b582362e66fc0d9403c0b8c46022f5d103224
Component: engine
2013-08-30 16:05:40 -07:00
Greg Thornton 6f14a61b9c Update remaining upstart scripts to wait for lxc-net
Upstream-commit: 3f141e1fd3a11507b049359ea59253b49395d494
Component: engine
2013-08-29 14:06:24 -05:00
Thomas Frössman 409e2bc9cf Fix bash completion, remove have
Should solve #1639.
Upstream-commit: 20772f90fff54f95fc8cafe2b0c9be4c093cbf64
Component: engine
2013-08-28 18:38:06 +02:00
Solomon Hykes b197b8dcec Make Kawsar Saiyeed @KSid the maintainer for contributed tools
Upstream-commit: f83d556bc0dec17af72bf3644fefdf0f232e206f
Component: engine
2013-08-24 17:16:52 -07:00
Kawsar Saiyeed c6434a3bd5 Add latest docker options to docker.bash
Adds bash completion options for the latest docker release (0.6.1)
Upstream-commit: 02d1d238cdde7b865879de1fc3f47acacfea0e82
Component: engine
2013-08-24 18:04:40 +01:00
Jérôme Petazzoni 0cd2fece97 Release script also takes care of index file (if the S3 bucket is WS-enabled)
Upstream-commit: 0469e47674f01d3f71e979d4597eb81371f124d9
Component: engine
2013-08-20 19:36:06 -07:00
Michael Crosby 36aa33727b Merge pull request #1538 from KSid/bash-completion-limit-containers
Bash Completion: Limit commands to containers of a relevant state
Upstream-commit: 9708597b0b1b5d7bccf26e038091215e82b3edfe
Component: engine
2013-08-14 16:16:25 -07:00
shin- ac3e60cfb0 brew: docker-py requirement points to git repository
Upstream-commit: 8b26e4ea3c92748a96b90fa245ccce7c7eebb81c
Component: engine
2013-08-14 23:31:18 +02:00
Joffrey F eee3eae225 brew: Fixed a bug with remote repository builds
Upstream-commit: 62c0f433fa794092fe2a795784f36fbac7b9feec
Component: engine
2013-08-14 05:05:44 +02:00
Kawsar Saiyeed 4d2fe13727 Limit commands to containers of a relevant state
Upstream-commit: 44eb1b3892cdcf3bda6478119d90cb69eafbc481
Component: engine
2013-08-14 02:45:03 +01:00
shin- 49824271a4 brew: Display a clear error message when the path is invalid
Upstream-commit: 2cebe09924c9afea47bb1f2444ba1cd8fc423669
Component: engine
2013-08-13 20:28:15 +02:00
shin- 3d705fcda8 brew: Updated requirements
Upstream-commit: e5f1b6b9a4b934eab9c42d6534fe52672c018405
Component: engine
2013-08-13 20:13:39 +02:00
shin- 1b1b67104d brew: Don't build if docker daemon can't be reached
Upstream-commit: 79fc90b6463d9b20391b4edd1540bc0a8e84da6f
Component: engine
2013-08-13 20:13:39 +02:00
shin- 6e12795b0e brew: Reuse repositories when possible
Upstream-commit: fb7c4214ced3b0533316e3eebd90ac07fe7b2933
Component: engine
2013-08-13 20:13:39 +02:00
Kawsar Saiyeed 44ac0a0f19 Still missed -entrypoint from 'docker run'
Upstream-commit: e737856a7f2c92f6cb582a12cc6f0b9fb4720d5a
Component: engine
2013-08-11 01:29:22 +01:00
Kawsar Saiyeed 7380689cdd Clarified bash completion limitations
Upstream-commit: ae1909b4823e500798f224a3ea70f7faf644a2bc
Component: engine
2013-08-11 01:08:47 +01:00