p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,521 Commits 2 Branches 295 Tags
eeaaa01f6dc97ce60ba0cdc62e1dac9d6713fbf0
Commit Graph

5521 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
eeaaa01f6d Merge pull request #3570 from fabiofalci/3569-validate-docker-version 
Fetch docker version over https
Upstream-commit: b68ddcec21d40323b3a7bf7dca5d9eb99cb5d4f5
Component: engine
 2014-01-14 09:36:18 -08:00
James Turnbull
d1113f9ba8 Merge pull request #3587 from tianon/fix-gentoo-typo 
Fix docs typo: "Gento" -> "Gentoo"
Upstream-commit: 7d702ef501f53d99e5caf9535584320342cfee4b
Component: engine
 2014-01-14 09:22:58 -08:00
Tianon Gravi
762ef6b753 Fix docs typo: "Gento" -> "Gentoo" 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: c7dcd19b28c069a396b3b9688886f9c88730e86d
Component: engine
 2014-01-14 04:18:51 -07:00
Andy Rothfusz
197d847462 Merge pull request #3584 from tianon/fix-docs-dockerfile 
Fix docs Dockerfile to install correctly again
Upstream-commit: fe6c9e8fd7cef9bae224dd66a59696dcb025db49
Component: engine
 2014-01-13 17:42:20 -08:00
Tianon Gravi
bfbc1e39c3 Fix docs Dockerfile to install correctly again 
Previously we've been getting:

```
Step 6 : RUN pip install Sphinx==1.1.3
 ---> Running in 397eab32f57a
 Wheel installs require setuptools >= 0.8 for dist-info support.
 pip's wheel support requires setuptools >= 0.8 for dist-info support.
 Storing debug log for failure in /.pip/pip.log
 2014/01/13 18:01:34 The command [/bin/sh -c pip install Sphinx==1.1.3] returned a non-zero code: 1
 make: *** [docs] Error 1
```

This fixes that by telling pip not to use sudo to install (since we're already root).

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 4087a643eaf6265f8d238caa2883348eeb5e908a
Component: engine
 2014-01-13 18:22:23 -07:00
Victor Vieux
5a3f85190a Merge pull request #3575 from shykes/engine-get-images 
move `docker images` to a job
Upstream-commit: 9792df20804e9cd5736ab933c6ffcb29fd52040e
Component: engine
 2014-01-13 16:25:23 -08:00
Victor Vieux
a8444009df move legacy stuff outside the job 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 16ca6a1c12ffe9a02da4e823646bee6461ffbad5
Component: engine
 2014-01-13 16:20:05 -08:00
Victor Vieux
27c595f866 add legacy compat 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: aca1270104802347f5aa3104959282924b631daa
Component: engine
 2014-01-13 15:50:20 -08:00
Victor Vieux
1ccf04f8d4 Add compat 1.8 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 3a610f754f425ea6042c3f8b5452273656a06c90
Component: engine
 2014-01-13 15:50:20 -08:00
Solomon Hykes
5f902c5a09 Port 'docker images' to the engine API 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 17a806c8a0b6add2aa773dfca272acefee9b638c
Component: engine
 2014-01-13 15:49:33 -08:00
Fabio Falci
be95f4675e Use https to get the latest docker version 
To avoid unexpected results since docker was using http.
For instance, my broadband doesn't return not found when it's down but
a html page saying that the internet is down. Docker was showing that
html instead of ignoring it.

Fix #3570

Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
Upstream-commit: 89bed4337d2314c3ffaac231c141b635ecc65ac5
Component: engine
 2014-01-13 20:37:29 +00:00
Andy Rothfusz
e42df33e3b Merge pull request #3544 from SvenDowideit/build-image-cache 
add info and example of image cache in use when building
Upstream-commit: 6652416f4c18bd59575c7788747335eab7b4d304
Component: engine
 2014-01-13 11:10:29 -08:00
Sven Dowideit
2822354d30 add info and example of image cache in use when building 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)

Docker-DCO-1.0-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: f30ca8935d128bbd060a04b47cec2f26d682797b
Component: engine
 2014-01-13 22:17:47 +10:00
Tianon Gravi
e7a98d831f Merge pull request #3554 from tianon/ubuntu-dep 
Add ca-certificates to our package Recommends
Upstream-commit: 07f62f199fa81e9645114589ecaeb888a6084649
Component: engine
 2014-01-11 15:07:50 -08:00
Tianon Gravi
bc406dc2fc Merge pull request #3551 from tianon/test-docker-io-gpg-fingerprint 
Inline the test.docker.io fingerprint in the install.sh script as well
Upstream-commit: 7273b33e861554315f74e2d4b612f7b6d2c11a3f
Component: engine
 2014-01-11 15:07:06 -08:00
James Turnbull
5de703576d Merge pull request #3539 from jeandalido/patch-1 
Update docker_remote_api_v1.8.rst
Upstream-commit: ba90fcfc08128d50ece8fd946b65a05b0cc7293c
Component: engine
 2014-01-11 13:29:56 -08:00
