toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,153 Commits 3 Branches 295 Tags
3de3653c91cf6cc48a6f291fb583a99e40a972f1
Commit Graph
13153 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Lifton 3de3653c91 Merge pull request #10752 from psftw/tweak-docs-readme 
Clean up explanation of doc branches.
Upstream-commit: 99ca215c65e9a482f981790f2d4dbe8d4ccce4be
Component: engine
 2015-02-13 17:20:59 -08:00
Fred Lifton ab722f0215 Merge pull request #10674 from cpuguy83/cleanup_Dockerfile_manpage 
Cleans up docs/man/Dockerfile.5.md
Upstream-commit: ee95aa1b813f53d52e42a7d37a3f4988918058ce
Component: engine
 2015-02-13 12:42:19 -08:00
Jessie Frazelle bebced9dfc Merge pull request #10715 from icecrime/keyserver_install_dependency 
Use gpg from our server if keyserver is down
Upstream-commit: 8b010d9f10b42377bcd741dfbe00006994bd8adc
Component: engine
 2015-02-13 11:29:39 -08:00
Jessie Frazelle 6a9a983a60 Merge pull request #10762 from coolljt0725/fix_check_config 
Fix check-config.sh usage
Upstream-commit: 4f24b77826227a17048432a51d728a5ea05dceaa
Component: engine
 2015-02-13 10:36:00 -08:00
Jessie Frazelle ca718cde6f Merge pull request #10763 from moul/patch-2 
mkimage-alpine.sh: Allow to change ARCH from the environment
Upstream-commit: 070e1f238b281a1813ee0b6f7d3adaee72e0c75d
Component: engine
 2015-02-13 10:35:35 -08:00
Alexander Morozov a14f48da41 Merge pull request #10767 from cpuguy83/fix_racey_exec_cgroup_test 
Fix race detected in TestExecCgroup
Upstream-commit: 7d65473b809d8a1ee2f1014139707d50a737f1af
Component: engine
 2015-02-13 09:54:06 -08:00
Brian Goff b108618571 Cleans up docs/man/Dockerfile.5.md 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 14131b65c41ee9f562c3311e533e0f7d9c9de97b
Component: engine
 2015-02-13 12:47:58 -05:00
Brian Goff b8d956b4d4 Fix race detected in TestExecCgroup 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 8f5156e584233f3e83cfc889583fa016aabfeea9
Component: engine
 2015-02-13 12:18:46 -05:00
Arnaud Porterie da0bb2cbb5 Use gpg keyserver pool 
Make the install script independent from the ubuntu keyserver by using
the sks-keyservers pool instead.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: f058e9c43c8752dedcd4d251ddf105b22d0ed1d5
Component: engine
 2015-02-13 09:13:29 -08:00
Manfred Touron 935df32156 mkimage-alpine.sh: Allow to change ARCH from the environment 
Signed-off-by: Manfred Touron <m@42.am>
Upstream-commit: 75f1c440dd9332d28d33585bf16e05a7647412c9
Component: engine
 2015-02-13 13:57:04 +01:00
Lei Jitang 44be94d7d0 Fix check-config.sh usage 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 82fda400b8a2528b1b90e64fc4be6827afbd04ed
Component: engine
 2015-02-13 19:52:11 +08:00
Fred Lifton 1d7249f857 Merge pull request #10748 from icecrime/10739_update_docs 
Update docs for HTTP_PROXY
Upstream-commit: aa073ac05e6171ddfbaca4977f002b821a45f556
Component: engine
 2015-02-12 17:18:49 -08:00
Tibor Vass a135d71f5e Merge pull request #10755 from ahmetalpbalkan/win-cli/TestBuildAddTarXzGz-fix 
TestBuildAddTarXz(Gz): call xz with '-k' due to bug
Upstream-commit: 2b5dfb3b01605f6ec91efd9a5c2f67166fcd9ff5
Component: engine
 2015-02-12 19:25:43 -05:00
