p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
11,366 Commits 2 Branches 295 Tags
4047c8a0dad2e07bcedde52307ce4d3ec35bc2fb
Commit Graph

491 Commits

Author SHA1 Message Date
Jessica Frazelle
08135c6c86 Revert "finally, use code generation for INITSHA1 & INITPATH too" 
This reverts commit c7c620dd9fce0e7b437ee185c7a58341f3b8e3aa.

Conflicts:
	.gitignore
	hack/make.sh
	hack/make/dynbinary

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 7041eb00be7d6224aeedf7db317667b1d121b54d
Component: engine
 2014-10-28 16:29:01 -07:00
Jessica Frazelle
712adb4068 Revert "use code generation for GITCOMMIT/VERSION too" 
This reverts commit 85744a35de0e30c2dd6741b833f38ff218c8a3fc.

Conflicts:
	.gitignore
	hack/make.sh

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: ec1420cc2b228116d4aa9c812bd98fa8acdc1b98
Component: engine
 2014-10-28 16:27:23 -07:00
Jessica Frazelle
7c82a1653d Revert "Use code generation to set IAMSTATIC instead of -X" 
This reverts commit 3e10b93106dea94e5747ab32fe4ac765aa22f9bc.

Conflicts:
	.gitignore
	hack/make.sh
	hack/make/dynbinary

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 17e0a15386c2a2ff01417d66e37683bd9a2a79c8
Component: engine
 2014-10-28 16:25:50 -07:00
Michael Crosby
5243fb8cd6 Update libcontainer f60d7b9195f8dc0b5d343abbc3293d 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 622e1005530eada61675e533d3993d7df6c21186
Component: engine
 2014-10-28 22:19:01 +00:00
Jessie Frazelle
6c8bda9fe4 Merge pull request #8770 from LK4D4/logrus_support 
Logrus support
Upstream-commit: 15b6b7be010546f30d7eabd000167d428efc0b13
Component: engine
 2014-10-27 09:05:24 -07:00
Tianon Gravi
36b26c05e8 Merge pull request #8643 from jfrazelle/fix-amazon-linux-dist 
Fix amazon linux dist
Upstream-commit: 10d33150802d848c98adf256df81d949c83cf3cf
Component: engine
 2014-10-24 19:26:27 -06:00
Alexandr Morozov
7fa7b2fbdb Vendor logrus logging framework 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 6229a364324ba603789bc38607bb628177280ebf
Component: engine
 2014-10-24 15:01:52 -07:00
Tibor Vass
93029bdc4e Merge pull request #8325 from mwhudson/do-not-use-X 
Stop using -X flag to set global variables
Upstream-commit: d515590d153ed1299ffe386eb30598c15bf61007
Component: engine
 2014-10-24 17:30:45 -04:00
Michael Hudson-Doyle
e41a8afa7b finally, use code generation for INITSHA1 & INITPATH too 
Signed-off-by: Michael Hudson-Doyle <michael.hudson@linaro.org>
Upstream-commit: c7c620dd9fce0e7b437ee185c7a58341f3b8e3aa
Component: engine
 2014-10-24 11:01:19 +13:00
Michael Hudson-Doyle
c15381784d use code generation for GITCOMMIT/VERSION too 
Signed-off-by: Michael Hudson-Doyle <michael.hudson@linaro.org>
Upstream-commit: 85744a35de0e30c2dd6741b833f38ff218c8a3fc
Component: engine
 2014-10-24 10:58:39 +13:00
Michael Hudson-Doyle
4602c3289a Use code generation to set IAMSTATIC instead of -X 
Signed-off-by: Michael Hudson-Doyle <michael.hudson@linaro.org>
Upstream-commit: 3e10b93106dea94e5747ab32fe4ac765aa22f9bc
Component: engine
 2014-10-24 10:56:51 +13:00
