1962352375
Merge pull request #4646 from tianon/double-dash
...
Update to double-dash everywhere
Upstream-commit: 212a870734b5be597579e59bfb8758c3b3198144
Component: engine
2014-03-13 15:31:14 -07:00
47228d6a8c
add a breakathon for testing
...
Docker-DCO-1.1-Signed-off-by: Charlie Lewis <charliel@lab41.org > (github: cglewis)
Upstream-commit: 6fc83eefd9e8d78044a51250d2ad185513fddd27
Component: engine
2014-03-13 12:39:24 -07:00
c48adc6929
Update to double-dash everywhere
...
These were found using `git grep -nE '[^-a-zA-Z0-9<>]-[a-zA-Z0-9]{2}'` (fair warning: _many_ false positives there).
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 44fe8cbbd174b5d85d4a063ed270f6b9d2279b70
Component: engine
2014-03-13 11:46:02 -06:00
c3a135a2b6
Exclude more "definitely not unit tested Go source code" directories from hack/make/test
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 99b6364790e59a70d57949792fa31014637c93ee
Component: engine
2014-03-12 01:18:12 -06:00
6f72a528dc
Clean up the "go test" output from "make test" to be much more readable/scannable
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: e1c48fa56007e1db028f7f83bfbf79c3d05feccd
Component: engine
2014-03-12 01:17:38 -06:00
b4ecbb8459
Merge pull request #4521 from tianon/release-checklist-origin
...
Note within the RELEASE-CHECKLIST that "origin" is assumed to be upstream
Upstream-commit: 7b79f597f6b8e4985f78e5a6b78e5d6d1e6779dc
Component: engine
2014-03-11 14:34:47 -06:00
12154734b4
Merge pull request #4520 from tianon/clarify-docs-branch-update
...
Clarify how to update the docs branch in the RELEASE-CHECKLIST with concrete instructions
Upstream-commit: ce091717809d05a00b37c2fe8a20dff0f2d9a5ad
Component: engine
2014-03-10 18:47:31 -06:00
8dec75ff8f
Update vendor.sh with new kr/pty revision
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: 3c25302a0b9fae2c3fff9262b2ae9fa5f6f04db7
Component: engine
2014-03-10 15:34:38 -07:00
a185dfcddd
Fix a few packaging bugs, including and especially a temporary patch to our upstart script to mount cgroups properly
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 50082f792be22b97dcc79afe666289ecefbc3864
Component: engine
2014-03-10 03:27:46 -06:00
cb49f77b2a
Note within the RELEASE-CHECKLIST that "origin" is assumed to be upstream
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 661cf32e4f996385ec7791e93ea8edea80fd2e37
Component: engine
2014-03-06 23:29:08 -07:00
cddbaa4e89
Clarify how to update the docs branch in the RELEASE-CHECKLIST with concrete instructions
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 0a819380c52cbfcc9d674475913267a33b249e00
Component: engine
2014-03-06 23:16:26 -07:00
fa19c6a895
Add new "DOCKER_CLIENTONLY" build variable to allow skipping of the dockerinit compilation, especially for Homebrew / Mac OS X client-only compilation
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: a40bb2aabc1c0aba8b4de82dc353fae322b8831d
Component: engine
2014-03-06 21:22:25 -07:00
2e92b6ef1e
Fix dynbinary so that dockerinit can still be properly static even if it has to link against libapparmor for Ubuntu
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: be344cf0d8e4f9881724f49398603a6e3109bc89
Component: engine
2014-03-06 19:55:22 -07:00
24c5efffe2
Update build tags such that we can properly compile on all platforms (especially for packagers), and updated hack/PACKAGERS.md to mention the DOCKER_BUILDTAGS variable that will need to be set for binaries that might be used on AppArmor (such as Debian and especially Ubuntu)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 0b23393ba1901df3d08916fa977707db58699eca
Component: engine
2014-03-06 13:39:17 -07:00
2ebfedab6d
Add buildflags to allow crosscompilation for apparmor
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: c89fa6645ef87e1863ef5812bd42176f5bd987ca
Component: engine
2014-03-06 12:05:03 -08:00
2eb4a2724e
Merge pull request #4129 from proppy/patch-2
...
hack/RELEASE: add step for updating doc branch
Upstream-commit: fb314c266b188de8aa0499c5314b01fd5d088475
Component: engine
2014-03-05 16:08:37 -08:00
18fac79f25
Add further clarification of where/when the build-time deps are applicable
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: c41e51ce3df05553b7a4ce6960df68973a4e17ee
Component: engine
2014-03-05 08:20:42 -07:00
10b41687cf
Add "git" to our Ubuntu package "Recommends" (whoops, this should've been in here for a while now)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 5317ad476d9e2c39cf6379fef4ec7f8ba0bcc23a
Component: engine
2014-03-04 22:59:46 -07:00
200f519512
Update package deps to remove LXC and move aufs-tools to be in "Recommends" instead of strict Depends
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: b69f63283088e1ac744aafeb08189cb593b30787
Component: engine
2014-03-04 22:52:39 -07:00
172cbdf737
Rewrite more loads of PACKAGERS.md to hopefully remove some outdated information, add some updated information and pointers, and generally make the tone of this document less condescending :)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 615667b8831e49474ad7d255d62343c2427514ec
Component: engine
2014-03-04 22:51:34 -07:00
812f45a7e0
Mention in PACKAGERS.md that Tianon is available for packager needs
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: d9ec3a034719ac933a791bdf064afe8afb63b1f9
Component: engine
2014-03-04 21:41:59 -07:00
b7c44f214d
Reflow PACKAGERS.md to 80 columns (where possible) and update some minor formatting
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 9a677e6a68c9a07df8591d87ba82d77934600426
Component: engine
2014-03-04 21:40:42 -07:00
858eed23c2
Update PACKAGERS.md with some text changes, including and especially moving "LXC" to a new "Optional Dependencies" section
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: a7f265223aec54a53c938f119275cb5fcebca4b6
Component: engine
2014-03-04 21:25:00 -07:00
69c5fbdfef
Added documentation (and some cleanup) around small patch exemptions
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: b187d7ae41a1f946d536b42108ec082541883d26
Component: engine
2014-03-02 11:43:18 -05:00
5e82277ab6
add --line-buffered
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 24ff3a3dc30e455674d28f552a0efb6108a411db
Component: engine
2014-02-24 21:59:01 +00:00
56684e6d5f
Add simple "grep" to hide the harmless "warning: no packages being tested depend on ..." in "go test -coverpkg ..." output
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 41b1f93bf72e4c012a159a013697090efdcc183b
Component: engine
2014-02-21 11:26:04 -07:00
3337013302
Package coverage when running integration tests
...
If coverpkg is missing on `go test` command, only the current package
will be covered. That's the case of unit tests. For integration tests
we need to explicitly declare each package.
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: fabiofalci)
Upstream-commit: b3d5e9527a050a0c7252f0125a8a26a6fc5175f1
Component: engine
2014-02-19 16:59:51 +00:00
883b90f698
Merge pull request #4205 from tianon/fix-dyntest
...
Fix dyntest problems finding dockerinit
Upstream-commit: 277262d9c7ff802092f8cef7172462e4ddd4da02
Component: engine
2014-02-18 11:50:16 -07:00
27672a2f55
Add "Conflicts" to our lxc-docker package to make it more clear that we can't/shouldn't be installed alongside either "docker" or "docker.io"
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 6d1c0a91f89887bd0d73b161b1ffe8b9cc10365e
Component: engine
2014-02-18 11:24:33 -07:00
b0d22755b4
Fix dyntest problems finding dockerinit
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 6ccb30a0e5d1146dddaec340643d3950e6f992ef
Component: engine
2014-02-18 11:23:37 -07:00
c4d3310b03
Merge pull request #4131 from tianon/vendor-golang-xattrs
...
Add vendored archive/tar that includes xattrs patch
Upstream-commit: f3ff19049138afebe4e28e30be2ee60364204f50
Component: engine
2014-02-17 21:12:28 +02:00
d96c323380
docker-ci 0.5.6: Fully dockerize docker-ci. Add build test coverage. Add backup builder.
...
Docker-DCO-1.1-Signed-off-by: Daniel Mizyrycki <daniel@docker.com > (github: mzdaniel)
Upstream-commit: b7db2d5f8022e24faff80d312977c49a4c0408f3
Component: engine
2014-02-17 10:52:39 -08:00
fc1f23f527
Add vendored archive/tar that includes xattrs patch
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: b762d3a7391dd526826a0a1f1c983ea5e54852f5
Component: engine
2014-02-17 08:20:21 -07:00
4415a05272
hack/RELEASE: add step for updating doc branch
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: google)
Upstream-commit: da3a52746b3ec43049dc3a8ca58b44d0188f043e
Component: engine
2014-02-13 12:01:55 -08:00
173cbcacdb
Add shasum fallback to hack/make/dynbinary for Darwin (where sha1sum is not available)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: c7840f522c37d2c964e442c5acac745f702b8801
Component: engine
2014-02-13 10:27:45 -07:00
1e6f0f8de2
Merge pull request #4043 from tianon/hack-git-detection-and-use
...
Add better ".git" detection and use
Upstream-commit: f794fbc2306e633916b7f000d441d234e198fc24
Component: engine
2014-02-13 09:56:14 -07:00
2b6a0d82a2
Fix the one spot I missed dockerversion
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 7ea725fdc530e989516fae60f5dafecb139d75b8
Component: engine
2014-02-11 18:23:17 -07:00
9ed97b673b
Move even more stuff into dockerversion
...
Also, use it in all the places. :)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: da04f49b383c02ee28c32f948048b9e9a402bb4f
Component: engine
2014-02-11 17:26:54 -07:00
ef486c6630
Move docker version introspection to a sub-package.
...
This facilitates the refactoring of commands.go.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: ae3c7dec3b075a263da8d1e1cc510275b281e799
Component: engine
2014-02-11 16:10:51 -08:00
f694361fe5
Add better ".git" detection and use
...
This way, packagers can set GIT_DIR appropriately if they'd prefer to not have ".git" inside their working directory.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 0a0406450fb83f4ff7d08235cd3e94ea8fba752f
Component: engine
2014-02-10 13:48:43 -07:00
aa80369d9a
Add slightly better GOPATH detection/handling
...
This also adds a new "AUTO_GOPATH" environment variable that will create an appropriate GOPATH as part of the build process.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: d3d85d38fb5bdd0327fdc9fe8b637cb0f4e1dcf2
Component: engine
2014-02-09 18:21:01 -07:00
20c26b1bdf
docker-ci: Add new docker coverage report
...
Docker-DCO-1.1-Signed-off-by: Daniel Mizyrycki <daniel@docker.com > (github: mzdaniel)
Upstream-commit: 25d87553f678e247b3036db7804599624191dfd1
Component: engine
2014-02-06 11:59:29 -08:00
8fbcfcf011
Update RELEASE-CHECKLIST to mention how to get a decent contributors list
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: bac7e741bfd1d77ebb742bc1ed3fec6c6f300be3
Component: engine
2014-02-04 13:34:24 -07:00
b5a2f94fbf
i was reading, and it sprang out at me :)
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: df4682907ddc41084bf193b863ff9da796b8e102
Component: engine
2014-02-04 15:32:19 +10:00
67cb10e065
Merge pull request #3892 from tianon/remove-btrfs-header-reference
...
Remove reference to <linux/btrfs.h>, and instead use <btrfs/ioctl.h> like we're supposed to (from btrfs-progs)
Upstream-commit: fb796900fbcd11ae63e918f91b226463619bb152
Component: engine
2014-02-03 09:41:11 -08:00
f2667b61da
Update PACKAGERS.md to explicitly talk about stripping, quoting Dave Cheney from Golang upstream (who is very, very adamant about not stripping Golang compiled binaries)
...
While there, remove the now-outdated section about `CGO_ENABLED=0`
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 7ffd2b0785529b0b71bec90c8468dc3cb4b37525
Component: engine
2014-02-02 22:47:42 -07:00
6732035ba0
Remove reference to <linux/btrfs.h>, and instead use <btrfs/ioctl.h> like we're supposed to (from btrfs-progs)
...
This fixes compilation issues when btrfs.h isn't available (because we just need the relevant structs, which for userspace programs are supposed to come from btrfs-progs instead of the kernel headers).
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 6922f1be08111d889b0585b763b08f92d7a55e05
Component: engine
2014-02-01 23:23:33 -07:00
df82456ed9
Merge pull request #3857 from creack/remove_darwin_files
...
Remove all darwin specific files and use more generic _unsupported with build tags.
Upstream-commit: 523341d994265b9f72e4869f0fd094fd15f1b480
Component: engine
2014-01-31 11:48:10 -08:00
e8f6d5eb59
Update/fix build tags, Dockerfile, and release.sh for proper building and releasing of linux/386 and linux/arm cross-compiled client binaries
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 065dd231dd7d7858df982a8decfade9df936cf63
Component: engine
2014-01-31 03:16:42 -07:00
05ceb6e730
Merge pull request #3822 from tianon/install-your-user
...
Make get.docker.io install directions slightly better by telling user exactly how to add themselves to the "docker" group
Upstream-commit: b4604ae7cf84bb45c7ba604c4ac875a29722287e
Component: engine
2014-01-31 00:56:30 -08:00
