Commit Graph

650 Commits

Author SHA1 Message Date
fc2be6379b Merge pull request #9985 from jfrazelle/fix-exited-filter-should-not-show-running
`docker ps --filter exited=status` should not show running containers
Upstream-commit: 3ec695924009421f9b1f79368e9e5b1e3e2ca94f
Component: engine
2015-01-12 15:09:22 -05:00
6e3c62c8f5 Merge pull request #9987 from jfrazelle/fix-filter-status-exited-not-require-all
`docker ps --filter status=exited should not require passing -a`
Upstream-commit: e90e754682a4f041e9e7c8a23201524362a2433d
Component: engine
2015-01-12 15:05:58 -05:00
c24f558440 Fix a few minor issues with building/running inside msysGit
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: d43f0b9fc5ec3eae816466ec0307682c13945b31
Component: engine
2015-01-09 17:28:40 -07:00
3a63bcc0c5 Merge pull request #9980 from erikh/parser-with-no-command
Fix a parser error where an empty RUN statement would cause a panic
Upstream-commit: 32cde64c04acb0c227b9371028f68de1666bf503
Component: engine
2015-01-08 19:34:06 -05:00
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
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
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
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
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
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
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
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
eb6b6775f6 Amended TestExecParseError test
Usage string isn't printed anymore. User is adviced to see help instead
- according to coreutils standard.

Signed-off-by: Michal Minar <miminar@redhat.com>
Upstream-commit: 1db927113f3e7af83fac548c0e2da05bccbd8d56
Component: engine
2015-01-06 16:48:10 +01:00
bb2e382254 Merge pull request #9097 from brahmaroutu/publish_ports_8899
add ability to publish range of ports
Upstream-commit: 25f8c2664066a523f3f59f4cc5cdc8cf81c8a7c8
Component: engine
2015-01-05 14:05:47 -08:00
1c38530502 Change url of robots.txt test to dockerproject.com
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 367e66e9721c33a64ab091bd5430ab4a9af12083
Component: engine
2015-01-05 11:13:37 -08:00
986d8f11d2 add ability to publish range of ports
Closes #8899
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 2338a9cf5a1ba5576b92e49065335a9c9251ade0
Component: engine
2015-01-02 23:21:26 +00:00
a8c9181bdf Merge pull request #9800 from vieux/execIDs_inspect
Add ExecIDs to docker inspect
Upstream-commit: 12fef2d8df4e5da024418e324f7e3c3e82220a27
Component: engine
2014-12-29 15:32:33 -08:00
2156fea332 add test
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: c0bb1c77ee2461f8bceb03202f60f5673815c026
Component: engine
2014-12-29 23:00:17 +00:00
6f0f7a7c16 Merge pull request #9827 from LK4D4/test_for_removing_cgroups
Test for issue #9699
Upstream-commit: d47020d18ab22a061982a56f4d0d90658ce5e66a
Component: engine
2014-12-29 13:46:29 -08:00
3e645815a0 Rewrite TestRunNetHost to compare namespaces
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: e98c08a88fb5f3eedde158a3647a731c31bd4faa
Component: engine
2014-12-29 13:10:30 -08:00
94c4f7ea4b Fix done messages and error message for ipc tests
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 74ee405a27b19f2d91caaf50029cea3b13ddcaf2
Component: engine
2014-12-29 13:10:16 -08:00
fc5a9d42ea Merge pull request #9796 from LK4D4/fix_test_daemon
More graceful stop for testing daemon
Upstream-commit: 7156fb24427d48281892771eb9c6b3db10f361a3
Component: engine
2014-12-29 10:01:32 -08:00
6ef319bb81 Test for host networking
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 732c94a502cbda9a60d76e7af83c0569e919cdb9
Component: engine
2014-12-26 21:04:27 -08:00
81d2519112 Test for issue #9699
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: eda92e8834f0438ab4ec29fa26c66547279413e5
Component: engine
2014-12-26 20:11:27 -08:00
936e8f916b Merge pull request #9779 from jfrazelle/9771-non-local-mac-address-test
Add test for non local mac address.
Upstream-commit: b49d3dd588f0cfae8fc9bb226a2685fe4f4ccdc1
Component: engine
2014-12-26 19:33:44 -07:00
574dad0b9d Merge pull request #9792 from jfrazelle/9770-parse-exec-usage
Return usage on parseExec error.
Upstream-commit: 819b715b8d7e3ab12be64c289055ae628ba46c08
Component: engine
2014-12-26 17:45:55 -08:00
2ef01256f0 Add test for non local mac address.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 98d5720594d275071f43fbf90daf5fcd1166df8b
Component: engine
2014-12-26 10:22:14 -08:00
013643a0ba More graceful stop for testing daemon
Fixes problem with TestDaemonAllocatesListeningPort

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 8dc86c0e36da3d3206220fffc75004759dd5d2cb
Component: engine
2014-12-23 13:15:19 -08:00
301d5a4920 Return usage on parseExec error.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 7fdbd90f8805736aa78156faf7e6f8fdd2384af7
Component: engine
2014-12-23 12:49:45 -08:00
492ed0b266 Merge pull request #9583 from brahmaroutu/remove_container_9569
Error should be 409 as the container is different state to remove
Upstream-commit: 1e2d0d17d98e25cd315a60ab6ca83c1662ebe649
Component: engine
2014-12-23 10:09:58 -08:00
12ac4f3199 Merge pull request #9615 from unclejack/bump_go_to_1.4
bump Go to 1.4
Upstream-commit: d09421a74fa268274c50308f2655e654949f505b
Component: engine
2014-12-22 15:07:57 -08:00
5364411768 Merge pull request #7003 from porjo/6034-fowardChain
Move per-container forward rules to DOCKER chain
Upstream-commit: 04117e4021da9d7fcd376b345074b84ebbd4f0ce
Component: engine
2014-12-22 14:40:42 -08:00
bc1cbc1f63 Fix TestBuildWithTabs for go 1.4
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: a31c14cadca4052a0a141347b322d825f56b814b
Component: engine
2014-12-21 13:49:45 +02:00
4b105a7583 Create tests for pkg/iptables
Docker-DCO-1.1-Signed-off-by: Ian Bishop <ianbishop@pace7.com> (github: porjo)
Upstream-commit: 0da92633b4161ed1f8babe5ec4a9fe98257d34b5
Component: engine
2014-12-21 12:57:32 +10:00
e61e114873 Enable test-integration-cli for Windows platform
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: f3ed42286e7df3a35ca41a4d19fab2a53a08b382
Component: engine
2014-12-20 16:40:40 -08:00
1ba8727736 Error should be 409 as the container is different state to remove
Closes #9569

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 6599aa3368f369e6b8632cc2c12f214b0450a5a6
Component: engine
2014-12-19 19:00:28 +00:00
98bb6eba72 Make FROM scratch a special cased 'no-base' spec
There has been a lot of discussion (issues 4242 and 5262) about making
`FROM scratch` either a special case or making `FROM` optional, implying
starting from an empty file system.

