Commit Graph

20395 Commits

Author SHA1 Message Date
24f7ba3a1f docker ps --filter exited=status should not show running containers
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 81f84023bef5e94dfbcfbb44443bc03707b355c4
Component: engine
2015-01-08 16:23:54 -08:00
5b02f75ce3 docker ps --filter status=exited should not require passing -a
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 2639e073b19f526ceecbede9439aed0aba0a4ad8
Component: engine
2015-01-08 15:37:07 -08:00
146962fdd3 Adding IPv6 network support to docker
Signed-off-by: Malte Janduda <mail@janduda.net>
Upstream-commit: 813ff7f19d6a097f39dae363d8dd81b70eee515a
Component: engine
2015-01-09 00:13:09 +01:00
093790b35a Fix order of pause and port in command line documentation.
Signed-off-by: Andreas Köhler <andi5.py@gmx.net>
Upstream-commit: 3807d96d379cb5b08ad3dae3d624fb3d24306b77
Component: engine
2015-01-08 23:21:54 +01:00
52226000bd Merge pull request #9918 from SvenDowideit/state-centos-kernel-restrictions-clearly
Centos project does not support custom kernels
Upstream-commit: 273472a5c21075fa6fd223e30ddd6451fa180044
Component: engine
2015-01-08 14:19:24 -08:00
d3407c8087 Merge pull request #8456 from lindenlab/cleanup-repository-info
Cleanup: Replace ResolveRepositoryName with RepositoryInfo{}
Upstream-commit: 6870bde5847d4484d87f91baf58edc52f575ea5d
Component: engine
2015-01-08 17:19:03 -05:00
8404235dd8 Merge pull request #9648 from estesp/9202-update-resolvconf
Update container resolv.conf when host network changes /etc/resolv.conf
Upstream-commit: 92af1f014520b4f75a6220478b01ed6a02ca5bfb
Component: engine
2015-01-08 14:06:55 -08:00
a6dde9956d Adding workaround to suppress gofmt issues with api/client/utils.go
Signed-off-by: Don Kjer <don.kjer@gmail.com>
Upstream-commit: 33b931e718b89fec64705471534f8df3d5e42c4c
Component: engine
2015-01-08 21:16:43 +00:00
196597b4ad Moving NewIndexInfo, NewRepositoryInfo and associated helpers into config.go
Signed-off-by: Don Kjer <don.kjer@gmail.com>
Upstream-commit: 6f0068f2733232b8357c2308517f6ddddb63aace
Component: engine
2015-01-08 20:15:00 +00:00
5aa04a56fb Deprecating ResolveRepositoryName
Passing RepositoryInfo to ResolveAuthConfig, pullRepository, and pushRepository

Moving --registry-mirror configuration to registry config

Created resolve_repository job

Repo names with 'index.docker.io' or 'docker.io' are now synonymous with omitting an index name.

Adding test for RepositoryInfo

Adding tests for opts.StringSetOpts and registry.ValidateMirror

Fixing search term use of repoInfo

Adding integration tests for registry mirror configuration

Normalizing LookupImage image name to match LocalName parsing rules

Normalizing repository LocalName to avoid multiple references to an official image

Removing errorOut use in tests

Removing TODO comment

gofmt changes

golint comments cleanup.  renaming RegistryOptions => registry.Options, and RegistryServiceConfig => registry.ServiceConfig

Splitting out builtins.Registry and registry.NewService calls

Stray whitespace cleanup

Moving integration tests for Mirrors and InsecureRegistries into TestNewIndexInfo unit test

Factoring out ValidateRepositoryName from NewRepositoryInfo

Removing unused IndexServerURL

Allowing json marshaling of ServiceConfig.  Exposing ServiceConfig in /info

Switching to CamelCase for json marshaling

PR cleanup; removing 'Is' prefix from boolean members.  Removing unneeded json tags.

Removing non-cleanup related fix for 'localhost:[port]' in splitReposName

Merge fixes for gh9735

Fixing integration test

Reapplying #9754

