a12d897394
Update logrus to v0.6.0 so we can use ParseLevel() for PR #8335
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-11-03 11:57:30 -08:00
7041eb00be
Revert "finally, use code generation for INITSHA1 & INITPATH too"
...
This reverts commit c7c620dd9f
2014-10-28 16:29:01 -07:00
ec1420cc2b
Revert "use code generation for GITCOMMIT/VERSION too"
...
This reverts commit 85744a35de
2014-10-28 16:27:23 -07:00
17e0a15386
Revert "Use code generation to set IAMSTATIC instead of -X"
...
This reverts commit 3e10b93106
2014-10-28 16:25:50 -07:00
622e100553
Update libcontainer f60d7b9195f8dc0b5d343abbc3293d
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-10-28 22:19:01 +00:00
15b6b7be01
Merge pull request #8770 from LK4D4/logrus_support
...
Logrus support
2014-10-27 09:05:24 -07:00
10d3315080
Merge pull request #8643 from jfrazelle/fix-amazon-linux-dist
...
Fix amazon linux dist
2014-10-24 19:26:27 -06:00
6229a36432
Vendor logrus logging framework
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-24 15:01:52 -07:00
d515590d15
Merge pull request #8325 from mwhudson/do-not-use-X
...
Stop using -X flag to set global variables
2014-10-24 17:30:45 -04:00
c7c620dd9f
finally, use code generation for INITSHA1 & INITPATH too
...
Signed-off-by: Michael Hudson-Doyle <michael.hudson@linaro.org>
2014-10-24 11:01:19 +13:00
85744a35de
use code generation for GITCOMMIT/VERSION too
...
Signed-off-by: Michael Hudson-Doyle <michael.hudson@linaro.org>
2014-10-24 10:58:39 +13:00
3e10b93106
Use code generation to set IAMSTATIC instead of -X
...
Signed-off-by: Michael Hudson-Doyle <michael.hudson@linaro.org>
2014-10-24 10:56:51 +13:00
291b84610f
Update libcontainer to aab3f6d17f2f56606f07f3a6eb6
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-10-23 19:00:05 +00:00
91502ba66b
Add mention of e2fsprogs to runtime dependencies.
...
Signed-off-by: Marc Tamsky <mtamsky@gmail.com> (github: tamsky)
2014-10-17 16:58:07 -07:00
b7249317c1
check ID in os-release instead
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-17 16:51:36 -07:00
dbe24a048b
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>
2014-10-17 16:19:28 -07:00
d040de6dd4
Fix more missing HOME references
...
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-10-16 10:14:26 -06:00
e5e0baa6d4
change docs.docker.io to docs.docker.com in install script
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-10-14 13:45:26 -04:00
018ce19b31
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>
2014-10-14 06:24:38 +00:00
8fedf718ce
Update libcontainer to 4f409628d80b9842004a3f17c92
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-10-13 19:53:20 +00:00
e01e913d80
Add -E flag to sudo ( fixes #8494 )
...
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com> (github: jpetazzo)
2014-10-09 14:54:22 -07:00
eaaf9e3125
Merge pull request #8320 from dmcgowan/provenance_pull
...
Official image provenance pull flow
2014-10-03 10:56:54 -07:00
193654e3ef
Update libconatiner to b3570267c7b7995d5d618974d8f
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-10-02 22:19:56 +00:00
8a6c7100ea
Update libtrust version
...
Updated to version of libtrust with the trust graph implementation
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2014-10-01 13:19:40 -07:00
07179a7eb1
Merge pull request #8293 from crosbymichael/update-libcontainer-sep8
...
Update libcontainer to c744f6470e37be5ce1f1ae09b842c15c1bee120d
2014-09-29 18:09:25 -06:00
999d4117f6
Merge pull request #8112 from dmcgowan/libtrust_key_management
...
Libtrust key management
2014-09-29 16:32:48 -07:00
392eec2075
Update libcontainer to c744f6470e37be5ce1f1ae09b84
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-09-29 21:23:42 +00:00
8ffdf6022e
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>
2014-09-28 21:51:44 -06:00
a049ac32d1
Vendor libtrust
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2014-09-26 15:48:12 -07:00
993033d67a
Merge pull request #8239 from erikh/hack_options
...
hack: TIMEOUT (for controlling test timeout) and forwarding of BUILDFLAGS to binary/dynbinary.
2014-09-25 14:36:00 -07:00
aa129b356f
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)
2014-09-25 14:25:43 -07:00
808257654a
Replace get.docker.io -> get.docker.com and test.docker.io -> test.docker.com
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-09-24 18:53:27 -04:00
3c03506cc2
Merge pull request #8121 from bbinet/cleanup-hello-world-container
...
Automatically clean up hello-world container with --rm
2014-09-22 10:52:50 -04:00
2531fba389
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>
2014-09-19 11:21:44 -07:00
d78936b418
Automatically clean up hello-world container with --rm
...
Signed-off-by: Bruno Binet <bruno.binet@gmail.com>
2014-09-19 12:22:39 +02:00
adb6910095
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>
2014-09-17 08:09:39 -06:00
459b403c2f
Merge pull request #8083 from unclejack/install_apparmor
...
hack/install.sh: install apparmor when enabled
2014-09-17 08:05:29 -06:00
9619ce9dd1
hack/install.sh: install apparmor when enabled
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-17 12:13:31 +03:00
41e625eb7c
Merge pull request #8001 from jfrazelle/fix-key-for-test-release-ubuntu
...
use correct apt-key for test.docker.io/ubuntu
2014-09-17 00:06:57 -06:00
440eb7fee8
use correct apt-key for test.docker.io/ubuntu
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-09-11 15:22:36 -07:00
c604dc292e
Update libcontainer to 84ad9386a0240acb7475429a835
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-09-09 11:05:58 -07:00
021722cf7a
Allows installation on Linux Mint Debian Edition
...
Otherwise platform won't be detected
Signed-off-by: Tomasz Lipinski <me@tlipinski.net>
2014-09-08 20:38:02 +02:00
6db078dea7
Merge pull request #7191 from tiborvass/test-daemon
...
Add Daemon restart test along with Daemon utils
2014-09-02 22:40:23 +03:00
ca24e91408
Merge pull request #7765 from erikh/test_unit_testflags
...
hack/make: fix test-unit target to propogate TESTFLAGS properly
2014-09-02 12:18:40 -07:00
9a2d4e9273
hack/make: fix test-unit target to propogate TESTFLAGS properly
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-02 12:10:47 -07:00
054b921a2c
Add Daemon test utils
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-09-02 10:58:36 -07:00
cf31787cd0
Update libcontainer to 55430d0db7c6bb1198c0bb573a9
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-09-01 15:18:25 -07:00
78c6882567
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>
2014-08-20 14:17:11 -06:00
624b944896
Update libcontainer to db65c35051d05f3fb218a0e84a1
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-20 11:19:55 -07:00
a67d06fd43
Update libcontainer to 29363e2d2d7b8f62a5f353be333
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-15 15:41:05 -07:00
7d1b2ebde8
Add Cristian to hack/MAINTAINERS
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-13 08:13:51 +00:00
3de3719290
Merge pull request #7359 from timthelion/patch-10
...
Add process for PR acceptance, review, rejection
2014-08-12 19:17:10 -04:00
e4a09cd79d
Add process for PR acceptance, review, rejection
...
This is an extremely tentative PR. However, I feel that the suggestions are generally good.
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: timthelion)
2014-08-12 20:29:45 +00:00
c74e8b544d
Update libcontainer to f2e78425c377acc7a67a35c3148
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-08 16:12:35 -07:00
5101173e1f
Update hack/vendor.sh to use libcontainer's update-vendor.sh script as the source of truth for libcontainer deps and not include them in Docker's repo twice
...
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-08-06 13:18:24 -06:00
6215422286
Update libcontainer to 5589d4d879f1d7e31967a927d3e
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-05 18:13:43 -07:00
3c1212ca30
Merge pull request #7377 from tianon/daemon-build-tag
...
Add a "daemon" build tag and toggle it with the already-existing "DOCKER_CLIENTONLY" build variable
2014-08-04 17:32:03 -07:00
6b94f2d9be
Merge pull request #7310 from stevecrozz/maintainers-grammar-update
...
Correct grammar in MAINTAINERS.md
2014-08-04 17:57:08 -06:00
ba663eac3a
Adjust build tags to be client-only in "make cross" too
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-08-04 15:05:12 -06:00
1b95590d06
Add a "daemon" build tag and toggle it with the already-existing "DOCKER_CLIENTONLY" build variable
...
This works mostly by refactoring our "main" package to be careful about what it imports based on the daemon build tag. :)
Also, I've updated Travis to test "client-only" compilation after it tests the daemon version.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-08-04 15:05:12 -06:00
74212a1565
Correct grammer in MAINTAINERS.md
...
Signed-off-by: Stephen Crosby <stevecrozz@gmail.com>
2014-08-04 13:37:01 -07:00
22f373aeda
Update libcontainer to 68ea1234a0b046803aacb2562df
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-04 12:34:11 -07:00
4909a70204
Accept vanilla Linux Foundation signoffs
...
This allows signing off commits with `git commit -s`
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Cleaned up DCO regex
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-08-01 19:30:34 -04:00
58588009c0
Btrfs graph driver is not experimental
...
Btrfs graph driver is not experimental now according to #4838 and CHANGELOG.md is saying "btrfs is no longer considered experimental.".
Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com> (github: ichik1)
2014-08-01 14:37:38 +09:00
503d124677
Merge pull request #7035 from tianon/standardize-apt-get-install
...
Standardize "apt-get install" usage across the repo
2014-08-01 11:43:37 +10:00
f4db3985d9
Bump libcontainer dep
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-31 12:46:35 -06:00
3a14eb066c
Fix more instances of "dotcloud/docker" in hack/ (and add a DOCKER_PKG environment variable to simplify references to our "package path" in our bundlescripts)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-30 17:02:04 -06:00
fc637b5275
Standardize "apt-get install" usage across the repo
...
I might have missed some, but I think this is most of the offenders.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-28 17:41:59 -06:00
5ef1126669
Merge pull request #6943 from tiborvass/parallel_compile_test
...
Parallel compile test binaries
2014-07-28 12:32:56 -06:00
d0a0e91f1f
bump Go to 1.3
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-07-26 21:33:31 +03:00
4cfe806db2
Kill all concurrent jobs on error
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-07-26 13:45:35 -04:00
0a7cd70924
Fix precompiled unit tests needing their "testdata" contents
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-26 11:46:52 -04:00
a6085fd430
Add a bunch more tweaks to the parallel test compilation
...
- put all the precompiled test binaries in $DEST so they show up in bundles and can be re-run individually afterwards
- support cases where parallel is not installed (when using dyntest-unit, for example, this is much more common, since it's designed to be run outside the Dockerfile)
- use "mktemp -d" instead of "/tmp" directly for our temporary parallel HOME
- update the default PARALLEL_JOBS to be the value of "nproc" instead of 0, since "0 means as many as possible" (see https://www.gnu.org/software/parallel/man.html#jobs_n )
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-26 11:46:36 -04:00
3a1385702c
benign whitespace change
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-07-26 11:46:36 -04:00
158e3068bd
compile unit tests in parallel with GNU parallel
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-07-26 11:46:36 -04:00
7756bcc7ab
Merge pull request #7227 from tianon/generate-authors
...
Add new script to generate AUTHORS and regenerate AUTHORS (fixing a few new dups too)
2014-07-25 12:31:47 -06:00
771ed23915
Add new script to generate AUTHORS and regenerate AUTHORS (fixing a few new dups too)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-24 16:49:39 -06:00
b3ee9ac74e
update go import path and libcontainer
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-24 22:19:50 +00:00
9380e8cbe7
Merge pull request #7148 from tianon/buildtags-docs
...
Reorganize and clarify the DOCKER_BUILDTAGS docs
2014-07-23 22:27:07 -06:00
2f23e204d9
Merge pull request #7151 from SvenDowideit/add-version-selection-ux
...
Add version selection ux to the Documentation.
2014-07-23 09:21:55 +10:00
4d109f6158
avoid publishing to the root unless specified, so old version releases only goto their own dir
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-07-22 19:05:18 +10:00
3472c006c4
Add more details so I have more of an over-view of what I need to
...
automate
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-07-22 18:04:48 +10:00
1b31a80eb7
Reorganize and clarify the DOCKER_BUILDTAGS docs
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-21 22:00:26 -06:00
1473374a2a
Merge pull request #7078 from unclejack/fix_archive_tar_pax_headers
...
archive/tar: update to fix writing of PAX headers
2014-07-21 17:26:41 -07:00
1b9b11db4f
Update libcontainer to cf45d141db69ce11dcccac178e5
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-18 15:31:25 -07:00
9870a2bcae
Merge pull request #7077 from tianon/fix-ubuntu-systemd
...
Fix hack/make/ubuntu to install both docker.service and docker.socket
2014-07-18 14:13:04 -06:00
1646e5d69a
Merge pull request #7069 from crosbymichael/update-libcontainer-july3
...
Update libcontainer to be85764f109c3f0f62cd2a5c8be
2014-07-18 22:34:22 +03:00
ae37f2b88f
Merge pull request #7072 from SvenDowideit/remove-infrastructure-dir
...
this info is out of date and forgotten
2014-07-17 14:39:14 -04:00
f565862abc
archive/tar: update to fix writing of PAX headers
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-07-17 08:54:26 +03:00
ff08357c9b
Fix hack/make/ubuntu to install both docker.service and docker.socket
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-16 23:03:32 -06:00
ade6d780d6
this info is out of date and forgotten
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-07-17 12:04:52 +10:00
6ae07e2410
Tianon made a micro-image (sub one meg?) that we can use as a very fast to download 'yes, your docker can download and run an image' test
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-07-17 11:54:35 +10:00
9fc6058aa1
Update libcontainer to be85764f109c3f0f62cd2a5c8be
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-16 16:57:19 -07:00
781a47e3f3
Merge pull request #6885 from tianon/standard-curl-sSL
2014-07-14 18:39:31 -07:00
3b4a1c54d8
Update libcontainer dep to fb67bb80b4205bece36ff70
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-14 12:30:19 -07:00
1a99f36580
Add Tibor Vass as maintainer
...
* hack/
* archive/
* integration/
* server/buildfile.go
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-07-11 12:28:11 +00:00
e1166861d2
Update RELEASE-CHECKLIST with a few minor nits (periods, whitespace)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-08 19:53:08 -06:00
751c7e0f00
add hotfix help
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-08 23:25:26 +00:00
fbafa8038d
Merge pull request #6858 from timthelion/patch-6
...
We haven't required lxc and aufs for years now...
2014-07-08 09:37:53 +10:00
e7db0d4f44
Merge pull request #6829 from unclejack/update_archive_tar
...
update vendored archive/tar to lower the number of memory allocations
2014-07-07 23:35:19 +03:00
Doug Davis
Jessica Frazelle
Michael Crosby
Jessie Frazelle
Tianon Gravi
Alexandr Morozov
Tibor Vass
Michael Hudson-Doyle
Marc Tamsky
Amit Bakshi
Jérôme Petazzoni
Michael Crosby
Derek McGowan
Victor Vieux
Erik Hollensbe
Bruno Binet
unclejack
Tomasz Lipinski
unclejack
Michael Crosby
Solomon Hykes
James Turnbull
Timothy Hobbs
Stephen Crosby
Ken ICHIKAWA
Sven Dowideit
Victor Vieux
SvenDowideit
Victor Vieux