Tianon Gravi
e8ffc2eee0
Un-gofmt ./vendor
...
We can't be modifying this except to update from upstream.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-14 10:54:19 -07:00
Michael Crosby
b68ddcec21
Merge pull request #3570 from fabiofalci/3569-validate-docker-version
...
Fetch docker version over https
2014-01-14 09:36:18 -08:00
James Turnbull
7d702ef501
Merge pull request #3587 from tianon/fix-gentoo-typo
...
Fix docs typo: "Gento" -> "Gentoo"
2014-01-14 09:22:58 -08:00
Tianon Gravi
c7dcd19b28
Fix docs typo: "Gento" -> "Gentoo"
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-14 04:18:51 -07:00
Andy Rothfusz
fe6c9e8fd7
Merge pull request #3584 from tianon/fix-docs-dockerfile
...
Fix docs Dockerfile to install correctly again
2014-01-13 17:42:20 -08:00
Tianon Gravi
4087a643ea
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)
2014-01-13 18:22:23 -07:00
Victor Vieux
9792df2080
Merge pull request #3575 from shykes/engine-get-images
...
move `docker images` to a job
2014-01-13 16:25:23 -08:00
Victor Vieux
16ca6a1c12
move legacy stuff outside the job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-13 16:20:05 -08:00
Victor Vieux
aca1270104
add legacy compat
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-13 15:50:20 -08:00
Victor Vieux
3a610f754f
Add compat 1.8
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-13 15:50:20 -08:00
Solomon Hykes
17a806c8a0
Port 'docker images' to the engine API
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-01-13 15:49:33 -08:00
Fabio Falci
89bed4337d
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)
2014-01-13 20:37:29 +00:00
Andy Rothfusz
6652416f4c
Merge pull request #3544 from SvenDowideit/build-image-cache
...
add info and example of image cache in use when building
2014-01-13 11:10:29 -08:00
Sven Dowideit
f30ca8935d
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)
2014-01-13 22:17:47 +10:00
Tianon Gravi
07f62f199f
Merge pull request #3554 from tianon/ubuntu-dep
...
Add ca-certificates to our package Recommends
2014-01-11 15:07:50 -08:00
Tianon Gravi
7273b33e86
Merge pull request #3551 from tianon/test-docker-io-gpg-fingerprint
...
Inline the test.docker.io fingerprint in the install.sh script as well
2014-01-11 15:07:06 -08:00
James Turnbull
ba90fcfc08
Merge pull request #3539 from jeandalido/patch-1
...
Update docker_remote_api_v1.8.rst
2014-01-11 13:29:56 -08:00
Tianon Gravi
f65706aaeb
Merge pull request #3500 from tianon/lvm2-version
...
Add more specific lvm2 version to PACKAGERS document
2014-01-11 03:39:01 -08:00
Tianon Gravi
cb314b9752
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'
2014-01-10 22:46:30 -08:00
Jordan Sissel
a02450d048
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)
2014-01-10 22:36:58 -08:00
Victor Vieux
b61570b521
Merge pull request #3490 from vieux/image_export_job
...
Move image_export to a job
2014-01-10 15:58:47 -08:00
Victor Vieux
5264914e57
Move image_export to a job
...
Docker-DCO-1.0-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-10 15:54:44 -08:00
Victor Vieux
6dde20c0c5
Merge pull request #3180 from vieux/job_container_delete
...
Move container_delete to job
2014-01-10 15:53:38 -08:00
Victor Vieux
ad162b75a0
Merge pull request #3476 from vieux/restart_job
...
Move restart to a job
2014-01-10 15:52:42 -08:00
Victor Vieux
15689b56c8
Move restart to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-10 15:51:48 -08:00
Victor Vieux
aa3339cf39
move container_delete to job
...
handle error
remove useless errStr
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor@docker.com> (github: vieux)
2014-01-10 15:34:10 -08:00
Tianon Gravi
459e0aa2c1
Merge pull request #3543 from EvanKrall/gzip_debs
...
Use gzip compression in Ubuntu packages to make it possible to install on Lucid
2014-01-10 15:29:22 -08:00
Tianon Gravi
e5189b5dd2
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)
2014-01-10 13:06:53 -07:00
Evan Krall
c2a59dfe48
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)
2014-01-10 11:45:00 -08:00
Tianon Gravi
051e7a0bef
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)
2014-01-10 10:20:31 -07:00
Jean-Baptiste Dalido
2fd4c39c86
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)
2014-01-10 11:35:25 +01:00
Jean-Baptiste
d69cf2986e
Update docker_remote_api_v1.8.rst
...
Docker-DCO-1.1-Signed-off-by: Jean-Baptiste Dalido <jbdalido@gmail.com> (github: jeandalido)
2014-01-10 11:27:21 +01:00
Guillaume J. Charmes
7985125602
Merge pull request #3537 from crosbymichael/merge_release_v0.7.5
...
Merge release v0.7.5
2014-01-09 11:39:35 -08:00
Michael Crosby
c3c89abfd6
Change version to v0.7.5
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-01-09 11:36:30 -08:00
Michael Crosby
1fcbd36cb2
Merge branch 'release' into merge_release_v0.7.5
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-01-09 11:36:14 -08:00
Michael Crosby
845b816686
Merge pull request #3532 from crosbymichael/bump_v0.7.5
...
Bump to v0.7.5
2014-01-09 11:33:57 -08:00
Guillaume J. Charmes
fc14e81bf9
Merge pull request #3533 from crosbymichael/run-rm-remove-volumes
...
Remove volumes on docker run -rm
2014-01-09 10:47:28 -08:00
Michael Crosby
c348c04fdf
Bump to version v0.7.5
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-01-09 10:34:50 -08:00
Michael Crosby
5ca0fedffc
Merge pull request #3535 from plietar/3457-git-build
...
Don't compress the archive made from git's output.
2014-01-09 10:32:28 -08:00
Paul Lietar
562a235763
Don't compress the archive made from git's output.
...
Commit 894d4a23fb
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)
2014-01-09 18:23:19 +00:00
Michael Crosby
14acf6883d
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)
2014-01-09 09:58:40 -08:00
Guillaume J. Charmes
eb131250aa
Merge pull request #3530 from creack/update_dco_doc
...
Update DCO git hook example
2014-01-09 09:23:35 -08:00
Guillaume J. Charmes
9ec29fddf8
Merge pull request #3528 from tianon/update-travis-dco
...
Update Travis to check for new 1.1 DCO version
2014-01-09 09:23:23 -08:00
Guillaume J. Charmes
d015d31b1c
Merge pull request #3527 from keeb/add-dco
...
Amend DCO
2014-01-09 09:23:11 -08:00
Guillaume J. Charmes
f6292ab8d0
Merge pull request #3522 from bantic/fix-misspelled-names
...
Fix misspelled Hawkings -> Hawking, Archimede -> Archimedes, Euclide -> Euclid
2014-01-09 09:12:05 -08:00
Guillaume J. Charmes
c3f2597546
Update DCO git hook example
2014-01-09 09:02:56 -08:00
Tianon Gravi
a4f3cd62a3
Update Travis to check for new 1.1 DCO version
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-09 09:52:17 -07:00
Nick Stinemates
11d61ec77f
Bump DCO version
2014-01-09 08:47:03 -08:00
Nick Stinemates
40c90796e9
Fix layout
2014-01-09 08:35:47 -08:00
Nick Stinemates
7fb55f7725
Removed the 5th clause
...
Removed clause which states contributions should be relicensed
2014-01-09 08:35:06 -08:00