Doug Davis
065648a832
Last step in removing engine.Tabel from api/client/*
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-06 10:55:53 -07:00
Fred Lifton
530d7af5cf
Merge pull request #1253 from aanand/production-guide
...
Add guide to using Compose in production
2015-04-06 10:49:49 -07:00
Jeffrey Morgan
ec43f48537
Update .travis.yml
2015-04-06 13:49:31 -04:00
Jeffrey Morgan
ce085a450a
Merge branch 'master' of github.com:kitematic/kitematic
2015-04-06 13:46:52 -04:00
Jeffrey Morgan
f730b5ebf2
adding travis ci
2015-04-06 13:46:46 -04:00
Jeffrey Morgan
4b96ac9bc9
Update circle.yml
2015-04-06 13:38:08 -04:00
Tibor Vass
281b8f67e1
Merge pull request #11293 from shishir-a412ed/docker_load_clobber_image_name
...
Fix for Issue 11285: warning message displayed when updating an existing image
2015-04-06 13:04:49 -04:00
malnick
3148063af1
Since COPY has been deprecated in the recent release of Docker I updated the best practices section to inform users that ADD is the way forward and to not use COPY.
...
Signed-off-by: malnick <malnick@gmail.com >
2015-04-06 10:04:42 -07:00
moxiegirl
3e077bb3f7
Merge pull request #12100 from draghuram/docker_update
...
Add the missing option to the wget command for updating Docker.
2015-04-06 10:03:23 -07:00
Antonio Murdaca
d1c4439b5a
Test events streaming, fixes #12079
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-06 19:00:17 +02:00
moxiegirl
96c3141fa5
Merge pull request #12020 from chenhanxiao/docker-import-commit
...
docs: keep the style of docker-commit consistent with docker-import
2015-04-06 09:47:47 -07:00
Tianon Gravi
eee1efcfd6
Add "builder-deb" base images for building ".deb" packages properly
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-04-06 10:43:36 -06:00
Brian Goff
d3fa57e051
Merge pull request #12112 from kostickm/12042-fix-logDone-format
...
Fixes logDone format
2015-04-06 12:34:38 -04:00
Tianon Gravi
8b4c3a111d
Merge pull request #10275 from Snorch/master
...
docker-tests: mount hierarchies and make symlinks for subsystems
2015-04-06 10:32:04 -06:00
moxiegirl
d489b91aa9
Merge pull request #11915 from ZJU-SEL/fix_issue_11676_11754
...
clarify RLIMIT_AS is disabled, explain how to edit DOCKER_OPTS
2015-04-06 09:23:53 -07:00
Jeffrey Morgan
832ba18c02
Update README.md
2015-04-06 12:20:02 -04:00
Jeffrey Morgan
e5975df7f1
Merge pull request #365 from kitematic/coverage
...
Adding code coverage
2015-04-06 12:14:06 -04:00
Jeffrey Dean Morgan
be368f7a77
Adding code coverage to unit tests
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-04-06 12:13:05 -04:00
Arnaud Porterie
ac93a13e27
Merge pull request #11554 from Sirupsen/logrus-fields
...
logging: use logrus fields
2015-04-06 09:00:18 -07:00
Megan Kostick
d6ada45f45
Closes #12042 - fix logDone format
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
2015-04-06 08:54:35 -07:00
Arnaud Porterie
90be2a66a8
Merge pull request #12102 from x1022as/typo
...
fix typo
2015-04-06 08:46:41 -07:00
Arnaud Porterie
b9d2ede4d4
Merge pull request #12107 from cpuguy83/remove_striptrailingchars
...
Remove `stripTrailingCharacters` from tests
2015-04-06 08:46:08 -07:00
Arnaud Porterie
716576b0cc
Merge pull request #12110 from leoh0/fix-typo
...
Minor spelling fix
2015-04-06 08:43:18 -07:00
Kristján Oddsson
7482077975
Change variable from snake_case to camelCase.
...
Signed-off-by: Kristján Oddsson <koddsson@gmail.com >
2015-04-06 15:36:26 +00:00
Jeffrey Morgan
d94f9d325f
Merge pull request #363 from koddsson/master-update-tags-on-mount
...
Update tags on mounting ImageCard component.
2015-04-06 11:31:33 -04:00
Eohyung Lee
7986c37996
Minor spelling fix
...
Signed-off-by: Eohyung Lee <liquidnuker@gmail.com >
2015-04-06 23:27:53 +09:00
Brian Goff
475c65319b
Remove stripTrailingCharacters from tests
...
This was just an alias to `strings.TrimSpace`
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-06 09:21:18 -04:00
Shishir Mahajan
7d0053d554
Applying: Fix for Issue 11285: warning message displayed when updating an existing image
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
2015-04-06 09:05:03 -04:00
Deng Guangxing
71de711189
fix typo in cli.md
...
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com >
2015-04-06 16:11:40 +08:00
Chanwit Kaewkasi
b1803bc7e5
regression for 0.2.0
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com >
2015-04-06 14:04:15 +07:00
Raghuram Devarakonda
9287e70c12
Add the missing option to the wget command for updating Docker.
...
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
2015-04-05 23:00:21 -04:00
willhf
bc0cdc0a4c
Fix incompatible flags conditional
...
Signed-off-by: willhf <willhf@gmail.com >
2015-04-05 19:38:31 -07:00
Simei He
5057d7da13
fix the space thing.
...
Signed-off-by: Simei He <hesimei@zju.edu.cn >
2015-04-06 09:00:59 +08:00
Yuan Sun
ef13dcd4dc
add TestDaemonwithwrongkey test case
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-04-06 08:57:47 +08:00
Kristján Oddsson
6e56c4f665
Change normal function in to a ES6 arrow function.
...
No need for `.bind(this)` with ECMAScript6 syntax!
Signed-off-by: Kristján Oddsson <koddsson@gmail.com >
2015-04-05 21:12:13 +00:00
Dan Farrelly
71140cf47c
Filter create command flags by driver
...
Signed-off-by: Dan Farrelly <daniel.j.farrelly@gmail.com >
2015-04-05 15:18:47 -04:00
Kristján Oddsson
603b9c5952
Fetch tags when a Image card has been mounted.
...
For images that don't have a "latest" tag (such as `google/debian`) we
fetch all the tags when the `ImageCard` component mounts and set the
chosen tag to the first one in the list (so far it seems to be the
latest tag where such a tag exists but we can add some logic here to
choose a appropriate tag if we want).
Signed-off-by: Kristján Oddsson <koddsson@gmail.com >
2015-04-05 17:08:12 +00:00
Kristján Oddsson
9eab0501fd
Format the error message a little bit better.
...
The error message is actually a object and not a string so we format it
a bit better with this patch.
Signed-off-by: Kristján Oddsson <koddsson@gmail.com >
2015-04-05 17:07:54 +00:00
Kristján Oddsson
dfe80af6e4
Fall-back to image name as key when there is no id
...
When a container is first started and the image is downloading there is
no id set. With this patch we'll check if the container has a id and
and is downloading, if so we'll substitute it with the image name and
render such.
This will fix the react key props warning in the developer console as
well as maybe give us some sort of performance boost(?)
Signed-off-by: Kristján Oddsson <koddsson@gmail.com >
2015-04-05 17:05:45 +00:00
Jeffrey Morgan
b67c1a912e
Update README.md
2015-04-04 17:24:18 -04:00
Jeffrey Morgan
8e66b7b949
Merge pull request #359 from koddsson/master-fix-scratch-run-message
...
Replace hard-coded error message with props.
2015-04-04 16:25:01 -04:00
Doug Davis
58390b6087
Merge pull request #12075 from eljojo/remove_stupid
...
Remove "stupid" wording
2015-04-04 12:37:38 -04:00
José Tomás Albornoz
4cf5a1c2aa
Remove "stupid" wording
...
Signed-off-by: José Tomás Albornoz <jojo@eljojo.net >
2015-04-04 15:26:45 +02:00
Doug Davis
ca8d196d13
Merge pull request #12074 from guoxiuyan/Fix_typo
...
Fix a minor typo
2015-04-04 07:34:35 -04:00
Kirill SIbirev
ac12c80537
Improved "start a container" section in 1.16 & 1.17 docs
...
It seems it was lost or something
Signed-off-by: Kirill Sibirev <l0kix2@gmail.com >
2015-04-04 11:23:49 +03:00
guoxiuyan
ffcc4a1e52
Fix a minor typo
...
Signed-off-by: Guo Xiuyan <guoxiuyan@huawei.com >
2015-04-04 15:36:35 +08:00
Tonny Xu
e50636617f
Updated the explanation of ONBUILD in best-practices doc
...
Signed-off-by: Tonny Xu <tonny.xu@gmail.com >
2015-04-04 12:46:25 +09:00
Michael Crosby
2a79d54f4c
Merge pull request #12063 from icecrime/update_maintainers
...
Several updates to MAINTAINERS file
2015-04-03 17:20:20 -07:00
Arnaud Porterie
a45375f1f9
Merge pull request #12069 from whoshuu/notice-link
...
Make NOTICE in the README into a link
2015-04-03 17:08:53 -07:00
Alexandre Beslic
88b69e0671
Merge pull request #573 from aluzzardi/container-update-fix
...
Fix container update flow.
2015-04-03 17:03:14 -07:00