Michael Crosby
2fe580eb85 Update libcontainer to aab3f6d17f2f56606f07f3a6eb6 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 291b84610fc87622c7116ac71328c1ce3181a6db
Component: engine
 2014-10-23 19:00:05 +00:00
Jessica Frazelle
9142db1d85 check ID in os-release instead 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: b7249317c1a703df8a4d7b113cfc839ebbc56a29
Component: engine
 2014-10-17 16:51:36 -07:00
Amit Bakshi
892128be0c install.sh: Fix for Amazon's Linux AMI 
Use /etc/os-release to determine distro

Contents of /etc/os-release on Amazon Linux AMI 2014.09:
NAME="Amazon Linux AMI"
VERSION="2014.09"
ID="amzn"
ID_LIKE="rhel fedora"
VERSION_ID="2014.09"
PRETTY_NAME="Amazon Linux AMI 2014.09"
ANSI_COLOR="0;33"
CPE_NAME="cpe:/o:amazon:linux:2014.09:ga"
HOME_URL="http://aws.amazon.com/amazon-linux-ami/"

Signed-off-by: Amit Bakshi <ambakshi@gmail.com>
Signed-off-by: Jessica Frazelle <jess@docker.com>
Upstream-commit: dbe24a048bc557d34925e5ca9f7dd99f57d1d9e1
Component: engine
 2014-10-17 16:19:28 -07:00
Tianon Gravi
966c634d3c Fix more missing HOME references 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: d040de6dd4660041dd37792a9a702cf8317a71d9
Component: engine
 2014-10-16 10:14:26 -06:00
Tibor Vass
80f48778b2 change docs.docker.io to docs.docker.com in install script 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: e5e0baa6d4651dd0182413f0db622ab82e53841f
Component: engine
 2014-10-14 13:45:26 -04:00
Michael Crosby
39417f76ad Update to libcontainer 8d1d0ba38a7348c5cfdc05aea3b 
This fixes issues where the apparmor profile is not applied to processes
via docker exec.  As a side effect the parent processes were unable to
kill the additional child processes because of the profile mismatch.

Easy way to reproduce on an apparmor system:
docker run -ti debian:jessie bash
ps auxZ
- look at the labels

- in another shell
docker exec <name> sleep 1000

- go back to the first container and
ps auxZ
- make sure all processes have the correct docker-default profile

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 018ce19b31bbd8d752658835e9442fa7d59a47e3
Component: engine
 2014-10-14 06:24:38 +00:00
Michael Crosby
b3ff7a5ede Update libcontainer to 4f409628d80b9842004a3f17c92 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 8fedf718ce0c788311d8d3382b0aaeb9b9a792d4
Component: engine
 2014-10-13 19:53:20 +00:00