This patch makes the build command `FROM scratch` special cased from now on
and if used does not pull/set the the initial layer of the build to the ancient
image ID (511136ea..) but instead marks the build as having no base image. The
next command in the dockerfile will create an image with a parent image ID of "".
This means every image ever can now use one fewer layer!

This also makes the image name `scratch` a reserved name by the TagStore. You
will not be able to tag an image with this name from now on. If any users
currently have an image tagged as `scratch`, they will still be able to use that
image, but will not be able to tag a new image with that name.

Goodbye '511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158',
it was nice knowing you.

Fixes #4242

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 8936789919c5c8004f346f44a3452d1521818b60
Component: engine
2014-12-18 14:03:38 -08:00
4af408b6c1 Merge pull request #9635 from duglin/Issue3936
Allow for relative paths on ADD/COPY
Upstream-commit: 364720b5e7e725cdc466171de873eefdb8609a33
Component: engine
2014-12-18 06:58:50 -08:00
a9b8d39261 Allow for relative paths on ADD/COPY
Moved Tianon's PR from: https://github.com/docker/docker/pull/7870
on top of the latest code

Closes: #3936

Signed-off-by: Andrew Page <admwiggin@gmail.com>
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: f21f9f856e9d5af23521f131799028c2e67c04ed
Component: engine
2014-12-18 05:13:04 -08:00
0935b51529 Merge pull request #9181 from icecrime/allocate_daemon_ports
Allocate daemon listening ports
Upstream-commit: 21bba5d93a888e20d7fa8d7dd56efbdd1fd486c1
Component: engine
2014-12-17 18:01:20 -08:00
6b6aa4bf22 Merge pull request #9643 from LK4D4/fix_vet_errors
Fix vet errors
Upstream-commit: 17cacf3326edde6d177e12132f74fc0174bda1d2
Component: engine
2014-12-16 12:04:15 -08:00
55ec358b5c Merge pull request #9610 from duglin/Issue9602
Wrap strings that could look like ints in quotes
Upstream-commit: eea9f0e781f5a2cc438aad11315253b6fb42ed9e
Component: engine
2014-12-16 12:02:26 -08:00
2187cf5beb Merge pull request #9122 from dqminh/debug-huge-expose
Expose a large number of ports should not slow down builder
Upstream-commit: a76f7c6ec32431b6cbf286d9be86f7dde0b3ac0d
Component: engine
2014-12-16 10:03:31 -08:00
2fa048715a Merge pull request #9631 from cpuguy83/9628_fix_volumes_hostconfig_on_start
Fix volumes-from/bind-mounts passed in on start
Upstream-commit: 24d03b8ddee1d4b19d3ab34f66e4c54dda8b129e
Component: engine
2014-12-15 15:51:57 -08:00
8ef74b2a51 Merge pull request #9638 from crosbymichael/build-volumes-retain-contents
Add test to enforce volume build content
Upstream-commit: b84bfb43cdf94045a705989c7b1a4fb47f7ed84a
Component: engine
2014-12-15 14:54:38 -08:00
ecd4852381 Fix volumes-from/bind-mounts passed in on start
Fixes #9628
Slightly reverts #8683, HostConfig on start is _not_ deprecated.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: d44c9f91472eb3df4c38c669134df04b2ccf9953
Component: engine
2014-12-15 16:51:15 -05:00