Commit Graph
11735 Commits
Author SHA1 Message Date
Erik Hollensbe 8aa0b668bd builder: whitelist verbs useful for environment replacement.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 4e74cd498b66e494b3336118a19c02000b282251
Component: engine
2014-10-27 17:38:25 +00:00
Erik Hollensbe a3019fc24f builder: handle escapes without swallowing all of them.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: be49867cab663b5bdcf7804f3d2504f056db9db1
Component: engine
2014-10-27 17:38:24 +00:00
Joe Ferguson b2f795f224 Cleanup docs Dockerfile, so it matches best practices.
Docker-DCO-1.1-Signed-off-by: Joseph Ferguson <joe@infosiftr.com> (github: yosifkit)
Upstream-commit: 9a03652d9614e9d0a816bab2d2c672236d2d3d23
Component: engine
2014-10-27 09:35:27 -07:00
Jessie Frazelle d5e3aaa45d Merge pull request #8782 from shuai-z/rm-clean
removed redundant Clean
Upstream-commit: 80d35c7fd0ca3a3c8d4dd4b4cd575048a9fbc092
Component: engine
2014-10-27 09:23:10 -07:00
Jessie Frazelle 6c8bda9fe4 Merge pull request #8770 from LK4D4/logrus_support
Logrus support
Upstream-commit: 15b6b7be010546f30d7eabd000167d428efc0b13
Component: engine
2014-10-27 09:05:24 -07:00
Tibor Vass c6209d5ca3 Merge pull request #8641 from vbatts/vbatts-archive_test_and_benchmark
archive: tests and benchmarks for hardlinks
Upstream-commit: 2b4173620586853480c0977743550dbe8c2697b7
Component: engine
2014-10-27 09:55:19 -04:00
Alan Thompson 566532574e Update faq.md
Minor language clarification.
Upstream-commit: 6e208b7f1c8130735018940ff95bf8b3662cab72
Component: engine
2014-10-26 19:57:52 -07:00
shuai-z 854a22f34f removed redundant Clean
The doc (or src) says: The result is Cleaned.

http://golang.org/pkg/path/filepath/#Join

Signed-off-by: shuai-z <zs.broccoli@gmail.com>
Upstream-commit: ce407ccff4fb4245384e50d86870d2e247cd43ec
Component: engine
2014-10-26 13:55:29 +08:00
Lakshan Perera fdfe0c97e7 Add HasValidGITPrefix to utils/utils.go
This will allow us to use a common Git prefix check for both api/clients/commands.go and
builder/job.go. Previous prefix check in build from Git (in builder/jobs.go) ignored valid prefixes such as "git@", "http://" or "https://".

