ba0c92d010
Fix issue where build steps are duplicated in the output
...
This fixes an issue where the build output for the "Steps" would look like:
```
Step 1: RUN echo hi echo hi
```
instead of
```
Step 1: RUN echo hi
```
Also, I noticed that there were no checks to make sure invalid Dockerfile
cmd flags were caught on cmds that didn't use cmd flags at all. They would
have been caught on the cmds that had flags, but cmds that didn't bother
to add a new code for flags would have just ignored them. So, I added
checks to each cmd to flag it.
Added testcases for issues.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 08b7f30fcd050244026098673b19700485308b5a
Component: engine
2015-05-05 15:28:42 -07:00
a50e168bdf
Merge pull request #13003 from moxiegirl/machine-branch-change
...
Updating branch for machine docs
Upstream-commit: 78c70cc36419ef0dca94a5f9a4d804d149fcb4ce
Component: engine
2015-05-05 14:49:44 -07:00
f6876820fd
Merge pull request #11844 from jbarbier/cgroup-parent-42
...
Adding cgroup-parent option for docker build
Upstream-commit: e960e4bb129de15b3beb7da37421e32af8dccf2f
Component: engine
2015-05-05 14:46:47 -07:00
df9fadfc2f
Updating branch for machine docs
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 8c9d67921a44e4f189373d8dc10fc8946039918d
Component: engine
2015-05-05 14:33:31 -07:00
dd653ee8c5
Merge pull request #12993 from psftw/support-tweak
...
Remove blanket "supported" language.
Upstream-commit: f0a8dfd29e4b009388d8b5e2c4386cc5d68bf4db
Component: engine
2015-05-05 16:03:02 -04:00
167bf1fe24
Merge pull request #12996 from tianon/abri-à-vélo
...
Replace "docker-core" with "docker-engine" in "build-deb"
Upstream-commit: 6bb596219f8c852cd48322ac9a4a4f605d29c6b8
Component: engine
2015-05-05 10:43:15 -07:00
d6fea09c44
Merge pull request #12947 from runcom/11577-readonly-special-file-if-readonlyfs
...
Make /etc/hosts, /etc/resolv.conf, /etc/hostname read only if --read-only enabled
Upstream-commit: 77266a67e0e1fc9ec2b026bf0a57a14188ec5224
Component: engine
2015-05-05 09:45:24 -07:00
6c4c56e1c3
Merge pull request #12679 from adcaes/12607-remove-error-check
...
Add intValue and use it to get timeout form param in postContainersRestart
Upstream-commit: e894a901dbff5aafcc0919b78e01a4ab18f2a582
Component: engine
2015-05-05 09:38:45 -07:00
e1c57390f1
Replace "docker-core" with "docker-engine" in "build-deb"
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 5e563d170815ce3111eb66b44cfd252c80d8f34c
Component: engine
2015-05-05 10:11:59 -06:00
215af7ab57
Remove blanket "supported" language.
...
Signed-off-by: Peter Salvatore <peter@psftw.com >
Upstream-commit: 3efc083d4a785b2c7b1c1f862133167d5618d216
Component: engine
2015-05-05 11:03:53 -04:00
3f873c25b6
Rename int64Value to int64ValueOrZero.
...
Signed-off-by: Adria Casas <adriacasas88@gmail.com >
Upstream-commit: a2c76912e04b087233577b46f96f446c5d13e2de
Component: engine
2015-05-05 08:54:28 +02:00
da6438ab18
Merge pull request #10766 from cpuguy83/stats_pull_once
...
Allow pulling stats once and disconnecting.
Upstream-commit: 91fb4d672a8536d2f0437aeeb2dfc7b9e51aac16
Component: engine
2015-05-04 22:28:01 -07:00
655d129aac
Merge pull request #12979 from Microsoft/10662-filepathgraphpush
...
Windows: Fix filepath vs path in push.go
Upstream-commit: f838d442839d4dd74623303f22de17959b31eaa9
Component: engine
2015-05-04 22:25:13 -07:00
b677241c30
Merge pull request #12981 from SvenDowideit/marc-merlin-spelling-fix
...
spelling fix from Marc MERLIN
Upstream-commit: 677b962642da7778105f68ecc64f34b9ea3b7f05
Component: engine
2015-05-04 17:53:37 -07:00
a3d3fbb773
spelling fix from Marc MERLIN
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: bba5fd8caa35d5edf8b68e593eafb277394a6989
Component: engine
2015-05-05 00:38:41 +00:00
9c31de00f9
Merge pull request #12890 from SvenDowideit/update-docker-hub-accounts-documentation
...
Update the Docker Hub account, org and group documentation and images
Upstream-commit: 77183ed760b5df4ab70e7cf8fc268e66a295c7cc
Component: engine
2015-05-04 16:23:08 -07:00
d33c276cc3
Windows: Fix filepath vs path in push.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3b2c8f69fd7f1ca6a463b9bd2c2e006d9e13fe98
Component: engine
2015-05-04 16:18:23 -07:00
11e5be135f
Merge pull request #12190 from rhvgoyal/deferred-removal
...
Devicemapper: Provide deferred device removal capability
Upstream-commit: 56c991781564e8cc292166d3b3e27e304c240468
Component: engine
2015-05-04 14:22:52 -07:00
71f810ba24
Merge pull request #12948 from runcom/api-tests-container-delete
...
Add tests for API container delete
Upstream-commit: 980c0e8c3b58a45dbabc9f10b4933db2bcaec8c1
Component: engine
2015-05-04 17:08:52 -04:00
0f648e8ecd
Add tests for API container delete
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 8771cafab65e50d09d3590a7f22758e919b78fe4
Component: engine
2015-05-04 22:41:57 +02:00
e79952cb66
Merge pull request #12718 from Microsoft/10662-mkdirall
...
Windows: Volume path aware mkdirall
Upstream-commit: 3fcf387d52676d9c4f24b7a4d2f48c4992d7485f
Component: engine
2015-05-04 15:51:56 -04:00
f81d4d4161
Merge pull request #12769 from calavera/git_build_fragment
...
Use git url fragment to specify build reference and dir context.
Upstream-commit: 0a2ccb1cb54834d3b97982f93c42671be5861082
Component: engine
2015-05-04 12:48:24 -07:00
141582c6c7
Make /etc/hosts, /etc/resolv.conf, /etc/hostname read only if --read-only is enable
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 7d371c0b470334189720840854b2d5acbb1c7909
Component: engine
2015-05-04 21:30:52 +02:00
069ce566f4
Merge pull request #12967 from runcom/add-self-to-maintainers
...
Add runcom to maintainers.people
Upstream-commit: f93cbd2448fde31a5c0a93b1faba4645c5dd00fd
Component: engine
2015-05-04 12:00:42 -07:00
204fb1504f
Merge pull request #12954 from vdemeester/11595-pkg-ioutils-coverage
...
More test on pkg/ioutils (coverage)
Upstream-commit: 87a0ca5283aa5b1c3d04cc35e1c415de6b00d323
Component: engine
2015-05-04 14:57:58 -04:00
3660faa6b0
Merge pull request #10775 from duglin/BuilderFlags
...
Add support for Dockerfile CMD options
Upstream-commit: 9c32cd1cef6bd95d6f2a32d18756d6087ad8fa0c
Component: engine
2015-05-04 11:39:09 -07:00
d48ebd70cc
Add runcom to maintainers.people
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: ea6649e701cf04b90fcc4a1abb29337d99b7af70
Component: engine
2015-05-04 20:26:11 +02:00
f23ef4fe69
Add more ioutils tests.
...
Closes #11595
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 815b472a02dc0f593daee4006ce893fe17236b70
Component: engine
2015-05-04 19:56:10 +02:00
366be0f240
Merge pull request #12865 from larsks/bug/12864
...
journald log driver: use CONTAINER_ID field for container id
Upstream-commit: 0c1c2726876bdffad4e600456f07e256bc1361a1
Component: engine
2015-05-04 10:53:58 -07:00
a4975c3e58
Merge pull request #12937 from runcom/daemon-as-a-service
...
Refactor server to use daemon as the service layer in controllers
Upstream-commit: 4895a887e2e88699a07ab6fea9113a5ff13d2450
Component: engine
2015-05-04 13:03:28 -04:00
42096e6c34
Merge pull request #12939 from draghuram/history_test
...
Adding test for "GET /images/(name)/history" API.
Upstream-commit: 24bd3db0b5c3368968830f775546ccd03c86c380
Component: engine
2015-05-04 12:58:43 -04:00
85b318b6f3
Merge pull request #12936 from tianon/docker-dev
...
Rename development builds to be in the "docker-dev" repo instead of "docker"
Upstream-commit: 8ac8c2af6040c24a7c8d1f54c4374665b87e69eb
Component: engine
2015-05-04 12:55:46 -04:00
5221178681
Merge pull request #12958 from Mashimiao/cleanup-container-functions
...
Cleanup: move container's functions to its own file
Upstream-commit: 4f5272320cef76dd33a3895f228e2080d9d3a13b
Component: engine
2015-05-04 09:36:55 -07:00
a0ae4df58b
Use git url fragment to specify reference and dir context.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 49fd83a25e2e6604014de41d4f4099a7bc07a09b
Component: engine
2015-05-04 09:28:06 -07:00
9eba4b1b6c
Merge pull request #11034 from HuKeping/oom_kill_disable
...
enable cgroups memory.oom_control
Upstream-commit: ac324e5e52af1f2489320f3bdb7e2ebbd83ee869
Component: engine
2015-05-04 11:53:05 -04:00
a580a2dfa9
Merge pull request #12903 from rhvgoyal/disable-discards
...
devmapper: Disable mount option "discard" by default
Upstream-commit: 2e49281bd085d84babe8b3243de1e97c2d12dac1
Component: engine
2015-05-04 18:35:25 +03:00
778713f3f9
Merge pull request #12953 from sunyuan3/404
...
Verifiy status Codes 404 when no such image.
Upstream-commit: a8d73339f21ae900e84285d02a9c675fc8963cc6
Component: engine
2015-05-04 11:10:07 -04:00
9531505238
Allow pulling stats once and disconnecting.
...
Adds a `stream` query param to the stats API which allows API users to
only collect one stats entry and disconnect instead of keeping the
connection alive to stream more stats.
Also adds a `--no-stream` flag to `docker stats` which does the same
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: f3023a93d1a0a96a7312de441a550c758ac0c17d
Component: engine
2015-05-04 10:49:13 -04:00
1232de25e5
Merge pull request #12944 from tianon/fsnotify-1.2.0
...
Update fsnotify to 1.2.0
Upstream-commit: 56f7da34fc0161d2ccbbd2eeb3473ac5f406e0e1
Component: engine
2015-05-04 16:57:45 +03:00
5306450032
cleanup: move container's functions to its file
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 1be7a10b89506afdcb80f109f323b6e47d2e466c
Component: engine
2015-05-04 21:37:44 +08:00
af54781255
Merge pull request #12943 from tianon/go-patricia-v2
...
Update go-patricia to 2.1.0
Upstream-commit: 175339ffb6c7d6e4c2aa78f01f227643a0d97c42
Component: engine
2015-05-04 16:28:03 +03:00
ad3d66108b
Feature: option for disable OOM killer
...
Add cgroup support for disable OOM killer.
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: a4a924e1b6c50f0f02460489259d73468a6c282e
Component: engine
2015-05-04 21:11:29 +08:00
12b77cedd1
Verifiy status Codes 404 when no such image
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 9eefd2c17dd5813f6d471b08473a79c65e235450
Component: engine
2015-05-04 15:39:40 +08:00
830eaf883b
Update the Docker Hub account, org and group documentation and images
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 5cec69a7b3ea12f9595e017eb27826ff9ad2962b
Component: engine
2015-05-04 00:37:54 +00:00
3377b27513
Merge pull request #12950 from thieman/tnt-riak-ssh-reference
...
Remove stale reference to previous SSH instructions
Upstream-commit: fe221852b7402ec6734247e67bb5120e4e301390
Component: engine
2015-05-03 15:42:38 -04:00
a0242e0a80
Remove stale reference to previous SSH instructions
...
Signed-off-by: Travis Thieman <travis.thieman@gmail.com >
Upstream-commit: b40a5eeec8a3db6a6488696f2c58bc4acf0d7dbd
Component: engine
2015-05-03 14:15:17 -04:00
703dea0308
Merge pull request #12735 from jmzwcn/patch-1
...
Remove empty line after client.CmdInspect docstring
Upstream-commit: 15313dfdf38ecaa0dc93005f1c3824491fbb3b96
Component: engine
2015-05-03 11:10:14 -04:00
6fb6ee62f9
Merge pull request #12888 from jmzwcn/patch-3
...
`docker images` friendly duration gets unfriendly after a while
Upstream-commit: e8bbd87ba831dbda27bad452cd367a8e7e34f584
Component: engine
2015-05-03 11:09:25 -04:00
5b22f64f34
docker images friendly duration gets unfriendly after a while
...
fix #12852
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com >
Upstream-commit: 28ea4a63d00e9d0e28375adc80d24461193e7a28
Component: engine
2015-05-03 21:19:18 +08:00
c5e187ce2d
Remove empty line after client.CmdInspect docstring #12706
...
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com >
Remove empty line after client.CmdInspect docstring
fix #12706
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com >
Remove empty line after client.CmdInspect docstring
fix #12706
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com >
Upstream-commit: 28547a1a3a594ee24b4cb51a89d9fce630c8c066
Component: engine
2015-05-03 17:23:18 +08:00
