Commit Graph

486 Commits

Author SHA1 Message Date
b8ae174fd2 Merge pull request #11408 from Mashimiao/fix-wrong-tab-completion
fix wrong tab completion
Upstream-commit: ba6de9121f970f8e2576e4fa9486d3abf9c5811c
Component: engine
2015-03-20 10:46:26 -07:00
059dac075a Merge pull request #11456 from tianon/explicit-curl-missing-failure
Fail explicitly if curl is missing in contrib/download-frozen-image.sh
Upstream-commit: 56f483072d8bcba629ed8dd69e2a4eac334fb5c6
Component: engine
2015-03-19 16:23:07 -07:00
fd07d86cdd Merge pull request #11124 from tianon/autoremove-recommends
Set "Apt::AutoRemove::RecommendsImportant" to "false" in debootstrap
Upstream-commit: 9e5c0641e9046c1ed1f1d50c6ebfd93195bf4291
Component: engine
2015-03-19 16:00:40 -07:00
92a488b33b Fail explicitly if curl is missing in contrib/download-frozen-image.sh
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: b5763f8fa7309f95e21271fca99d0a71c05d0fef
Component: engine
2015-03-17 23:10:02 -06:00
25f628ce87 Updates to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 04ca2c1f2bcf9251689dc346baed6715fb99fb0e
Component: engine
2015-03-17 17:07:10 +01:00
5f00f97ea0 Merge pull request #9882 from ibuildthecloud/labels
Proposal: One Meta Data to Rule Them All => Labels
Upstream-commit: b6ac111abfbed628a80b67f0b092a248083b354c
Component: engine
2015-03-16 20:20:05 -07:00
288b71d9e8 Set "Apt::AutoRemove::SuggestsImportant" to "false" in debootstrap
This makes APT be appropriately aggressive about removing packages it added due to `Recommends` or `Depends` if the packages they were added for are removed (even if other packages only have the softer `Suggests` relationship).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: e6a18da53f99185882ecd0e915c236cf9d14f522
Component: engine
2015-03-16 17:28:54 -06:00
96c8f5fdd0 fix wrong tab completion
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 3bf125fce3b98bd04a359a9294aed644a9c11f09
Component: engine
2015-03-16 19:02:53 +08:00
719f00fbf2 Move scripts back to hack/, leave docs in project/
This also removes the now-defunct `*maintainer*.sh` scripts that don't work with the new TOML format, and moves a couple not-build-or-release-related scripts to `contrib/` instead.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 949a21b55f3b8d7d1ae7a7b9829111a8f0dbf7e2
Component: engine
2015-03-13 14:04:08 -06:00
51b13a7774 Allow specification of Label Name/Value pairs in image json content
Save "LABEL" field in Dockerfile into image content.

This will allow a user to save user data into an image, which
can later be retrieved using:

docker inspect IMAGEID

I have copied this from the "Comment" handling in docker images.

We want to be able to add Name/Value data to an image to describe the image,
and then be able to use other tools to look at this data, to be able to do
security checks based on this data.

We are thinking about adding version names,
Perhaps listing the content of the dockerfile.
Descriptions of where the code came from etc.

This LABEL field should also be allowed to be specified in the
docker import --change LABEL:Name=Value
docker commit --change LABEL:Name=Value

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: cdfdfbfb6223fdd5b319942d412caac6bc09cdeb
Component: engine
2015-03-13 09:47:09 -07:00
baa877aaee Add CONFIG_CPUSETS to check-config.sh
See also https://bugs.gentoo.org/show_bug.cgi?id=536546:

```console
$ docker run learn/tutorial echo "hello world"
FATA[0001] Error response from daemon: Cannot start container 1d0c0ca5cc7f39a271ec40c1479a80bffb7190fab97392b3453a1fc0b2dc8e78: mountpoint for cpuset not found
```

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 03de73a5e075e16656f5399f1957f7190f7bdc44
Component: engine
2015-03-13 09:18:10 -06:00
fd3cd22156 Update "download-frozen-image.sh" with Bash 3 support for msysGit
This uses a bit of on-disk state in our export directory to emulate our associative array for generating the "repositories" JSON file.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 27aab3acc6b38ddc39d19e16d61d47f0a4436350
Component: engine
2015-03-12 12:32:16 -06:00
e0e2bdc16b Merge pull request #11280 from MabinGo/docs_api-enable-cors_deprecated
docs: --api-enable-cors is deprecated,updated docs description
Upstream-commit: cc4095a18cfff27dfca77251978b6a9bdaa5c86a
Component: engine
2015-03-11 15:28:28 -07:00
28a7abbf0e docs: api-enable-cors is deprecated,updated docs description
Signed-off-by: Mabin <bin.ma@huawei.com>
Upstream-commit: 0648e59ad85e676f8e0a02156ea5e79a6e106267
Component: engine
2015-03-11 11:38:37 +08:00
8c914c9a0f Need to support new linux capability AUDIT_READ
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 72f366238f443f7cbbf4ada76bd5ab4b36495251
Component: engine
2015-03-10 20:01:06 -04:00
c071c815d3 Refactor busybox downloading as generic "frozen-images"
This makes it much simpler to add new "frozen" images -- simply add them to the `Dockerfile` and in `hack/make/.ensure-frozen-images` and you're off to the races.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 09b4c2585284d1125d4d299a7d58b36c1d0baf17
Component: engine
2015-03-09 19:02:59 -06:00
a630d7f64a Merge pull request #10893 from ahmetalpbalkan/win-cli/BuildViaDockerfileURL-same-host-fix
integ-cli: Implement remote FakeStorage server for build via URL tests
Upstream-commit: 7c4951d552d25c0608c44d03529c6b8cbe5d1e06
Component: engine
2015-03-09 13:33:40 -07:00
60d13dc8cb integ-cli: Implement remote FakeStorage server for build via URL tests
Implemented a FakeStorage alternative that supports spinning
up a remote container on DOCKER_TEST_HOST to serve files over
an offline-compiled Go static web server image so that tests which
use URLs in Dockerfile can build them over at the daemon side.

`fakeStorage` function now automatically chooses if it should
use a local httptest.Server or a remote container.

This fixes the following tests when running against a remote
daemon:

- `TestBuildCacheADD`
- `TestBuildCopyWildcardNoFind`
- `TestBuildCopyWildcardCache`
- `TestBuildADDRemoteFileWithCache`
- `TestBuildADDRemoteFileWithoutCache`
- `TestBuildADDRemoteFileMTime`
- `TestBuildADDLocalAndRemoteFilesWithCache`
- `TestBuildADDLocalAndRemoteFilesWithoutCache`
- `TestBuildFromURLWithF`
- `TestBuildApiDockerFileRemote`

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 2e95bb5f1a65d90f412568d6df82a9e2cdd3e790
Component: engine
2015-03-09 12:03:55 -07:00
3a84d64ca0 Merge pull request #11251 from coolljt0725/add_ulimit_to_bash_completion
Add --ulimit and --default-ulimit to bash completion
Upstream-commit: 228449b631f3dae41f5cb1e333aa226842f0ea49
Component: engine
2015-03-09 11:30:42 -07:00
79aa6db88c Merge pull request #10896 from albers/bash-completion
Update Bash completion for docker events
Upstream-commit: 6135ec89ad41bbf4ebf6af3b8830c0f332ac30c2
Component: engine
2015-03-09 10:02:50 -07:00
3d373cfc0f Add --ulimit and --default-ulimit to bash completion
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: fb25a2f2aa757bbb96892cdac6db79049c253603
Component: engine
2015-03-09 20:36:09 +08:00
5506a9a27c Remove subdirectories MAINTAINERS files
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 89bdaa35e04b74b7c6528783e0f7b8154b2a3d31
Component: engine
2015-03-06 18:21:51 -08:00
4fbcc1c55f Merge pull request #11119 from tianon/busybox-from-hub
Download busybox from the Hub instead of GitHub
Upstream-commit: 2aab992e175c0ddee7a248c5a1d6ece43466b253
Component: engine
2015-03-06 18:01:43 -05:00
b1cab115d7 Fix docker build and docker run bash completion
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 00d3727106ef4d1280175a135b36b80c8bfc6a7b
Component: engine
2015-03-06 15:35:52 +08:00
4db1bd0735 Add bash completion for docker events --filter and --until.
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 43804baa33958466e2f487ce0b96cba475116ab1
Component: engine
2015-03-05 19:00:47 +01:00
66a4f89602 Update contrib/mkimage/debootstrap whitespace for consistency
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: dec67f7f573855cd1760ed180efc006f5a900c2d
Component: engine
2015-03-02 18:33:38 -07:00
66c985e514 Download busybox from the Hub instead of GitHub
This downloads a specific image ID of `busybox:latest` from the Hub directly (within the `Dockerfile`, ready for `docker load`) instead of grabbing the source from GitHub and doing a `docker build` at daemon start time.  This ensures the test suite runs more consistently.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 351074edcd22e4ca587713feda541268a66cdb86
Component: engine
2015-03-02 14:38:19 -07:00
bb531c2235 Adjust contrib/mkimage/debootstrap PATH handling to be more robust
Instead of applying it only for the final `chroot`, this adds a chroot helper function to apply it appropriately for every chroot, including making sure that we find `chroot` in our current host `PATH` in case it's in a strange place.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 91770ec9e4b5bce330ddebc421248d275549ccc5
Component: engine
2015-02-28 00:11:55 -07:00
9654cdc98a export a proper debian PATH for the chroot
when running in the chroot, it would be expected to have a Debian-ish environment,
most important the PATH variable. Otherwise the host PATH would be used which can wrong
for Debian, especially if the host is Arch (which doesn't have /bin, /sbin or /usr/sbin).

Signed-off-by: Damjan Georgievski <gdamjan@gmail.com>
Upstream-commit: a8713271355c68023ea090eb223682e784c64f93
Component: engine
2015-02-27 23:56:42 -07:00
eadcf24d19 Merge pull request #10936 from vincentbernat/fix/zsh-completion-update-3
zsh: update zsh completion for docker command
Upstream-commit: 09c4b4571225852692c1ac1beb8e9fe5209a62be
Component: engine
2015-02-23 16:01:59 -08:00
5ac832ddd3 zsh: update zsh completion for docker command
zsh completion is updated with the content of
felixr/docker-zsh-completion.

ef4a3fce0437 Update completion for `wait' as per 1.5.0
ace5aa9c1282 Add completion for `stats'
91f112834865 Update completion for `search' as per 1.5.0
a5e4febe4bf6 Update completion for `save' as per 1.5.0
1cdbdb18a384 Add completion for `rename'
2f004bb724b9 Update completion for `pull' as per 1.5.0
773b88e0885b Update completion for `logs' as per 1.5.0
c57e5d5c4551 Update completion for `load' to favor archive files
9af7d12b487e Update completion for `images` as per 1.5.0
0d59e66aff30 update completion for `exec' to complete on commands
46b6c66760d7 Update completion for `events' as per 1.5.0
307e0bdc4c34 Update completion for `commit' as per 1.5.0
c4b331f38cc4 Update completion for `build' as per 1.5.0

Also added myself in the `MAINTAINERS` file.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: 33fa1978799599f48694680ad6f73b7ecfaa924d
Component: engine
2015-02-24 00:16:30 +01:00
216293ecdf Merge pull request #10887 from lkinley/master
Patch mkimage-yum.sh to work with Amazon Linux (2014.09)
Upstream-commit: acda41e7c3999d1aca0a3298f87e219873fb2f4e
Component: engine
2015-02-23 11:43:12 -08:00
1aeb75c1f3 Merge pull request #10418 from bobrik/overlay-kernel-checks
Checking EXT4_FS_SECURITY for overlay
Upstream-commit: 55566f2f8f10086d3f030deebd53915978f0591f
Component: engine
2015-02-19 14:29:17 -08:00
30320ed3ab Merge pull request #10886 from ahmetalpbalkan/win-cli/TestMainHelpWidth-fix
Shorten printed Windows paths on docker help command
Upstream-commit: e3fa8b36c285e564b8541e1d6e07c32cc351edf0
Component: engine
2015-02-19 11:33:50 -08:00
ab127964ad Shorten help messages for docker cmd flags
In order to fit printed messages to fit 80 chars,
rewording messages for `-H` and `--tls` flags.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 27a73a98b704b77eaa7c4caebfeaa84743969c67
Component: engine
2015-02-18 22:52:33 -08:00
3129d0fb83 Patch mkimage-yum.sh to work with Amazon Linux (2014.09)
Signed-off-by: Lance Kinley <lkinley@loyaltymethods.com>
Upstream-commit: c15970eff946580f10e4d5a6c216f004caa9efb8
Component: engine
2015-02-18 15:17:15 -08:00
5bbe01e609 Add bash completion for docker rename
Signed-off-by: Mike Dillon <mike@embody.org>
Upstream-commit: ded88a3170749cc2661c8a48a6d1398faad0fe5c
Component: engine
2015-02-18 11:49:05 -08:00
11e97d1f42 Fix bash completion for docker run -d
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 01bd90c4ad5322d443d6952c897dd6ba8d17a3ba
Component: engine
2015-02-16 19:23:29 +01:00
6a9a983a60 Merge pull request #10762 from coolljt0725/fix_check_config
Fix check-config.sh usage
Upstream-commit: 4f24b77826227a17048432a51d728a5ea05dceaa
Component: engine
2015-02-13 10:36:00 -08:00
935df32156 mkimage-alpine.sh: Allow to change ARCH from the environment
Signed-off-by: Manfred Touron <m@42.am>
Upstream-commit: 75f1c440dd9332d28d33585bf16e05a7647412c9
Component: engine
2015-02-13 13:57:04 +01:00
44be94d7d0 Fix check-config.sh usage
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 82fda400b8a2528b1b90e64fc4be6827afbd04ed
Component: engine
2015-02-13 19:52:11 +08:00
2dc29a37bd Merge pull request #10598 from lsm5/core-file-size
no limit on core size
Upstream-commit: 9944f8b95453e3d0726fc037aaed41a98e72e070
Component: engine
2015-02-09 17:31:40 -08:00
12a8539065 Merge pull request #10277 from mleone896/rhinit_dead_pid_file
Fixing stale pidfile issue when docker dies abruptly
Upstream-commit: 6da5b88bedf7d14c7efb25ae659cccd8980732a4
Component: engine
2015-02-09 12:19:23 -08:00
2989e6a633 no limit on core size
set LimitCORE=infinity to ensure complete core creation,
allows extraction of as much information as possible.

Thanks to Ulrich Obergfell <uobergfe@redhat.com>
and Jeremy Eder <jeder@redhat.com>

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
Upstream-commit: ae9cdbbde7824951b124a648e897ac4c291108e3
Component: engine
2015-02-09 19:04:50 +00:00
71dfbf9d9b Fixing stale pidfile issue when docker dies abruptly
Signed-off-by: Mike Leone <mleone896@gmail.com>

fixing indent

Signed-off-by: Mike Leone <mleone896@gmail.com>
Upstream-commit: 05d04843e6b80f131c07882c882f7e4da018a306
Component: engine
2015-02-09 14:01:12 -05:00
379cbf8e87 Merge pull request #10443 from jbiel/patch-1
mkimage-arch.sh - don't run docker in interactive mode
Upstream-commit: 4b681c401c4e01e4cabdfc5197232272f3e88ba2
Component: engine
2015-02-09 08:45:20 -08:00
0eb30d2c37 Merge pull request #10623 from jfrazelle/update-fish
Update docker.fish
Upstream-commit: 7b7c8f587b81eee4733685cc11ad4b40f196d2d3
Component: engine
2015-02-07 12:37:21 -05:00
a6d778b8d7 Update docker.fish
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)

Signed-off-by: Coenraad Loubser <coenraad@wish.org.za>
Upstream-commit: 2471134ae38cf5a3743dc530ea746fb2ee42a107
Component: engine
2015-02-06 15:07:42 -08:00
695e4a4343 Merge pull request #10300 from hqhq/hq_add_args_for_checkconfig
add args support for check-config.sh
Upstream-commit: 77815c5492a20afc390b70ada662c3dc58e682c7
Component: engine
2015-02-06 13:49:09 -08:00
b9f1d0a0b4 Checking EXT4_FS_SECURITY and EXT4_FS_POSIX_ACL for overlay
Signed-off-by: Ian Babrou <ibobrik@gmail.com>
Upstream-commit: a6c6d8bb91a9e2fc2f9bd3da78382112794d17fe
Component: engine
2015-02-05 17:41:13 +03:00