Jérôme Petazzoni
bdbbff32ad Add -E flag to sudo (fixes #8494) 
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com> (github: jpetazzo)
Upstream-commit: e01e913d80dcbd509a003feb55c7cdb6fc9758c2
Component: engine
 2014-10-09 14:54:22 -07:00
Michael Crosby
9b0677b8de Merge pull request #8320 from dmcgowan/provenance_pull 
Official image provenance pull flow
Upstream-commit: eaaf9e31258ca0af042e07c707f6bbb3afeb293b
Component: engine
 2014-10-03 10:56:54 -07:00
Michael Crosby
824c8d6309 Update libconatiner to b3570267c7b7995d5d618974d8f 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 193654e3ef26067315d6c68c3066215e5c509ae5
Component: engine
 2014-10-02 22:19:56 +00:00
Derek McGowan
8635bae7b0 Update libtrust version 
Updated to version of libtrust with the trust graph implementation

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 8a6c7100ea7f6ea82ba567863b6401f45766625b
Component: engine
 2014-10-01 13:19:40 -07:00
Tianon Gravi
b79cf494d2 Merge pull request #8293 from crosbymichael/update-libcontainer-sep8 
Update libcontainer to c744f6470e37be5ce1f1ae09b842c15c1bee120d
Upstream-commit: 07179a7eb1a0cb7816b618a108d46cb4a4e699ca
Component: engine
 2014-09-29 18:09:25 -06:00
Victor Vieux
baaf0d57f5 Merge pull request #8112 from dmcgowan/libtrust_key_management 
Libtrust key management
Upstream-commit: 999d4117f6544aeefaba3c40aef678042c71aa7a
Component: engine
 2014-09-29 16:32:48 -07:00
Michael Crosby
9ea819ca0c Update libcontainer to c744f6470e37be5ce1f1ae09b84 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 392eec20751bd1da7f84fa4974042eaa263a56d2
Component: engine
 2014-09-29 21:23:42 +00:00
Tianon Gravi
c8d8a3e7a1 Move the body of go_compile_test_dir into a file since GNU Parallel breaks on sourcing exported Bash functions thanks to the shellshock fixes 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 8ffdf6022e88e19c6d1f434a69ff5cbd3dc7db6b
Component: engine
 2014-09-28 21:51:44 -06:00
Derek McGowan
82830cd901 Vendor libtrust 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: a049ac32d1850e9bc5b16640a859b1709bc4af62
Component: engine
 2014-09-26 15:48:12 -07:00
Erik Hollensbe
a9f3287fa1 Merge pull request #8239 from erikh/hack_options 
hack: TIMEOUT (for controlling test timeout) and forwarding of BUILDFLAGS to binary/dynbinary.
Upstream-commit: 993033d67ad5d2d9d4981708d7388694c3ecc8af
Component: engine
 2014-09-25 14:36:00 -07:00
Erik Hollensbe
449c9e0d74 hack: TIMEOUT (for controlling test timeout) and forwarding of 
BUILDFLAGS to binary/dynbinary.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: aa129b356ff9f16409cba25e9f16805923970cad
Component: engine
 2014-09-25 14:25:43 -07:00
Tibor Vass
8a28fc553b Replace get.docker.io -> get.docker.com and test.docker.io -> test.docker.com 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 808257654a4147ad9b54cfeddc5d0ad236c26e3f
Component: engine
 2014-09-24 18:53:27 -04:00
Tibor Vass
0c49058cda Merge pull request #8121 from bbinet/cleanup-hello-world-container 
Automatically clean up hello-world container with --rm
Upstream-commit: 3c03506cc29fe60eb36dba24dd72dcf0c6185f68
Component: engine
 2014-09-22 10:52:50 -04:00
Michael Crosby
fee8abc42e Update libcontainer to 185328a42654f6dc9a41814e578 
Mac address support to the netlink pkg.
Cgroup performance and memory issues.
Netlink refactoring.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 2531fba389c8bd25ed1ec7bea38f0ee19c974a26
Component: engine
 2014-09-19 11:21:44 -07:00
Bruno Binet
84da0ae620 Automatically clean up hello-world container with --rm 
Signed-off-by: Bruno Binet <bruno.binet@gmail.com>
Upstream-commit: d78936b41842ce725f293f6bba1e3604c91682a3
Component: engine
 2014-09-19 12:22:39 +02:00
Tianon Gravi
c784504469 Add "hack/install.sh" to the "PRs welcome" note in the end of the install script 
Also, simplified the output method by using `cat >&2 <<EOF ...` instead of multiple lines of `echo >&2 '...'`.

Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: adb6910095a18bef64a2da6815acd7d322a4c1e9
Component: engine
 2014-09-17 08:09:39 -06:00
Tianon Gravi
83725e3c4e Merge pull request #8083 from unclejack/install_apparmor 
hack/install.sh: install apparmor when enabled
Upstream-commit: 459b403c2ff5341ab15bfaa8fe609571d1a50748
Component: engine
 2014-09-17 08:05:29 -06:00
unclejack
91fbeb48fc hack/install.sh: install apparmor when enabled 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 9619ce9dd14d31cbf52c53741a1f35842bbe99a6
Component: engine
 2014-09-17 12:13:31 +03:00
Tianon Gravi
e64fa9173d Merge pull request #8001 from jfrazelle/fix-key-for-test-release-ubuntu 
use correct apt-key for test.docker.io/ubuntu
Upstream-commit: 41e625eb7cf1dd4fe747c9e63d25c73e99f98eb9
Component: engine
 2014-09-17 00:06:57 -06:00
Jessica Frazelle
ab21dc210b use correct apt-key for test.docker.io/ubuntu 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 440eb7fee88791d4f2f0866b04ff15253b6df8e9
Component: engine
 2014-09-11 15:22:36 -07:00
Michael Crosby
2d85ff46a7 Update libcontainer to 84ad9386a0240acb7475429a835 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: c604dc292e72c0cbb84184b92b4b2bd3631c862e
Component: engine
 2014-09-09 11:05:58 -07:00
Tomasz Lipinski
3d89f95ea0 Allows installation on Linux Mint Debian Edition 
Otherwise platform won't be detected

Signed-off-by: Tomasz Lipinski <me@tlipinski.net>
Upstream-commit: 021722cf7afade02c382294e4f276ca7edd1ca69
Component: engine
 2014-09-08 20:38:02 +02:00
unclejack
c953d01896 Merge pull request #7191 from tiborvass/test-daemon 
Add Daemon restart test along with Daemon utils
Upstream-commit: 6db078dea79633973b77ca5afad924e10340b39f
Component: engine
 2014-09-02 22:40:23 +03:00
Tibor Vass
d93084e649 Merge pull request #7765 from erikh/test_unit_testflags 
hack/make: fix test-unit target to propogate TESTFLAGS properly
Upstream-commit: ca24e91408181d1cbbae04fc18edce2fe61f02aa
Component: engine
 2014-09-02 12:18:40 -07:00
Erik Hollensbe
4444b40c84 hack/make: fix test-unit target to propogate TESTFLAGS properly 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 9a2d4e92730a576a05e40f7575a6c90512896e87
Component: engine
 2014-09-02 12:10:47 -07:00
Tibor Vass
c02ebae1f7 Add Daemon test utils 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 054b921a2c140f9b8250f6c7e12dec9fba23ce0f
Component: engine
 2014-09-02 10:58:36 -07:00
Michael Crosby
3d48a27630 Update libcontainer to 55430d0db7c6bb1198c0bb573a9 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: cf31787cd0559012c1ee581eaf27143af1cc6ce3
Component: engine
 2014-09-01 15:18:25 -07:00
Tianon Gravi
8d2d67cdd2 Optionalize the "hg clone" of Go, since it takes forever (now, to update our Go version too, we need to explicitly "./hack/vendor.sh --go") 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 78c68825671eb1bd102d76d671ace9de5a37aa19
Component: engine
 2014-08-20 14:17:11 -06:00
Michael Crosby
065feffb73 Update libcontainer to db65c35051d05f3fb218a0e84a1 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 624b944896d47031f9df166b4275037664a3cb23
Component: engine
 2014-08-20 11:19:55 -07:00
Michael Crosby
693c6c8fed Update libcontainer to 29363e2d2d7b8f62a5f353be333 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: a67d06fd4343024ed25c3faf40e58c9a1935c28a
Component: engine
 2014-08-15 15:41:05 -07:00
Solomon Hykes
defddfab5d Add Cristian to hack/MAINTAINERS 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 7d1b2ebde8a0d1484f486b5ea01b1a77014b958b
Component: engine
 2014-08-13 08:13:51 +00:00
James Turnbull
f82c0c847e Merge pull request #7359 from timthelion/patch-10 
Add process for PR acceptance, review, rejection
Upstream-commit: 3de3719290d63e1827ad61c84256e5cc219dea91
Component: engine
 2014-08-12 19:17:10 -04:00