Ahmet Alp Balkan 01e622e5b7 TestBuildAddTarXz: xz with '-k' due to msys bug 
TestBuildAddTarXz/TestBuildAddTarXzGz make exec calls like
'cd %SOME_TEMP_DIR%; xz test.gz' but this fails when called
from integration-cli tests (doesn't fail from msys or cmd shell).

It fails with error: "xz: test.tar: Cannot remove: Permission denied."
Proposing workaround of using the `xz --keep` argument since keeping
test.tar is harmless and it's already in os.TempDir().

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 2f53820ce409ce1afb6513b7799d094b9c53779d
Component: engine
 2015-02-12 15:42:27 -08:00
Tianon Gravi 82c4bb4849 Merge pull request #10716 from ahmetalpbalkan/win-cli/fix-emptyfs-path 
Change emptyfs path in integration-cli tests
Upstream-commit: 65623e22aa79b6974f8fc4f0384a7533cbb9c570
Component: engine
 2015-02-12 15:29:48 -08:00
Ahmet Alp Balkan 8f945cfefd Change emptyfs path in integration-cli tests 
This fixes the build break in Jenkins Windows CI tests and
fixes TestInspectImage for Windows CLI.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: e1be475c5b3269246d5ecaf2b7943608941cc966
Component: engine
 2015-02-12 15:02:18 -08:00
Doug Davis 3799fccfba Merge pull request #10727 from ahmetalpbalkan/win-cli/integration-cli-compile-fix 
Create builder/command, cut libcontainer dependency on integration-cli
Upstream-commit: 802802b7812b7c73aefec4e922cad82f8dcddd4c
Component: engine
 2015-02-12 17:10:16 -05:00
Peter Salvatore ba30fcef2a Clean up explanation of doc branches. 
Signed-off-by: Peter Salvatore <peter@psftw.com>
Upstream-commit: 74b050bd0cfa897c0ef2fa50e26725af3c29a65e
Component: engine
 2015-02-12 17:02:56 -05:00
Arnaud Porterie 2c48e42531 Update docs for HTTP_PROXY 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 7a7c00ca0834e6bad0132d834399bcee4d3b957b
Component: engine
 2015-02-12 11:40:56 -08:00
Arnaud Porterie 29f194cb0b Merge pull request #10739 from cpuguy83/fix_do_not_proxy_unix_sock 
Do not use HTTP_PROXY for unix sock
Upstream-commit: d8f60a6cf7790b8951fdb1c5af2ca2aef5353ec6
Component: engine
 2015-02-12 11:33:46 -08:00
Michael Crosby 893e1b6f39 Merge pull request #10694 from dmcgowan/remove-push-by-id 
Remove push by ID
Upstream-commit: 3eb1939b699efe5bde16922b0668c46f8e9d47c9
Component: engine
 2015-02-12 11:25:38 -08:00
Brian Goff 106678e894 Do not use HTTP_PROXY for unix sock 
Makes sure the CLI does not use HTTP_PROXY when connecting to unix
socket.
Also adds some tests to make sure this functionality works as expected.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: f6e697d2ace2ea659c1b3f7e3dcef7493baa481c
Component: engine
 2015-02-12 11:38:52 -05:00
Ahmet Alp Balkan dbc9971c4a builder/parser: Make use of builder/command 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 72a070c5da8b6fe832794a6de37aace7f9b93306
Component: engine
 2015-02-11 23:54:41 -08:00
Ahmet Alp Balkan b2dfebba9a Create builder/command, cut libcontainer dependency on integration-cli 
d1e9d07c introduces a dependency to libcontainer and other daemon
related packages through builder package. The only thing test needs
is set of the Dockerfile commands. Extracting them to a separate
package.

This was causing CI tests to not to compile on non-Linux platforms.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: ccde3a1f73bb4f64845e736d3173eb6f6935971f
Component: engine
 2015-02-11 21:44:31 -08:00
Jessie Frazelle ebb652c696 Merge pull request #10686 from LK4D4/bump_docs 
Bump api version to 1.18
Upstream-commit: f4749acad48f03454c951081a0a3f0149a23e260
Component: engine
 2015-02-11 11:01:28 -08:00
Tibor Vass c13ff18007 Merge pull request #10670 from tianon/revert-10290-sorry-windows-norelease4u 
Revert "Remove windows from the list of supported platforms"
Upstream-commit: df7a04f9a64fc7b8e528a3b99beb71b97b4b22d0
Component: engine
 2015-02-11 13:54:34 -05:00
Jessie Frazelle a2081fdfa4 Merge pull request #10596 from rhvgoyal/manifest-close-archive 
manifest: Close archive once done to umount the device backing the layer
Upstream-commit: 3e039e8748f9783516183f729f85e26cfe9de9d9
Component: engine
 2015-02-11 09:05:26 -08:00
Vivek Goyal 5407924e49 docker-call-close-archive-in-push-v2-image 
pushV2Image() calls TarLayer() which returns an archive. One needs to
Close() the archive once done otherwise it will leave mounted devices
if devicemapper graph driver is being used.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> 
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 064ff42d6d34b9c92e634f30ac1549d9786ab26f
Component: engine
 2015-02-11 11:30:46 -05:00
Vivek Goyal 6e39a35c8f manifest: Close archive once done using it 
manifest code calls TarLayer() and gets archive. This archive needs to
be closed once caller is done using it to release the resrouces held
by archive. For the devicemapper graphdriver, archive keeps a device
mounted (device which is backing the layer). If archive.Close() is not
called, that device remains mounted and later deletion of device fails
leading to various other issues.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 41bfa87b6c27b3f0041906f99ae9d0d9531db898
Component: engine
 2015-02-11 11:30:45 -05:00
James Turnbull 552bf3d2e6 Merge pull request #10658 from duglin/ReferenceSpecs 
Add Image/Libcontainer spec refs to README
Upstream-commit: 9939dbe58bae371ca08ce65610aa8a1f7915b506
Component: engine
 2015-02-11 06:42:41 -05:00
Sven Dowideit 2979e456cd Merge pull request #10632 from chenhanxiao/update-TESTFLAGS-docs 
docs: emphasis TESTFLAGS and add some descriptions
Upstream-commit: 54b59c2b2f440df0a513a37d7709fc5b0c88773f
Component: engine
 2015-02-11 12:36:43 +10:00
Derek McGowan 63a215e83c Remove push by ID 
Pushing by image ID is not allowed in the Docker CLI and not supported by the registry. An unnamed image also cannot be pushed to a private registry, since no endpoint is specified and it will default to the hub. The hub also does not support this use case, therefore removing the code path is the best solution.

The ability to push a layer without a name is unsupported by the v2 registry.


Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: db2d875b5e621378baf690d261969712fbfffcfd
Component: engine
 2015-02-10 15:46:42 -08:00
Michael Crosby 8f4f7fbb54 Merge pull request #10687 from icecrime/bump_master_v1.5.0 
Bump to version v1.5.0-dev
Upstream-commit: 19019722d944ecc17a1a62acc418d74ef4e23407
Component: engine
 2015-02-10 14:10:45 -08:00
Jessie Frazelle 5b5c1c638d Merge pull request #10689 from duglin/ScratchImage 
Show err msg on empty 'scratch' Dockerfile
Upstream-commit: 84fc81e35369e817dbd91bb2a51745f5eaec55e0
Component: engine
 2015-02-10 13:54:43 -08:00
Doug Davis b185b43330 Show err msg on empty 'scratch' Dockerfile 
If you have a Dockefile with just:
   FROM scratch

An error is generated but its never shown to the CLI. This PR fixes that.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 1654dfdf146df42a1271696c0290027460cce59a
Component: engine
 2015-02-10 11:43:45 -08:00
Arnaud Porterie b05344184c Bump to version v1.5.0 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 66ab357edf7491179c541ed3cfff21904396e56a
Component: engine
 2015-02-10 10:52:36 -08:00
Alexander Morozov 5c56835bc1 Bump api version to 1.18 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: d92b4232f7c7cb64efd8e56c33238b4426fe22af
Component: engine
 2015-02-10 10:48:54 -08:00
Vincent Batts 009380c706 Merge pull request #10474 from petervo/10473-availble-space 
Add available space to devicemapper status output
Upstream-commit: f4dc496d36d31cf9ca1b3508f10954066ff7f8bc
Component: engine
 2015-02-10 16:32:51 +01:00
Chen Hanxiao 04be9f6857 docs: emphasis TESTFLAGS and add some descriptions 
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: d83b6918a7d18a09f86858709f173277d62c268e
Component: engine
 2015-02-10 15:34:33 +08:00
Alexander Morozov 64a4aefa3d Merge pull request #10671 from tiborvass/remove-fail-word-from-tests 
Remove word "fail" from tests
Upstream-commit: d14751bf30a70abe7bc6048af61848eed32ca140
Component: engine
 2015-02-09 20:53:15 -08:00
Michael Crosby 1ebda39c1c Merge pull request #10561 from duglin/SupportNoArgCmds 
Add support for no-arg commands in Dockerfile
Upstream-commit: 7cc76a7fda2b039a68aa1e1612474e2c4c0c5821
Component: engine
 2015-02-09 18:08:14 -08:00
Jessie Frazelle 2dc29a37bd Merge pull request #10598 from lsm5/core-file-size 
no limit on core size
Upstream-commit: 9944f8b95453e3d0726fc037aaed41a98e72e070
Component: engine
 2015-02-09 17:31:40 -08:00
Sven Dowideit 44b33ef557 Merge pull request #10652 from SvenDowideit/update-9456 
update kernel reqs doc; recommend updates on RHEL
Upstream-commit: 4284715c79acf1cdc4da1e8af4827b157ed08bb6
Component: engine
 2015-02-10 11:02:42 +10:00
Sven Dowideit 48d21d06a2 updates from review 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 32c6179f475183ba778cb90656a971cde81340dc
Component: engine
 2015-02-10 11:02:05 +10:00
unclejack 2fa60db4e0 update kernel reqs doc; recommend updates on RHEL 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: b4089114efe23b18218886ec2085455d463c7179
Component: engine
 2015-02-10 11:02:05 +10:00
Sven Dowideit d05965b4df Merge pull request #10608 from SvenDowideit/wrap-doc-headings-in-sidebar 
Simplfy the sidebar html and css, and then allow the text to wrap
Upstream-commit: 76baa351c07d7fe847d14fafbcb5a3ba97519a1a
Component: engine
 2015-02-10 10:03:37 +10:00
Sven Dowideit 9dcb95789e remove the text-indent and increase the font size 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 6257505dbc44bb58c56ac92677dbf07548c0c74a
Component: engine
 2015-02-10 09:50:02 +10:00
Sven Dowideit f24997510f Simplfy the sidebar html and css, and then allow the text to wrap 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: c237f9f201bbf5c4b06fbfd65254eb2af75e136f
Component: engine
 2015-02-10 09:50:02 +10:00
Tibor Vass e0ebfad813 Remove word "fail" from tests 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: aadb6289ccd84b9997a43c8b74b2948236f30e76
Component: engine
 2015-02-09 18:01:52 -05:00
Peter Volpe 7fe8a53e1c Detail available space behavior on loop devices 
Signed-off-by: Peter Volpe <petervo@redhat.com>
Upstream-commit: 6816d27591a24b7a3a5b2e4c85294abffda977a2
Component: engine
 2015-02-09 14:51:48 -08:00