Tianon Gravi
283c7cd8b1 Merge pull request #3500 from tianon/lvm2-version 
Add more specific lvm2 version to PACKAGERS document
Upstream-commit: f65706aaeba84efa3056f8f349154b2ae31e9132
Component: engine
 2014-01-11 03:39:01 -08:00
Tianon Gravi
dcbe7663ea Merge pull request #3555 from jordansissel/patch-1 
Update Ubuntu packaging script to use 'fpm -s empty' instead of 'mkdir empty && fpm -s dir -C empty'
Upstream-commit: cb314b9752352d9034466c3503058f22b79c345f
Component: engine
 2014-01-10 22:46:30 -08:00
Jordan Sissel
6403af89bd Use '-s empty' instead of '-s dir' 
This *should* have the same effect as the previous strategy: Instead of
'mkdir empty; fpm -s dir -C empty ...' we can simply do 'fpm -s empty'

Docker-DCO-1.1-Signed-off-by: Jordan Sissel <jls@semicomplete.com> (github: jordansissel)
Upstream-commit: a02450d048d0a858aceda2343ef4d7633eca6ebb
Component: engine
 2014-01-10 22:36:58 -08:00
Victor Vieux
a15c21f17d Merge pull request #3490 from vieux/image_export_job 
Move image_export to a job
Upstream-commit: b61570b521346769908e678e96e510e6ae193f28
Component: engine
 2014-01-10 15:58:47 -08:00
Victor Vieux
06453f28d3 Move image_export to a job 
Docker-DCO-1.0-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 5264914e574c20c8fefcd6e5d858f51f341dd9da
Component: engine
 2014-01-10 15:54:44 -08:00
Victor Vieux
d1d0fdf0a6 Merge pull request #3180 from vieux/job_container_delete 
Move container_delete to job
Upstream-commit: 6dde20c0c517833224689c0eff2d247910a7083b
Component: engine
 2014-01-10 15:53:38 -08:00
Victor Vieux
bf5f5a9318 Merge pull request #3476 from vieux/restart_job 
Move restart to a job
Upstream-commit: ad162b75a06a796d404a3e6d8fb728f0788dc399
Component: engine
 2014-01-10 15:52:42 -08:00
Victor Vieux
aee266dfbc Move restart to a job 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 15689b56c8e397d3207dad5b23937cb9b1e453cd
Component: engine
 2014-01-10 15:51:48 -08:00
Victor Vieux
cf41511c88 move container_delete to job 
handle error

remove useless errStr

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor@docker.com> (github: vieux)
Upstream-commit: aa3339cf39b88e4a4b3d830d9b0831d4abff1dcb
Component: engine
 2014-01-10 15:34:10 -08:00
Tianon Gravi
8e55abfd24 Merge pull request #3543 from EvanKrall/gzip_debs 
Use gzip compression in Ubuntu packages to make it possible to install on Lucid
Upstream-commit: 459e0aa2c18724157355f051a6b4c57978d13a16
Component: engine
 2014-01-10 15:29:22 -08:00
Tianon Gravi
5a61d77c34 Add ca-certificates to our package Recommends 
It's only in "Recommends" because it's only required for all but the esoteric configurations (since you can't "docker pull" from the index without it, but that's about it).

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: e5189b5dd2c044030e7e2ab7029eba0fe91c3b25
Component: engine
 2014-01-10 13:06:53 -07:00
Evan Krall
17e2946fdd Use gzip compression in Ubuntu packages to make it at least possible to install on Lucid. 
Docker-DCO-1.1-Signed-off-by: Evan Krall <krall@yelp.com> (github: EvanKrall)
Upstream-commit: c2a59dfe48e55bc93e3bed5ecde021f372151b09
Component: engine
 2014-01-10 11:45:00 -08:00
Tianon Gravi
ee61e0d71c Inline the test.docker.io fingerprint in the install.sh script as well 
As long as we're doing it, we ought to do it for all the "official" Docker properties at least

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 051e7a0befaddb6ddbd047abff5f524a7247af6c
Component: engine
 2014-01-10 10:20:31 -07:00
Jean-Baptiste Dalido
37eaecc842 Update docker_remote_api_v1.7.rst and non-versionned 
Docker-DCO-1.1-Signed-off-by: Jean-Baptiste Dalido <jbdalido@gmail.com> (github: jeandalido)
Upstream-commit: 2fd4c39c86a87660cedae19936d5fc5164edd859
Component: engine
 2014-01-10 11:35:25 +01:00
Jean-Baptiste
59bc509d7d Update docker_remote_api_v1.8.rst 
Docker-DCO-1.1-Signed-off-by: Jean-Baptiste Dalido <jbdalido@gmail.com> (github: jeandalido)
Upstream-commit: d69cf2986eb864ffcad026bfbdd30beda5061175
Component: engine
 2014-01-10 11:27:21 +01:00
Guillaume J. Charmes
73f11d30c2 Merge pull request #3537 from crosbymichael/merge_release_v0.7.5 
Merge release v0.7.5
Upstream-commit: 7985125602e8ddf79b5ac0ef56c71ac8962455ac
Component: engine
 2014-01-09 11:39:35 -08:00