Adding comment on config.IndexConfigs use from isSecureIndex

Remove unused error return value from isSecureIndex

Signed-off-by: Don Kjer <don.kjer@gmail.com>

Adding back comment in isSecureIndex

Signed-off-by: Don Kjer <don.kjer@gmail.com>
Upstream-commit: 568f86eb186731b907b659e4ec64bda21c2fe31d
Component: engine
2015-01-08 20:14:58 +00:00
bfb2a1f176 Update the LXC version to 1.0.7 in PACKAGERS.md
Signed-off-by: Jessica Frazelle <jess@docker.com>

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 17373ca54b9caf2bc24d8a69c6b9639d167cb0cb
Component: engine
2015-01-08 11:37:53 -08:00
deb2f04620 Install lxc from source.
Haters gunna hate, cache bust. But this fixes a bunch of tests.

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: e3b3719f16cbae506d15474c122276e21f59d3a5
Component: engine
2015-01-08 11:37:48 -08:00
0e19110387 Fix a parser error where an empty RUN statement would cause a panic
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 09e3467452d24aca38810fa79a09d6371d2c0b5c
Component: engine
2015-01-08 11:30:08 -08:00
ae1406d798 Update container resolv.conf when host network changes /etc/resolv.conf
Only modifies non-running containers resolv.conf bind mount, and only if
the container has an unmodified resolv.conf compared to its contents at
container start time (so we don't overwrite manual/automated changes
within the container runtime). For containers which are running when
the host resolv.conf changes, the update will only be applied to the
container version of resolv.conf when the container is "bounced" down
and back up (e.g. stop/start or restart)

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 63a7ccdd2372d87f56f7a86da07c72ea51332c2a
Component: engine
2015-01-08 14:15:13 -05:00
61f441ceb8 Merge pull request #9978 from crosbymichael/update-libcontainer-jan8
Update libcontainer to be02944484da197166020d6b3f0
Upstream-commit: 8916e2582b4a4276080373563ea2e1b83bb2de3e
Component: engine
2015-01-08 10:59:15 -08:00
14432954b7 Merge pull request #9898 from SvenDowideit/document-https-proxy-daemon-setup
Add @ArikaChen's tip for using HTTPS proxy to pull
Upstream-commit: b168ef274aa6676d2fa4da071b06def22f3824be
Component: engine
2015-01-08 10:40:02 -08:00
dd96c3c9fc Update libcontainer to be02944484da197166020d6b3f0
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 16dbd84f6386519dbbcefeb81cdfa708bca8cfa8
Component: engine
2015-01-08 10:29:24 -08:00
8a714aa856 Add c++ client library
Signed-off-by: Luis Martínez de Bartolomé Izquierdo <lmartinez@biicode.com>
Signed-off-by: Luis Martínez de Bartolomé Izquierdo <lasote@gmail.com>
Upstream-commit: e54d8c47e45ca19ab9548a7e3689aa1584733210
Component: engine
2015-01-08 16:24:52 +01:00
6aa8095ea3 Remove BridgeIP from ipallocation pool
Closes #9938

Signed-off-by: Malte Janduda <mail@janduda.net>
Upstream-commit: f4551b8a48bdc7a135466398eecfb103fcde25c6
Component: engine
2015-01-08 16:21:09 +01:00
d2e16626e4 Make sure that ADD/COPY still populate the cache even if they don't use it
Closes #9880

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 6f20b957b09c0a7c81013088db7bcec6b3222613
Component: engine
2015-01-08 06:56:30 -08:00
634dc343e2 Rewritten as the requested SvenDowideit
Signed-off-by: Tangi COLIN <tangicolin@gmail.com>
Upstream-commit: b69580615f82efe1fccecf15fd09a6c5dfbb01f1
Component: engine
2015-01-08 09:33:08 +01:00
d7d0e51f38 Add ProxyFromEnvironment enables client via proxy.
Signed-off-by: Anders Janmyr <anders@janmyr.com>
Upstream-commit: 43d45e601fa13bc43228ae3b76b1b5c5737b0558
Component: engine
2015-01-08 08:12:31 +01:00
0027284b49 Move docs on the build API out of 'misc' and under 'Images' section
It seems odd to have such an important API hidden under 'misc'.
While in there I noticed that during the "-f Dockerfile" PR I changed
the query param from f to dockerfile and missed this one spot in the docs.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: b7cb29137bd9c8d7de73993cc7415b62acd498cd
Component: engine
2015-01-07 20:27:09 -08:00
5f20ff67a9 Make API docs v1.17 visible
w/o this one-liner the v1.17 docs didn't appear in the Reference dropdown
and I would get a 404 when I tried to access
.../reference/api/docker_remote_api_v1.17/

