Andrea Luzzardi
3d4a2f4ff4
Add affinity to the redmon demo.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-01-27 12:37:44 -08:00
Victor Vieux
cdf884cd10
Merge pull request #310 from aluzzardi/random-port-detection
...
Port filter: Random port assignment conflict detection.
2015-01-27 12:29:36 -08:00
Victor Vieux
abf5d40aeb
Merge branch 'Ranjandas-Ranjandas-patch-1'
2015-01-27 12:28:34 -08:00
Ranjandas
3f19ac8c5a
Updated Readme.md to include git client
...
`go get ` command requires git client to be present in the system to work, so added the instruction to get git installed with golang package.
Signed-off-by: Ranjandas <thejranjan@gmail.com >
2015-01-27 12:25:50 -08:00
Andrea Luzzardi
ec7d343a88
Merge pull request #306 from vieux/improve_logs1
...
improve some logs
2015-01-27 12:23:31 -08:00
Victor Vieux
cd56c0afcc
Merge pull request #312 from chanwit/quick-fix-zk
...
Cleanup: fix fatal error when registering node
2015-01-27 12:22:24 -08:00
Victor Vieux
aad324a7a1
Merge pull request #314 from aluzzardi/store-remove-container-fix
...
Do not fail when destroying a container if it's not found in the store.
2015-01-27 12:21:25 -08:00
Andrea Luzzardi
9ed597b5eb
Do not fail when destroying a container if it's not found in the store.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-01-27 12:13:58 -08:00
Tibor Vass
bb4025c4e2
Merge pull request #10230 from tianon/emptyfs
...
Update emptyfs support to work properly if scratch is already an image
2015-01-27 15:01:42 -05:00
Jessie Frazelle
b9650ad40b
Merge pull request #10249 from jlhawn/distribution_version_header_10247
...
Split API Version header when checking for v2
2015-01-27 11:48:42 -08:00
Aanand Prasad
1476027410
Fix test for image-declared volumes
...
A stray 'fig' got lost in the merge post-rename, meaning the containers
weren't being cleaned up properly.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-01-27 14:46:58 -05:00
Daniel Nephin
28fa49e569
Merge pull request #810 from madwire/patch-1
...
Tweaks to the rails tutorial to bring it inline with rails 4.2 release
2015-01-27 14:45:31 -05:00
Michael Crosby
c81fb7fa4a
Merge pull request #10197 from vbatts/vbatts-dm_cookie_support
...
devicemapper: API for cookie support
2015-01-27 11:44:03 -08:00
Michael Crosby
e04cc93a2c
Merge pull request #10113 from imreFitos/master
...
docs: remove NAT rule when removing bridge
2015-01-27 11:22:53 -08:00
Michael Crosby
83bec40e86
Merge pull request #10370 from ashahab-altiscale/9875-apparmor-regression
...
Fixes apparmor regression
2015-01-27 10:46:22 -08:00
Derek McGowan
ab589b442d
Use layer checksum if calculated during manifest creation
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-01-27 10:21:35 -08:00
Josh Hawn
e662775ffb
Fix premature close of build output on pull
...
The build job will sometimes trigger a pull job when the base image
does not exist. Now that engine jobs properly close their output by default
the pull job would also close the build job's stdout in a cascading close
upon completion of the pull.
This patch corrects this by wrapping the `pull` job's stdout with a
nopCloseWriter which will not close the stdout of the `build` job.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2015-01-27 10:07:01 -08:00
Sean Li
e88830185c
FIxed env var bugs.
2015-01-27 09:39:46 -08:00
Sean Li
d80d259f98
FIxed env var bugs.
2015-01-27 09:39:46 -08:00
Sean Li
ca69727d42
Merge pull request #163 from kitematic/jmorgan-container-merge
...
Update Existing containers
2015-01-27 09:24:50 -08:00
Sean Li
340bfd3122
Merge pull request #163 from kitematic/jmorgan-container-merge
...
Update Existing containers
2015-01-27 09:24:50 -08:00
Evan Hazlett
371194ea8c
use correct paths for custom TLS CA cert and key
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-01-27 11:59:59 -05:00
Jeffrey Morgan
5586831b48
Adding terminal button
2015-01-27 11:13:48 -05:00
Jeffrey Morgan
03b24bb849
Adding terminal button
2015-01-27 11:13:48 -05:00
Evan Hazlett
c209704f5a
Merge pull request #413 from ehazlett/proper-check-for-username
...
check properly for username on different platforms
2015-01-27 10:35:24 -05:00
Evan Hazlett
720c4edfd2
check properly for username on different platforms
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-01-27 10:28:55 -05:00
Brian Goff
79e8ca04f5
Update go-md2man
...
Update fixes some rendering issues, including improperly escaping '$' in
blocks, and actual parsing of blockcode.
`ID=$(sudo docker run -d fedora /usr/bin/top -b)` was being converted to
`ID=do docker run -d fedora/usr/bin/top -b)`
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-01-27 09:33:42 -05:00
Chanwit Kaewkasi
f5d3efa53e
fix fatal error when registering node
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com >
2015-01-27 15:32:28 +07:00
Harald Albers
27e4f982fa
Bash completion supports fig.yml and other legacy filenames
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-01-27 09:03:04 +01:00
Sven Dowideit
6774be62d6
tell users they can what IP range Hub webhooks can come from so they can filter
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
2015-01-27 14:58:29 +10:00
Jeffrey Morgan
f4c703ba03
Fix setup & don't show build containers
2015-01-26 23:48:33 -05:00
Jeffrey Morgan
d9ec2203e4
Fix setup & don't show build containers
2015-01-26 23:48:33 -05:00
Chen Hanxiao
dcfa881a7b
docs: fix a typo in docker-build man page
...
s/Dockefile/Dockerfile
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
2015-01-27 11:19:02 +08:00
Jeffrey Morgan
cbefb542ff
updateContainer method for ContainerStore
2015-01-26 21:43:51 -05:00
Jeffrey Morgan
bde27af83f
updateContainer method for ContainerStore
2015-01-26 21:43:51 -05:00
Jeffrey Morgan
257739f09d
Merge remote-tracking branch 'origin/sean' into jmorgan-container-merge
...
Conflicts:
app/ContainerDetails.react.js
app/ContainerModal.react.js
app/styles/main.less
2015-01-26 21:10:20 -05:00
Jeffrey Morgan
441a1e8f0f
Merge remote-tracking branch 'origin/sean' into jmorgan-container-merge
...
Conflicts:
app/ContainerDetails.react.js
app/ContainerModal.react.js
app/styles/main.less
2015-01-26 21:10:20 -05:00
Victor Vieux
b99bcb0ee1
Merge pull request #309 from aluzzardi/tls-flags-fix
...
Abort if --tlscert, --tlskey or --tlscacert are used without --tls.
2015-01-26 17:46:39 -08:00
Andrea Luzzardi
faa519905e
Port filter: Random port assignment conflict detection.
...
This change takes into account ports that have been randomly allocated
on the node.
When starting containers with no explicit external port (e.g. `-p 80`),
Docker allocates a random port on the node.
The problem is that Swarm didn't see that random port as taken, meaning
that another container could explicitely ask for it, resulting in a
broken container.
Replaces #274
Fixes #272
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-01-26 17:29:20 -08:00
Jessie Frazelle
acb8e08296
Merge pull request #10362 from LK4D4/update_libcontainer
...
Update libcontainer to 2d3b5af7486f1a4e80a5ed91859d309b4eebf80c
2015-01-26 17:18:00 -08:00
Jessica Frazelle
6a2c6e971d
Move one last exec test :)
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2015-01-26 17:17:08 -08:00
Andrea Luzzardi
8c2373a633
Abort if --tlscert, --tlskey or --tlscacert are used without --tls.
...
Fixes #296
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-01-26 17:14:43 -08:00
Doug Davis
f709da192c
Fix docs so WORKDIR mentions it works for COPY and ADD too
...
The docs around COPY/ADD already mentioned that it will do a relative
copy/add based on WORKDIR, so that part is already ok. Just needed to
tweak the WORKDIR section since w/o mentioning COPY/ADD it can be misleading.
Noticed by @phemmer
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-01-26 17:13:44 -08:00
Tony Miller
87d2adf070
fix /etc/host typo in remote API docs
...
Signed-off-by: Tony Miller <mcfiredrill@gmail.com >
2015-01-27 10:12:54 +09:00
Sven Dowideit
a79d363d2d
Merge pull request #10344 from SvenDowideit/pr_out_change_to_load_the_json_gz_file
...
Change to load the json.gz file
2015-01-27 11:12:07 +10:00
Sean Li
60da02ba0c
Merge pull request #161 from kitematic/jmorgan_add_tags
...
Add tag dropdown for creating containers with a specific image tag
2015-01-26 16:59:30 -08:00
Sean Li
e42a47659a
Merge pull request #161 from kitematic/jmorgan_add_tags
...
Add tag dropdown for creating containers with a specific image tag
2015-01-26 16:59:30 -08:00
Sean Li
04cfc3c261
Styled environment variables settings section.
2015-01-26 16:58:28 -08:00
Sean Li
8d9f51efa5
Styled environment variables settings section.
2015-01-26 16:58:28 -08:00
Jeffrey Morgan
5e8f62fbc4
Updating main.less
2015-01-26 19:52:44 -05:00