Signed-off-by: Lakshan Perera <lakshan@laktek.com>
Upstream-commit: d3ac9ea98e872fee808693c736bc5a465d6426e2
Component: engine
2014-10-26 03:25:25 +00:00
Tianon Gravi 29c195c7fd Merge pull request #6992 from mschurenko/master
include --releasever=/ in mkimage-yum.sh
Upstream-commit: 5631ffbdfd252c369d393e41ee86008ab2d7eb7c
Component: engine
2014-10-25 02:03:32 -06:00
Tianon Gravi 36b26c05e8 Merge pull request #8643 from jfrazelle/fix-amazon-linux-dist
Fix amazon linux dist
Upstream-commit: 10d33150802d848c98adf256df81d949c83cf3cf
Component: engine
2014-10-24 19:26:27 -06:00
Tibor Vass 9609160b54 Merge pull request #8321 from erikh/ui_save_output
docker save: Do not save to a terminal.
Upstream-commit: 350e1b783d4deafbb62ede4d17df37dbaffa373a
Component: engine
2014-10-24 19:37:14 -04:00
Andrea Luzzardi e6c9b85c85 Expose # of CPUs and memory available on docker info.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 61f8001c23dc4fbd7b1113f20b89a0dbade9aa82
Component: engine
2014-10-24 15:56:37 -07:00
Alexandr Morozov bd2b080653 Merge pull request #8744 from erikh/empty_entrypoint_inheritance
builder: some small fixups + fix a bug where empty entrypoints would not override inheritance.
Upstream-commit: c681bea0620d24e9df370147a13a98f94bc66ee0
Component: engine
2014-10-24 15:31:15 -07:00
Alexandr Morozov bad39206ea Mass gofmt
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: ee7dd44c017458c8fe0be8e09569b1238366dca3
Component: engine
2014-10-24 15:11:48 -07:00
Alexandr Morozov 352377fa69 Remove pkg/log
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: b99dcb3c7ef6e66754354292f2ec0217341c8d2b
Component: engine
2014-10-24 15:03:24 -07:00
Alexandr Morozov 06bafa7589 Use common logging in engine
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: b3b40433451d8e76d02dc70d591027f680c9a3bf
Component: engine
2014-10-24 15:03:24 -07:00
Alexandr Morozov 2d56e3cbc6 Use logrus everywhere for logging
Fixed #8761

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 7c62cee51edc91634046b4faa6c6f1841cd53ec1
Component: engine
2014-10-24 15:03:06 -07:00
Alexandr Morozov 7fa7b2fbdb Vendor logrus logging framework
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 6229a364324ba603789bc38607bb628177280ebf
Component: engine
2014-10-24 15:01:52 -07:00
Tibor Vass 93029bdc4e Merge pull request #8325 from mwhudson/do-not-use-X
Stop using -X flag to set global variables
Upstream-commit: d515590d153ed1299ffe386eb30598c15bf61007
Component: engine
2014-10-24 17:30:45 -04:00
James Turnbull 65068e254b Merge pull request #8746 from aluzzardi/bump-api-v1.16
Bump API to v1.16.
Upstream-commit: 78075abf81c45bfca16604919136eae99a2d7bff
Component: engine
2014-10-24 16:47:48 -04:00
Vincent Batts 5224a151c8 registry/endpoint: make it testable
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 3eba719400d5016aa0cbecbed1e222f810237b5b
Component: engine
2014-10-24 16:27:17 -04:00
Fred Lifton 462b389e50 Add back Best Practices link.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: fcae37402aac7372414fd4947b7a280bec398557
Component: engine
2014-10-24 13:17:14 -07:00
Victor Vieux 66e2b5cf0f Merge pull request #8760 from jfrazelle/8745-output-log
Client should use go log package.
Upstream-commit: 665cd10d59ee6ea54f64f5b8e4ca30d07f3afdb7
Component: engine
2014-10-24 13:13:30 -07:00
Jessie Frazelle 29e2118279 Merge pull request #8315 from dqminh/save-start-error
Save start error into State.Error when the container fails to start
Upstream-commit: 9094c19a6d69f5adf438463f6a3c19f5dad42bd9
Component: engine
2014-10-24 13:13:00 -07:00
Jessica Frazelle 4d1b4a2f11 Client should use go log package.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: a7aedca4a1afe72d63346b67b577437f175776b9
Component: engine
2014-10-24 13:03:46 -07:00
Fred Lifton 20fbd71b3d Tweaks to Dockerfile tutorial
Made a few tweaks to Dockerfile tutorial links and removed some cruft from the tutorial itself.

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: cc45b13ad4e4384f016764c15a52eda95eb548a4
Component: engine
2014-10-24 12:00:47 -07:00
Andrea Luzzardi 82b5bee9bb Bump API to v1.16.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: ca6cc6560987a87b8f3b4fe4c3c227d692c49117
Component: engine
2014-10-24 11:25:44 -07:00
Vincent Batts 7c1ecdcafa archive: tests and benchmarks for hardlinks
Adding moar information, so benchmark comparisons can be moar
comparative.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 0fdf7839a21390f5813589195639caf594a3ddc2
Component: engine
2014-10-24 08:58:31 -04:00
Nicolas De loof 4391a7b5ae Document alternate command to check encrypted TCP socket
as curl command seems to fail on OSX Mavericks

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
Upstream-commit: ab03e898ff22e1bdb2452cfc2d9aad1313c97fc9
Component: engine
2014-10-24 09:15:15 +02:00
Mathias Monnerville e7c0f6f001 dockerimages.md: typo fix
Upstream-commit: 417fde550e30e6e2b8853f73f6c85f25b9c6a80f
Component: engine
2014-10-24 09:09:20 +02:00
Sven Dowideit 083e0d1a65 Add a link to some documentation about exec.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 7f1ea7129e7b87e60ea4b1e4449b0541f6f432c9
Component: engine
2014-10-24 12:41:19 +10:00
James Turnbull 740280e4a3 Merge pull request #8722 from SvenDowideit/sven-cannot-bash
Add --dryrun to allow testing to the docs-release site, and then fix the...
Upstream-commit: c6f242b88f7a40d183a95ab68f2a97052ec514a5
Component: engine
2014-10-23 21:37:55 -04:00
James Turnbull a0bb629ead Merge pull request #8695 from SvenDowideit/add-details-to-entrypoint-docs
Rewrite ENTRYPOINT documentation covering all the combinations with exam...
Upstream-commit: 8f79bd964fa58124e0f3f4b1c1fdfef04f16a454
Component: engine
2014-10-23 21:37:36 -04:00
Sven Dowideit ff5f13dc15 Add --dryrun to allow testing to the docs-release site, and then fix the double dollar mistake
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 4bae6235c0aec3a0e3805b046a08fc7e6aadd46b
Component: engine
2014-10-24 11:36:07 +10:00
Michael Crosby ecded68887 Merge pull request #8671 from shuai-z/master
Port number 49153(BeginPortRange) would be returned twice, causing dupli...
Upstream-commit: 0e6242122d9780709c057fc32e9970529c2e09fb
Component: engine
2014-10-23 17:37:38 -07:00
Erik Hollensbe dc1bcb95a0 builder: some small fixups + fix a bug where empty entrypoints would not override inheritance.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: cdd6e97910c50e5766c8bec2121f906e9ee2d119
Component: engine
2014-10-24 00:23:25 +00:00
Victor Vieux ea99d5664f do not send hostconfig at start, as we do on create now
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 12028fc159c6c383b1b9e8810a7a41a7c6c985bc
Component: engine
2014-10-24 00:22:21 +00:00
Victor Vieux f5318af0df Merge pull request #8737 from brahmaroutu/resize_uponstart_8728
Allowing resize tty to only work when container is started
Upstream-commit: a71b2ec54ad7b5f809176c023ab22c7e062ad909
Component: engine
2014-10-23 17:20:10 -07:00
Andrea Luzzardi 2d4979cc75 Merge pull request #8453 from estesp/8444-create-bridge-error
Gracefully handle network bridge without IP association at startup
Upstream-commit: a76c924e6a23329569136bb8569168319f738656
Component: engine
2014-10-23 17:00:21 -07:00
Michael Hudson-Doyle e41a8afa7b finally, use code generation for INITSHA1 & INITPATH too
Signed-off-by: Michael Hudson-Doyle <michael.hudson@linaro.org>
Upstream-commit: c7c620dd9fce0e7b437ee185c7a58341f3b8e3aa
Component: engine
2014-10-24 11:01:19 +13:00
Michael Hudson-Doyle c15381784d use code generation for GITCOMMIT/VERSION too
Signed-off-by: Michael Hudson-Doyle <michael.hudson@linaro.org>
Upstream-commit: 85744a35de0e30c2dd6741b833f38ff218c8a3fc
Component: engine
2014-10-24 10:58:39 +13:00
Michael Hudson-Doyle 4602c3289a Use code generation to set IAMSTATIC instead of -X
Signed-off-by: Michael Hudson-Doyle <michael.hudson@linaro.org>
Upstream-commit: 3e10b93106dea94e5747ab32fe4ac765aa22f9bc
Component: engine
2014-10-24 10:56:51 +13:00
Srini Brahmaroutu d9b4e1dcc3 Allowing resize tty to only work when container is started
Addresses #8728

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 78a272ce14a43f81a79f1b948d5cfd120405f8c9
Component: engine
2014-10-23 21:31:34 +00:00
Jessie Frazelle a6563fcbf3 Merge pull request #8736 from crosbymichael/update-libcontainer-oct3
Update libcontainer to aab3f6d17f2f56606f07f3a6eb6
Upstream-commit: 88e669391260900e48945c54ac74773b9b31816e
Component: engine
2014-10-23 14:07:36 -07:00
Phil Estes deaa163ba3 Gracefully handle network bridge without IP association at startup
Addresses #8444

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 1262b5f605e8f897acb2b9ee261edbab7f1f8947
Component: engine
2014-10-23 16:19:12 -04:00
Alexandr Morozov 546bdc45f6 Merge pull request #8735 from estesp/fix-test-timeout-on-drone
Up test timeout to 10s based on recent drone.io timeout failures
Upstream-commit: 77dcab133c784fa04cd61ddd73661624628be0bf
Component: engine
2014-10-23 13:02:34 -07:00
Michael Crosby 78bcad8438 Merge pull request #8733 from estesp/error-string-http-status-fix
Fix error string mapping to HTTP response code to ignore case
Upstream-commit: 45c511fd5a2f48d05763f7385c9fb6c2d9686f94
Component: engine
2014-10-23 12:10:21 -07:00
Michael Crosby 2fe580eb85 Update libcontainer to aab3f6d17f2f56606f07f3a6eb6
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 291b84610fc87622c7116ac71328c1ce3181a6db
Component: engine
2014-10-23 19:00:05 +00:00
Phil Estes 66fd2e972d Up test timeout to 10s based on recent drone.io timeout failures
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: ee17b93df9ef2150d0ef25e077f1f87637a54508
Component: engine
2014-10-23 14:30:39 -04:00