Not sure if there are other spots that need to be fixed but this seemed to
fix it for me.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 7275cd4bbccb9a3b3ea6b9422a59a092fb08bf8d
Component: engine
2015-01-07 20:14:45 -08:00
1f0a72e010 Specify ENV variables are also used for CMD.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 66387aee5970a9b100f0d14612d7b7726eaf7b9d
Component: engine
2015-01-07 10:07:44 -08:00
2872296531 Update Ubuntu image tag to 14.04
`apt-get update` for non-supported 12.10 doesn't work.
Building failed with
```
INFO[0011] The command [/bin/sh -c apt-get update && apt-get install -y redis-server] returned a non-zero code: 100
```

Signed-off-by: Evgeny Vereshchagin <evvers@ya.ru>
Upstream-commit: 736558b6ae15afb3f5f0d7ba7801fa44bec9f285
Component: engine
2015-01-07 18:12:02 +03:00
4aff255d5d Improve networking documentation with default mac address range
since we can control it with --mac-address.

Signed-off-by: Tangi COLIN <tangicolin@gmail.com>
Upstream-commit: d9ec04e18d5e1fede1afcec27a0d2c69d514a123
Component: engine
2015-01-07 11:01:32 +01:00
2f43c653ae Add a containerised test for the https cert doc
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: cf27b310c4fc8d2c13ba181398a628d03e1e3c58
Component: engine
2015-01-07 16:19:47 +10:00
5b87d47ac2 Centos project does not support custom kernels - see #9696
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: e23d07a110fcf615bf36defd76e7be06cd7e80df
Component: engine
2015-01-06 23:30:03 -05:00
5bab4d3f4f Merge pull request #9933 from cpuguy83/fix_api_docs_for_info
doc: Update API docs to reflect correct values for /info
Upstream-commit: f65b781d2151973c233d7c517635208c2b96dce4
Component: engine
2015-01-07 14:26:28 +10:00
1ccf95f569 Merge pull request #9936 from icecrime/noecho_start_attached
Fix cli echoing container ID on start -a|-i
Upstream-commit: 91509bfb669dca00dc1fd7ef680fc762a5deff61
Component: engine
2015-01-06 19:07:40 -08:00
fee739749d Fix cli echoing container ID on start -a|-i
The cli now doesn't echo the container ID when started using either -a
or -i. Also fixes `TestStartAttachCorrectExitCode` which incorrectly
called start with the result of wait rather than the container ID.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: eeefa2dc8c45a9be4cfb3a52029e6b46570e5ebe
Component: engine
2015-01-06 17:58:30 -08:00
58cea25946 Merge pull request #9707 from duglin/RenameDockerfile
Allow for Dockerfile to be named something else.
Upstream-commit: a67e7382b838bbf74d7e10b2c03434ce4657202e
Component: engine
2015-01-06 17:25:20 -08:00
269ee3bcdf Allow for Dockerfile to be named something else.
Add a check to make sure Dockerfile is in the build context
Add docs and a testcase
Make -f relative to current dir, not build context

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: eb3ea3b43c716ad727521a7d0bc20d7321bb0867
Component: engine
2015-01-06 16:33:26 -08:00
e576cc5858 Merge pull request #9896 from flowlo/doc-https
doc: Improve article on HTTPS
Upstream-commit: 2f588c69f271f69ac5da48903a5342a23313d7af
Component: engine
2015-01-07 10:21:07 +10:00
873526f7b8 Update API docs to reflect correct values for /info
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: cc3bf34c787f4fdf067a459158f38f8413ec4e33
Component: engine
2015-01-06 15:35:45 -08:00
2f04c54fbb Merge pull request #9928 from jfrazelle/cleanup-var
Cleanup unnecessary var.
Upstream-commit: 1aba2810a229e3beb8e1fba7838c4a5eaeae2fff
Component: engine
2015-01-06 15:03:30 -08:00
b060268a74 Merge pull request #8748 from duglin/Issue8330
Have .dockerignore support Dockerfile/.dockerignore
Upstream-commit: 6d780139c4b7960b482a5f4fbf043adb6673864b
Component: engine
2015-01-06 13:47:42 -08:00
e0d18f3201 Merge pull request #9829 from ashahab-altiscale/9812-lxc-custom-ip
LXC TEMPLATE ALLOWS IPV4 OVERRIDE
Upstream-commit: f51ee9fe8df6fe32fc70d265b456a688e1de8bfc
Component: engine
2015-01-06 13:25:09 -08:00
26492f1526 Merge pull request #9834 from jfrazelle/9820-overlay-btrfs
Add error when running overlay over btrfs.
Upstream-commit: 9d1caf4272ea0a28366989a67de56705cff70c40
Component: engine
2015-01-06 13:16:17 -08:00
7f219d12ee Cleanup unnecessary var.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 83ef40cbe98e450e1a66bda6eb663be02e5eb7a8
Component: engine
2015-01-06 11:35:49 -08:00
2e77fe142f Add error when running overlay over btrfs.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 32f1025b22d16872ead5ec2e3650bf76622fae99
Component: engine
2015-01-06 11:22:45 -08:00
1a4a1b2193 Have .dockerignore support Dockerfile/.dockerignore
If .dockerignore mentions either then the client will send them to the
daemon but the daemon will erase them after the Dockerfile has been parsed
to simulate them never being sent in the first place.