Michael Crosby
3e5c7bd070 Change version to v0.7.5 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: c3c89abfd65cb3d0d8c7796b035dde314fb9a2c3
Component: engine
 2014-01-09 11:36:30 -08:00
Michael Crosby
fe59f70554 Merge branch 'release' into merge_release_v0.7.5 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 1fcbd36cb2780175082a880f0ce85d91ecb81c87
Component: engine
 2014-01-09 11:36:14 -08:00
Michael Crosby
1b47d0f1c6 Merge pull request #3532 from crosbymichael/bump_v0.7.5 
Bump to v0.7.5
Upstream-commit: 845b8166869ba320c1e753ed8ca560bbf9453767
Component: engine
 2014-01-09 11:33:57 -08:00
Guillaume J. Charmes
2cdaea3fbb Merge pull request #3533 from crosbymichael/run-rm-remove-volumes 
Remove volumes on docker run -rm
Upstream-commit: fc14e81bf945afe192b7e31991900fe27f991e3b
Component: engine
 2014-01-09 10:47:28 -08:00
Michael Crosby
eed6e32053 Bump to version v0.7.5 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: c348c04fdfb00e013be9db15d37728e04fb94b76
Component: engine
 2014-01-09 10:34:50 -08:00
Michael Crosby
ceb42fa9b3 Merge pull request #3535 from plietar/3457-git-build 
Don't compress the archive made from git's output.
Upstream-commit: 5ca0fedffc6d4498364cf42a3812b85591fb86d9
Component: engine
 2014-01-09 10:32:28 -08:00
Paul Lietar
694098392a Don't compress the archive made from git's output. 
Commit 894d4a23fba made BuildFile use TarSum, which doesn't support
compressed tar archives.
This breaks builds from git url, which compressed it with bzip2.
Instead, just pass it uncompressed.

Docker-DCO-1.0-Signed-off-by: Paul Lietar <paul@lietar.net> (github: plietar)
Upstream-commit: 562a23576328c1586f1be968fa15cb075267138c
Component: engine
 2014-01-09 18:23:19 +00:00
Michael Crosby
512d7502bb Remove volumes on docker run -rm 
If we don't care about the container then we don't care about any
volumes created with the run of that container

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 14acf6883db8069a10a727ed26f7ef801f460353
Component: engine
 2014-01-09 09:58:40 -08:00
Guillaume J. Charmes
4765401e7e Merge pull request #3530 from creack/update_dco_doc 
Update DCO git hook example
Upstream-commit: eb131250aa7680812f8f7669b8fdfaaf7dbe8431
Component: engine
 2014-01-09 09:23:35 -08:00
Guillaume J. Charmes
ea32b7c1af Merge pull request #3528 from tianon/update-travis-dco 
Update Travis to check for new 1.1 DCO version
Upstream-commit: 9ec29fddf8d27b9770e9e379b2aac44f025ec36f
Component: engine
 2014-01-09 09:23:23 -08:00
Guillaume J. Charmes
19b256d8cc Merge pull request #3527 from keeb/add-dco 
Amend DCO
Upstream-commit: d015d31b1ca7dcd1952c252d479a3ba84ad4c5b5
Component: engine
 2014-01-09 09:23:11 -08:00
Guillaume J. Charmes
0f761b4227 Merge pull request #3522 from bantic/fix-misspelled-names 
Fix misspelled Hawkings -> Hawking, Archimede -> Archimedes, Euclide -> Euclid
Upstream-commit: f6292ab8d0e8b0181cd1ef0df2a61f3d0e9283ec
Component: engine
 2014-01-09 09:12:05 -08:00
Guillaume J. Charmes
f362f40f54 Update DCO git hook example 
Upstream-commit: c3f259754688d7c20cac5b8f8b998a7608f034a8
Component: engine
 2014-01-09 09:02:56 -08:00
Tianon Gravi
398a309d63 Update Travis to check for new 1.1 DCO version 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: a4f3cd62a3d221dcb55279cc9f0db41e7920c094
Component: engine
 2014-01-09 09:52:17 -07:00
Nick Stinemates
35730d58c5 Bump DCO version 
Upstream-commit: 11d61ec77feb743a3eedef7d85a7a751ed09736e
Component: engine
 2014-01-09 08:47:03 -08:00
Nick Stinemates
c876780684 Fix layout 
Upstream-commit: 40c90796e950307804745c5a852cc64d3e53a1a9
Component: engine
 2014-01-09 08:35:47 -08:00
Nick Stinemates
3bde09b0e2 Removed the 5th clause 
Removed clause which states contributions should be relicensed
Upstream-commit: 7fb55f77250a9b52b0515a7e655ecc605ae452ca
Component: engine
 2014-01-09 08:35:06 -08:00
Cory Forsyth
c89473f354 Fix misspelled Hawkings -> Hawking, Archimede -> Archimedes, Euclide -> Euclid 
Docker-DCO-1.0-Signed-off-by: Cory Forsyth <cory.forsyth@gmail.com> (github: bantic)
Upstream-commit: 7a7c3d87d8040b41970b7fc89305bb18561386d3
Component: engine
 2014-01-09 10:02:55 -05:00