an events test kept failing for me so I tried to fix that too

Closes #8330

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 6d801a3caa54ad7ef574bc426aa1ffc412c5af82
Component: engine
2015-01-06 10:57:48 -08:00
985e3e60ac Merge pull request #8941 from agonzalezro/log-duplicates
Log when truncindex.Get returns >1 container
Upstream-commit: 84dc197b087dc63280cdae50795a36434a84fa6f
Component: engine
2015-01-06 10:41:19 -08:00
88e8bbba28 Merge pull request #9883 from tianon/irc-administration
Add initial new IRC administration cheat sheet of sorts
Upstream-commit: fa8b0769f6daf614e599dc43c6c02ddccac18709
Component: engine
2015-01-06 10:29:49 -08:00
8e21317253 Merge pull request #9858 from jfrazelle/exec-buildtag
The comment for build in exec had a typo
Upstream-commit: a33f7a07d1ea21d2a6912d84877eb7fc9e1c2303
Component: engine
2015-01-06 10:26:21 -08:00
10fbd71b68 Merge pull request #9603 from hqhq/hq_add_memory_swap
add support to set MemorySwap
Upstream-commit: 748b7459b3268c014e781d93fa9b374fe742b811
Component: engine
2015-01-06 10:09:21 -08:00
bb5364c7fd Add plus to build
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: f339d3bceb4634bba1bc27e455d0fd8505df17bf
Component: engine
2015-01-06 10:07:13 -08:00
1a0f6735e2 Merge pull request #9511 from cpuguy83/refactor_attach
Refactor daemon.attach()
Upstream-commit: 01412d336d71804645afaca991dd7450a33a4fb0
Component: engine
2015-01-06 09:57:49 -08:00
a47c2e06a0 Merge pull request #9927 from LK4D4/carry_of_9925
Fixed minor typo
Upstream-commit: 2389c295562fccfd598d27bd104ddf8a0fb97e3b
Component: engine
2015-01-06 09:54:03 -08:00