beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
29604 commits 14 branches 412 tags 338 MiB
Commit graph

568 commits

Author SHA1 Message Date
Arnaud Porterie
a943c40150 Improve remote integration-cli tests 
Progress toward being able to run integration-cli campaign using a
client hitting a remote host.

Most of these fixes imply flagging tests that assume they are running on
the same host than the Daemon. Also fixes the `contrib/httpserver` image
that couldn't run because of a dynamically linked Go binary inside the
busybox image.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2016-02-11 07:31:49 -08:00
Brian Goff
fa860c86ff Merge pull request #20158 from cpuguy83/carry_19504 
Dockerfile,contrib,hack: remove buildpack-deps
 2016-02-09 14:58:37 -05:00
Brian Goff
7c9e9afeb7 use debian:jessie for ensure-syscall-test 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-02-09 13:13:38 -05:00
Jessica Frazelle
9bc771af9d
add validation for generating default secccomp profile 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2016-02-08 13:04:52 -08:00
Jessica Frazelle
26da52d4a5
get os arch for release script 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2016-02-08 10:57:04 -08:00
unclejack
49a45d80f2 Dockerfile,contrib,hack: remove buildpack-deps 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2016-02-04 20:22:34 +02:00
Paul Liljenberg
620b8250e8 improve test-deb-install 
This PR adds support for using the DOCKER_BUILD_PKGS env var to
better help defining what packege to build. It also adds support
for the integration-daemon so we can run it as a bundle.

Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com>

add directory test

Adds missing directory test. This helps verifying that
DOCKER_BUILD_PKGS is a directory and exists before continueing.

Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com>

fix indent

Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com>
 2016-02-04 18:14:08 +01:00
Jessica Frazelle
1cbd772629
fix opensuse rpm 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2016-02-03 10:34:17 -08:00
Jess Frazelle
c006c02611 Merge pull request #19735 from jfrazelle/add-repo-scripts 
add scripts to clean experimental rpms and debs
 2016-01-29 15:52:18 -08:00
Govinda Fichtner
7b31ed432e add support for building first ARM debian package 
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com>
 2016-01-29 00:21:17 +01:00
Jessica Frazelle
9ca8386c57
add scripts to clean experimental rpms and debs 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2016-01-27 15:54:53 -08:00
Brian Goff
9672afa339 Add DOCKER_BUILD_GOGC to tweak GOGC for compile 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-01-27 13:35:26 -05:00
Mike Dougherty
0410023367 Adjust version string processing for RPM build 
This will only trim off the last '-' separated token to be checked for
RC status. This allows including a 'cs#' token in the version string.

Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
 2016-01-26 11:49:59 -08:00
Jess Frazelle
b5420be597 Merge pull request #19013 from hqhq/add_support_docker_aarch64 
Add support for build and test docker on arm64
 2016-01-26 10:33:48 -08:00
Aleksa Sarai
4357ed4a73 *: purge dockerinit from source code 
dockerinit has been around for a very long time. It was originally used
as a way for us to do configuration for LXC containers once the
container had started. LXC is no longer supported, and /.dockerinit has
been dead code for quite a while. This removes all code and references
in code to dockerinit.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
 2016-01-26 23:47:02 +11:00
Jess Frazelle
21ec6d3789 Merge pull request #19146 from mikedougherty/cs-105-download-script 
Create a bundle for the install script to support other domains
 2016-01-22 09:25:24 -08:00
Mike Dougherty
51dad1185a Create a bundle for the install script to support other domains 
For the CS Engine we need to have an install script like OSS does, but
the locations are all different, as is the GPG key used. This is
accomplished here by slightly altering the script itself and adding a
simple 'sed' based bundle for make.sh.

This install script is used in to change the URLs instead of sed in
release.sh.

Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
 2016-01-21 20:42:20 -08:00
Tibor Vass
7d19ca7c40 Merge pull request #19423 from jfrazelle/apparmor-no-install 
disable install of docker-engine for 1.10, try to get ready for 1.11
 2016-01-21 12:08:50 -05:00
Jess Frazelle
5537a92e45 Merge pull request #19377 from jfrazelle/cleanup-build-rpm-deb 
Cleanup build rpm deb
 2016-01-20 23:58:33 -08:00
Jessica Frazelle
0bff2515f7
add a way to only build requested pkgs 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2016-01-19 17:47:27 -08:00
Jess Frazelle
637f49b5af Merge pull request #19196 from Microsoft/jjh/tp4ci 
Windows CI: Setup for testing against Windows
 2016-01-18 15:22:08 -08:00
Jessica Frazelle
c4bc9657b9
disable install of docker-engine for 1.10, try to get ready for 1.11 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2016-01-18 13:38:29 -08:00
Jess Frazelle
b69243e951 Merge pull request #19169 from Djelibeybi/fix-ol6-build 
Restoring the RPM build process for Oracle Linux 6
 2016-01-15 16:56:11 -08:00
Alexander Morozov
790e648c06 Merge pull request #19340 from Microsoft/jjh/rsrcfix 
Windows: Remove linkmode internal hack
 2016-01-15 14:10:56 -08:00
Qiang Huang
66d24c2b44 Add support for build and test docker on arm64 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-01-15 14:25:03 +00:00
Tianon Gravi
9b2aab3fc8 Switch "syscall-test" image from "debian:jessie" to "buildpack-deps:jessie" so that "gcc" is already included 
This results in a significant time savings during repeated builds (since we don't have to re-download gcc for every test run).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2016-01-14 13:51:30 -08:00
John Howard
6ca5a2c476 Windows: Remove linkmode internal hack 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-14 13:09:28 -08:00
Avi Miller
b916d45132 Remove the changelog auto-generation because its hardcoded in the .spec file now. 
Signed-off-by: Avi Miller <avi.miller@oracle.com>
 2016-01-14 18:50:55 +11:00
Avi Miller
22af8dfb14 Not having a changelog is bad RPM etiquette. 
Signed-off-by: Avi Miller <avi.miller@oracle.com>
 2016-01-14 10:34:48 +11:00
Tibor Vass
df40c61f8a Make Makefile work on OS X 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-01-11 18:16:56 -05:00
John Howard
a4b77dc1af Windows CI: Setup for testing against Windows 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-11 11:52:03 -08:00
Tibor Vass
2d5ca742eb Merge pull request #19076 from tianon/multiarch 
Refactor multi-arch support (especially for new mostly-official multi-arch official images)
 2016-01-11 13:25:55 -05:00
Arnaud Porterie
ad2966a315 Merge pull request #19138 from Microsoft/jjh/failedtodockerversion 
Windows CI: More debugging
 2016-01-10 18:11:19 -08:00
Lei Jitang
3ff6725613 Make .ensure-syscall-test to use build-arg 
.ensure-syscall-test need to build an image, we have
to add http_proxy and https_proxy to make it work.
Inseted of adding http_proxy and https_proxy env to the Dockerfile,
adding a DOCKER_BUILD_ARGS env to pass the build-arg is much more
elegant.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-01-08 15:27:21 +08:00
Avi Miller
c64f9407a4 Add missing ? to specfile variable. 
Signed-off-by: Avi Miller <avi.miller@oracle.com>
 2016-01-08 11:06:21 +11:00
Avi Miller
28f52bd06a Restoring the RPM build process for Oracle Linux 6 and updating the docker-engine.spec 
file to require the Unbreakable Enterprise Kernel Release 4 on both Oracle Linux 6
and Oracle Linux 7.

The UEK R4 provides the required kernel functionality for VxLAN support
required by Docker 1.9 and user namespace support required for 1.10+.

The build of Docker on Oracle Linux 6 requires some manipulation of the build
environment so that the CGO compiler uses the UEK R4 headers instead of the old
default kernel headers.

Signed-off-by: Avi Miller <avi.miller@oracle.com>
 2016-01-08 08:09:47 +11:00
Vincent Demeester
4c22c566e2 Add a validate-vendor script 
Makes sure that if ./hack/vendor.sh has been updated, it has been used
to update the vendor folder.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-01-07 19:57:50 +01:00
Tianon Gravi
91201678c6 Refactor multi-arch support (especially for new mostly-official multi-arch official images) 
See 99433d2ca2/README.md (architectures-other-than-amd64) for some context of where these images come from.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2016-01-06 14:34:29 -08:00
John Howard
676118670d Windows CI: More debugging 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-06 11:44:07 -08:00
John Howard
a3858873fa Windows CI: No integration daemon stop 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-05 10:52:59 -08:00
Vincent Demeester
0736598b93 Remove hello-world:latest tag before integration 
This is to make sure we are in the same state on linux/arm, linux/… and
other architecture.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-01-05 14:40:27 +01:00
Jessica Frazelle
327421d1df
add more seccomp profile tests 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-12-30 17:30:44 -08:00
Jessica Frazelle
626c933730
cleanup jess/unshare image 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-12-30 16:20:05 -08:00
Arnaud Porterie
3858027e27 Merge pull request #18933 from coolljt0725/always_build 
Add DOCKER_BUILD_ARGS env to pass build-arg for building deb and rpm
 2015-12-29 11:53:06 -08:00
Tianon Gravi
31bd242cba Merge pull request #18728 from hypriot/update-dockerfile-for-arm 
update Dockerfile.arm to reflect latest changes in main Dockerfile
 2015-12-29 09:24:29 -08:00
Lei Jitang
82051ab996 Add DOCKER_BUILD_ARGS env to pass build-arg for building deb and rpm 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-12-29 04:09:44 -05:00
Jessica Frazelle
15674c5fb7
add docs and unconfined to run a container without the default seccomp profile 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-12-28 10:26:51 -08:00
Jessica Frazelle
a48fe62384
add default seccomp profile tests 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-12-28 10:26:48 -08:00
Arnaud Porterie
3e298c5928 Rename -dirty to -unsupported 
Nightly and unofficial builds of Docker bear the suffix `-dirty` in the
version string. Change this suffix to `-unsupported` to make it explicit
that no support will be provided on such versions, and that it is for
example unnecessary to file an issue for it.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-12-24 09:11:49 -08:00
Sebastiaan van Stijn
325b1f35ae Remove Ubuntu 15.04 (Vivid) from DEB build as it will be EOL 
Ubuntu 15.04 (Vivid) will be EOL'd in January,
so we should remove it from our builds in the
Docker 1.10 release.

For information about the EOL data, see:
https://wiki.ubuntu.com/Releases

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-12-20 16:00:53 +01:00
Sebastiaan van Stijn
a08c955e30 Remove Fedora 21 from RPM build as it is EOL 
Fedora 21 is EOL'd as of December 1st, 2015.

Announcement:
https://lists.fedoraproject.org/pipermail/announce/2015-November/003296.html

Fedora 21 will reach end of life on 2015-12-01, and no further updates
will be pushed out after that time. Additionally, with the recent
release of Fedora 23, no new packages will be added to the Fedora 21
collection.

Please see https://fedoraproject.org/wiki/DNF_system_upgrade for more
information on upgrading from Fedora 21 to a newer release.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-12-20 00:42:17 +01:00
Stefan Scherer
94fb7458ea Move DOCKER_ENGINE_ envs to integration-daemon-setup to allow build w/o Makefile 
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
 2015-12-17 18:55:45 +01:00
Govinda Fichtner
43ee564326 update Dockerfile to reflect latest changes 
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com>
 2015-12-17 18:54:00 +01:00
Jess Frazelle
03e2923e42 Merge pull request #18570 from suihkulokki/control-fix 
hack/make/.build-deb/control: add missing fields
 2015-12-14 10:41:56 -08:00
Jess Frazelle
b13fd10109 Merge pull request #18372 from Microsoft/jjh/winci-ensurefrozen 
Windows CI Fix: No subshell due to bash 3.x
 2015-12-14 10:32:53 -08:00
Phil Estes
2ea48e9fc0 Merge pull request #18197 from nalind/workaround-go-libgcc 
Work around a linking problem on 32-bit arches
 2015-12-10 11:50:03 -05:00
Riku Voipio
8d2a423d87 control: add missing fields 
Without section/priority, reprepro will reject the packages. Add
sections following the Debian docker.io packages

Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
 2015-12-10 16:57:39 +02:00
Qiang Huang
bd00905614 Fix format issue 
Remove prefix and suffix spaces and tabs.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-12-10 15:18:16 +08:00
John Howard
e078adc93b Windows: No subshell due to bash 3.x 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-12-08 22:24:55 -08:00
David Calavera
dead67308c Merge pull request #18435 from cilium-team/changing-udev-rules-file-permissions 
Fixed 80-docker.rules file permissions to 644
 2015-12-08 16:28:54 -08:00
Christopher Jones
03fc212b6d Fixes for ppc64le and 390x frozen-images 
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2015-12-08 14:26:34 -05:00
André Martins
6eef5ab42d Fixed 80-docker.rules file permissions to 644 
Signed-off-by: André Martins <aanm90@gmail.com>
 2015-12-04 15:31:44 +00:00
John Howard
2097e7fcee Windows CI Fix: Timeout change 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-12-03 12:45:56 -08:00
Nalin Dahyabhai
800505729b Use -z,muldefs on arm,x86 
Assume that the linker can make sense of us passing in the -z,muldefs
option to tell it to ignore symbol-multiply-defined errors triggered by
https://github.com/golang/go/issues/9510.  We should be able to stop
doing this once we move to Go 1.6.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> (github: nalind)
 2015-12-02 10:30:13 -05:00
Phil Estes
da0c9286a9 Merge pull request #18315 from jfrazelle/change-frozen-image-v2 
update download-frozen-image.sh to v2 registry
 2015-12-01 17:12:00 -05:00
Jessica Frazelle
359d0c247f
update download-frozen-image.sh to v2 registry 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-12-01 13:16:42 -08:00
Jessica Frazelle
09d448f924
add licence to rpm 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-11-30 15:19:31 -08:00
Jessica Frazelle
4935f7f500
fix gopath when building debs 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-11-30 13:44:59 -08:00
Zhang Wei
a7b73e57bc Golint auto-generated file 
Fix auto-generation script to golint auto-generated files.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-11-30 16:34:07 +08:00
Antonio Murdaca
a1733c6575 hack: make: .go-autogen: add blank line after build tag 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2015-11-26 13:16:39 +01:00
Tianon Gravi
ae1fadeb96 Merge pull request #17714 from mikedougherty/cs-release-fixes 
Fixes for release scripts
 2015-11-23 19:47:10 -08:00
Mike Dougherty
a15b67b1af Fixes for release scripts: 
Add a flag to allow keeping bundles around (helps with CI)

Fix several problems in repo make targets

* quote DOCKER_EXPERIMENTAL variable
* pass-through arguments for gpg  provided to dpkg-sig are now quoted
  properly, so passphrases with shell-interpolated symbols can be used
* when determining deb suites, don't rely on 'origin' to be
  github.com/docker/docker

Fix some issues with deb repository creation from scratch

* Don't add empty components to the repository configuration as they
  will cause failure when generating.

Add old docker-engine-cs name to package conflicts

Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
 2015-11-23 17:15:54 -08:00
Michael Crosby
249b3a9479 Merge pull request #17459 from brahmaroutu/Power_Z_CI 
Build and test Docker on IBM Power and Z using gccgo. Enable CI on Po…
 2015-11-19 15:50:07 -08:00
Alexander Morozov
71f422435e Merge pull request #17999 from tianon/linkmode-external 
Remove "-linkmode external"
 2015-11-17 08:33:32 -08:00
Jess Frazelle
1c8d8b3012 Merge pull request #17803 from hypriot/17802-add-initial-support-for-docker-on-arm 
Add initial support for Docker on ARM
 2015-11-17 16:52:54 +01:00
Tianon Gravi
927e1e98b7 Remove "-linkmode external" 
We're having to override it in so many places that it no longer seems worthwhile to bother.  On top of that, the reason we did it in the first place was for being able to compile devicemapper statically, which still works after this change (either due to other changes in the way we build, or improvements in Go itself).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-11-15 14:47:48 -08:00
Govinda Fichtner
b74fd0628a Add initial support for Docker on ARM 
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com>
 2015-11-15 13:15:31 +01:00
Jessica Frazelle
38724c80ab
fix experimental boolean macro 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-11-14 14:47:13 -08:00
Srini Brahmaroutu
b1cc78b8f5 Build and test Docker on IBM Power and Z using gccgo. Enable CI on Power and Z. 
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-11-14 03:16:45 +00:00
Jessica Frazelle
6c818f3e5f
update for mac 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-11-13 13:20:54 -08:00
Jessica Frazelle
cf4c3da725
update debs/rpms for pkcs11 yubikey things 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-11-13 13:20:53 -08:00
Jessica Frazelle
141369457f
add buildtag pkcs11 to experimental 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-11-13 13:20:49 -08:00
David Calavera
58b270c338 Merge pull request #17431 from vdemeester/hope-it-does-not-broke-everything-again 
Another try at dockerversion placeholder for library import
 2015-11-09 13:15:50 -08:00
Vincent Demeester
8054a30387 dockerversion placeholder for library import 
- Add a *version* file placeholder.
- Update autogen and builds to use it and an autogen build flag

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-09 19:32:46 +01:00
Vincent Demeester
e2a9eede28 Merge pull request #17786 from Microsoft/10662-nativetestunit 
Windows: Native make test-unit
 2015-11-08 11:12:09 +01:00
John Howard
7268f767e6 Windows: Native make test-unit 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-11-07 08:23:10 -08:00
David Calavera
efc7b9bbf7 Merge pull request #17544 from Microsoft/jjh/nativewindowsbuild 
Windows: Native build without link errors
 2015-11-07 08:22:35 -08:00
John Howard
d92f7f42b2 Windows: Native daemon build 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-11-06 15:35:56 -08:00
John Howard
33faea576f Windows: Fix test-unit for local run 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-11-06 15:23:48 -08:00
Solomon Hykes
2519f46550 Merge pull request #17700 from calavera/remove_lxc 
Remove LXC support.
 2015-11-05 15:22:37 -08:00
David Calavera
157b66ad39 Remove exec-driver global daemon option. 
Each platform has only a driver now.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-11-05 17:09:58 -05:00
Jess Frazelle
31fa27d47e Merge pull request #17496 from chasebolt/centos-rpm-dep 
setting device-mapper-libs version dependency for centos 7 rpm
 2015-11-05 13:46:27 -08:00
Vincent Demeester
f267e4be54 Merge pull request #17697 from jfrazelle/test-old-apt-repo 
add script to test the old apt-repo
 2015-11-05 12:11:57 +01:00
Jessica Frazelle
3f27479435
add script to test the old apt-repo 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-11-04 16:01:19 -08:00
Srini Brahmaroutu
81b3d2eec9 after the changes to unit test framework, fixing gccgo to run unit tests 
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-11-03 17:57:06 +00:00
Vincent Demeester
4a54ab387f Add TESTDIRS back 
Makes it simpler to test only one package.
Was removed by #17491.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-02 19:44:09 +01:00
Chase Bolt
d8aaf96216 expand the list a bit more 
Signed-off-by: Chase Bolt <chase.bolt@gmail.com>
 2015-10-29 15:23:44 -07:00
Chase Bolt
787d94626f setting device-mapper-libs version dependency for centos 7 rpm 
Signed-off-by: Chase Bolt <chase.bolt@gmail.com>
 2015-10-29 11:11:19 -07:00
Alexander Morozov
1c23de0e64 Run unit tests as single command 
For me it increased speed of unit-tests tremendously, however this disabled
coverage profiles generation, which I think is pretty good tradeoff.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-10-29 09:39:51 -07:00
Tibor Vass
8db141049f docker-py: upgrade and fix test script 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-10-28 12:56:50 -04:00
Jessica Frazelle
9bcbb39fa8
update to binaries, fix parsers package, non-parallel test unit 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-27 14:43:25 -07:00
Sebastiaan van Stijn
9312a738d8 Merge pull request #17002 from jfrazelle/apparmor-check-version-on-deb-install 
apparmor check version on deb install
 2015-10-26 22:44:11 +01:00
Jess Frazelle
af6743a6c6 Merge pull request #17144 from thaJeztah/fix-16668-update-fish-completions-dest 
RPM change install location of Fish completions
 2015-10-21 14:36:50 -07:00
Jess Frazelle
08fb495975 Merge pull request #17145 from thaJeztah/deb-add-fish-completions 
deb: add fish completions
 2015-10-21 13:58:22 -07:00
Jessica Frazelle
14e85c8c55
add test script for built debs 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-19 16:15:27 -07:00
Jessica Frazelle
8369f00d30
add generate aa profile to deb install 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-19 16:15:25 -07:00
Jessica Frazelle
f549b1c9ea
fix copy of multiple rpms 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-19 16:14:06 -07:00
Sebastiaan van Stijn
6b1a643ac8 deb: add fish completions 
This adds the Fish completions to the .deb package.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-10-17 23:28:11 -07:00
Sebastiaan van Stijn
fb372e66bb RPM change install location of Fish completions 
External completions for fish should be installed
in /usr/local/share/fish/vendor_completions.d to
not conflict with built-in completions.

for reference, see:
https://github.com/fish-shell/fish-shell/issues/1485

fixes #16668

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-10-17 22:58:09 -07:00
Sebastiaan van Stijn
e3fabf3ea1 Merge pull request #16831 from jfrazelle/release-updates 
Release updates
 2015-10-16 16:57:10 -07:00
David Calavera
3668be932e Merge pull request #16574 from Djelibeybi/rpm-changelog 
Generate a full RPM changelog from the existing CHANGELOG.md file
 2015-10-16 14:55:39 -07:00
Jessica Frazelle
3057f0f0a7 update release-deb from the reprepro stuff we don't use 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-13 15:42:39 -07:00
Arnaud Porterie
ed9434c5bb Merge pull request #12648 from estesp/userns-impl 
Phase 1 implementation of user namespaces as a remapped container root
 2015-10-10 11:38:07 -07:00
Vincent Demeester
1ce9be346b Fix few comments in validate scripts 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-10-10 11:21:04 +02:00
Phil Estes
a85e6a4d4a Update integration test userns support with flag name change 
`--root` is now `--userns-remap`

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2015-10-09 20:52:45 -04:00
Jessica Frazelle
ea3afdad61 add test-integration-cli specifics for userns 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-09 20:50:27 -04:00
Jessica Frazelle
96559aaef2
add clean apt db to release script 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-08 09:21:20 -07:00
Jessica Frazelle
0aee0b1f9e
add script to generate index listing for the repo if say hosted on s3 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-08 09:21:16 -07:00
Vincent Demeester
0542939f40 Update test-and-docs with TESTDIRS 
… and fix the rendering of `make test-unit` with TESTDIRS :)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-10-04 21:19:04 +02:00
Jess Frazelle
80e31df3b6 Merge pull request #15916 from mikedougherty/release-flexibility 
Improve flexibility of release scripts
 2015-09-25 11:26:18 -07:00
Avi Miller
63e5891e4f Add documentation files including the LICENSE and CHANGELOG.md to the RPM 
Signed-off-by: Avi Miller <avi.miller@oracle.com>
 2015-09-25 17:44:11 +10:00
Avi Miller
1374ebcde0 Generate a full RPM changelog from the existing CHANGELOG.md file 
Signed-off-by: Avi Miller <avi.miller@oracle.com>
 2015-09-25 17:25:00 +10:00
David Calavera
b0dc11127e Merge pull request #16328 from jfrazelle/opensuse-rpms 
add opensuse to rpm builder
 2015-09-22 15:59:49 -07:00
WANG Chao
b51918fba1 Preserve /etc/sysconfig/docker across rpm update 
Otherwise we have to reconfigure every time docker rpm got update.

Signed-off-by: WANG Chao <wcwxyz@gmail.com>
 2015-09-17 12:12:28 +08:00
Jess Frazelle
74a8f2f668 Merge pull request #15861 from brahmaroutu/gccgo_x86 
Enable building Docker with gcc-go on x86
 2015-09-16 13:29:02 -07:00
Srini Brahmaroutu
2c53643b33 adding a Dockerfile.gccgo to use gccgo compiler instead of go compiler. 
temporarily disabling registry builds as crypto package is broken with gccgo.

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-09-16 18:56:01 +00:00
Jessica Frazelle
50d7fba775
Revert "Make daemon to start with no userlandproxy by default" 
This reverts commit bf2b8ec816.

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-09-16 09:56:38 -07:00
Jessica Frazelle
b0d4e9d1ba
add opensuse to rpm builder 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-09-15 16:18:19 -07:00
Nalin Dahyabhai
e611a189cb Add log reading to the journald log driver 
If a logdriver doesn't register a callback function to validate log
options, it won't be usable.  Fix the journald driver by adding a dummy
validator.

Teach the client and the daemon's "logs" logic that the server can also
supply "logs" data via the "journald" driver.  Update documentation and
tests that depend on error messages.

Add support for reading log data from the systemd journal to the
journald log driver.  The internal logic uses a goroutine to scan the
journal for matching entries after any specified cutoff time, formats
the messages from those entries as JSONLog messages, and stuffs the
results down a pipe whose reading end we hand back to the caller.

If we are missing any of the 'linux', 'cgo', or 'journald' build tags,
however, we don't implement a reader, so the 'logs' endpoint will still
return an error.

Make the necessary changes to the build setup to ensure that support for
reading container logs from the systemd journal is built.

Rename the Jmap member of the journald logdriver's struct to "vars" to
make it non-public, and to make it easier to tell that it's just there
to hold additional variable values that we want journald to record along
with log data that we're sending to it.

In the client, don't assume that we know which logdrivers the server
implements, and remove the check that looks at the server.  It's
redundant because the server already knows, and the check also makes
using older clients with newer servers (which may have new logdrivers in
them) unnecessarily hard.

When we try to "logs" and have to report that the container's logdriver
doesn't support reading, send the error message through the
might-be-a-multiplexer so that clients which are expecting multiplexed
data will be able to properly display the error, instead of tripping
over the data and printing a less helpful "Unrecognized input header"
error.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> (github: nalind)
 2015-09-11 16:50:03 -04:00
Jana Radhakrishnan
bf2b8ec816 Make daemon to start with no userlandproxy by default 
This PR makes a user visible behavior change with userland
proxy disabled by default and rely on hairpin NAT to be enabled
by default. This may not work in older (unsupported) kernels
where the user will be forced to enable userlandproxy if needed.

      - Updated the Docs
      - Changed the integration-cli to start with userlandproxy
	desiabled by default.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-09-11 11:58:35 -07:00
David Calavera
72f355e466 Merge pull request #16192 from anusha-ragunathan/dev 
Updated rpm spec to perform cleaner installs
 2015-09-09 15:26:36 -07:00
Anusha Ragunathan
1caa9a7d16 Updated rpm spec to perform cleaner installs 
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
 2015-09-09 17:13:57 -04:00
Jess Frazelle
0072896445 Merge pull request #16171 from vdemeester/lint-only-on-diff 
Golint only on changed files
 2015-09-09 10:19:16 -07:00
Jess Frazelle
3d8aae1308 Merge pull request #16149 from LK4D4/remove_link_libs 
Remove -lpthread and -ldl from ldflags
 2015-09-09 10:13:36 -07:00
Vincent Demeester
1cca5ee98c Golint only on changed files 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-09-09 09:37:47 +02:00
Alexander Morozov
8845eb4345 Remove -lpthread and -ldl from ldflags 
There is no need in those flags now when we use amalgamated sqlite3 from
mattn/go-sqlite3.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-09-08 17:01:14 -07:00
Vincent Demeester
0c70eb8381 Update validate-lint to find go files by itself 
… and fixes the last bits that were missing :3.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-09-08 22:07:42 +02:00
Jessie Frazelle
90477e8e94 Merge pull request #16066 from jfrazelle/remove-reprepro 
remove reprepro
 2015-09-03 18:20:01 -07:00
Tianon Gravi
b019229996 Merge pull request #16052 from jfrazelle/fix-release-selinux 
make docker-engine-selinux findable
 2015-09-03 17:52:39 -07:00
Jessica Frazelle
e7cf75c103 remove reprepro 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-09-03 17:31:49 -07:00
Vincent Demeester
3409de971c Lint pkg/term/windows package 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-09-03 22:25:52 +02:00
Jessica Frazelle
c7b3e7e770 make docker-engine-selinux findable 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-09-03 08:58:33 -07:00
Jessica Frazelle
12a71c8954 use apt-ftparchive and reprepro to enable apt-pinning; 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-09-02 09:32:24 -07:00
Mike Dougherty
7ca017eb62 Add ability to use a different GPG key identifier 
Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
 2015-08-31 11:27:57 -07:00
Jessica Frazelle
80c32162b5 we dont need the tty in the install script 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-31 08:12:01 -07:00
Jessica Frazelle
8fe675d799 add selinux-policy and docker-engine-selinux rpm 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-28 17:54:04 -07:00
Jessica Frazelle
df6d928370 update spec file to require docker-engine-selinux policy 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-28 17:43:30 -07:00
David Calavera
433956cc47 Merge pull request #15310 from MHBauer/demon-lint-squash 
golint fixes for daemon/ package
 2015-08-28 17:34:36 +02:00
Morgan Bauer
abd72d4008
golint fixes for daemon/ package 
- some method names were changed to have a 'Locking' suffix, as the
 downcased versions already existed, and the existing functions simply
 had locks around the already downcased version.
 - deleting unused functions
 - package comment
 - magic numbers replaced by golang constants
 - comments all over

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-08-27 22:07:42 -07:00
Vincent Demeester
0bd016b1c3 Finish linting opts and trust package. 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-08-27 17:36:11 +02:00
Jessie Frazelle
ecff4badcd Merge pull request #15125 from WeiZhang555/golint-stdcopy-system 
fix golint warnings/errors on pkg/system and pkg/stdcopy
 2015-08-21 14:27:59 -07:00
Srini Brahmaroutu
9e1a41aae5 daemon/graphdriver fix lint errors/warnings 
Addresses #14756

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-08-17 19:27:36 +00:00
Stefan J. Wernli
dfbb5520e3 Windows: Graph remove custom interface and add central store 
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>

Windows: add support for images stored in alternate location.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
 2015-08-14 23:45:53 -07:00
Jessie Frazelle
46d9fd6a11 Merge pull request #15367 from hqhq/hq_update_rpm_deb_desc 
Tiny fix for rpm and deb descriptions
 2015-08-13 15:04:50 -07:00
Zhang Wei
7e420ad850 fix golint warnings/errors on pkg/system and pkg/stdcopy 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-08-13 18:47:13 +08:00
Jessie Frazelle
e82358586d Merge pull request #15183 from jfrazelle/test-install-script 
add file to test install script
 2015-08-12 09:49:35 -07:00
Jessie Frazelle
13873e6841 Merge pull request #15377 from jfrazelle/do-not-keep-old-experimental-debs 
do not keep old debs for experimental
 2015-08-11 16:35:55 -07:00
Jessica Frazelle
83416f68de add file to test install script 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-11 16:31:58 -07:00
Jessica Frazelle
e62745922f make windows cross compile static daemon work 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-10 16:16:58 -07:00
Qiang Huang
ff97bc79cb Tiny fix for rpm and deb descriptions 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-08-10 09:34:10 +08:00
Brian Goff
764aa1a583 Merge pull request #15074 from coolljt0725/14756_enable_golint_2 
Enable golint in pkg/jsonlog and pkg/jsonmessage part of #14756
 2015-08-08 07:14:53 -04:00
Lei Jitang
5220f3b535 Enable golint in pkg/jsonlog and pkg/jsonmessage. 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-08-08 11:28:22 +08:00
Veres Lajos
5146232723 typofix - https://github.com/vlajos/misspell_fixer 
Signed-off-by: Veres Lajos <vlajos@gmail.com>
 2015-08-07 23:25:49 +01:00
Alexander Morozov
7ac357c795 Merge pull request #15416 from vdemeester/lint-remove-pkgsystemd 
Remove pkg/systemd from validate-lint
 2015-08-07 14:31:12 -07:00
Vincent Demeester
b8559991dc Remove pkg/systemd from validate-lint 
Following #15330, pkg/systemd doesn't exists anymore.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-08-07 22:26:45 +02:00
Srini Brahmaroutu
de3944219f daemon/graphdriver/overlay/ fix lint errors/warnings 
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-08-07 18:34:59 +00:00
David Calavera
0a0e9701f7 Merge pull request #14897 from WeiZhang555/golint-api-types 
fix golint warnings/errors on package api/types/
 2015-08-07 10:51:27 -07:00
David Calavera
b1009d1fdd Merge pull request #14828 from brahmaroutu/lint_graph_tags 
/graph/tag fix lint errors/warnings
 2015-08-07 10:49:26 -07:00
Zhang Wei
3d6617ffe7 fix golint warnings/errors on package api/types/ 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-08-07 09:43:43 +08:00
Jessica Frazelle
203776a40c fix rpm signing so it does not open a tty w question 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-06 16:18:40 -07:00
Jessica Frazelle
aadb3407d3 to not keep old debs for experimental 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-06 14:49:05 -07:00
Jessica Frazelle
ed248207d7 revert apparmor changes back to how it was in 1.7.1, but keep tests 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-06 12:49:25 -07:00
Qiang Huang
b8a8ac9b58 Use docker daemon for intergation test daemon start 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-08-06 16:20:57 +08:00
Tibor Vass
8534090476 Merge pull request #15252 from coolljt0725/14765_enable_golint_3 
Enable golint in pkg/archive
 2015-08-05 19:27:48 -04:00
Srini Brahmaroutu
d9b261221a /graph/tag fix lint errors/warnings 
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-08-05 17:46:41 +00:00
Arnaud Porterie
2c3cd949c8 Merge pull request #15269 from brahmaroutu/lint_daemon_graphdriver_zfs 
daemon/graphdriver/zfs fix lint errrors/warnings
 2015-08-04 18:41:02 -07:00
Jessica Frazelle
efd47654dd only sign the files that were changed in the last 2 hours 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-04 13:16:57 -07:00
Antonio Murdaca
23dab01ed2 Merge pull request #14840 from HuKeping/golint-pkg-sysinfo 
Fix golint warning on pkg/sysinfo
 2015-08-04 20:57:39 +02:00
Srini Brahmaroutu
e27c904b99 daemon/graphdriver/zfs fix lint errrors/warnings 
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-08-04 18:30:55 +00:00
Lei Jitang
ba332b7d12 Enable golint in pkg/arcive 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-08-04 09:52:54 +08:00
David Calavera
408cffac94 Include apparmor/docker only when it exists. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-08-03 17:34:04 -07:00
Arnaud Porterie
ff3adb135d Merge pull request #15114 from hqhq/hq_exedriver_win_lint 
Fix golint warnings for daemon/execdriver/windows
 2015-08-03 16:28:47 -07:00
Srini Brahmaroutu
3e7f9c636a daemon/graphdriver/vfs fix lint errors/warnings 
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-08-03 17:46:42 +00:00
Brian Goff
dce1488ae5 Merge pull request #15013 from coolljt0725/14756_enbale_golint_1 
Enable golint, part of #14756
 2015-08-02 22:14:18 -04:00
Qiang Huang
f9b5eb0cac Fix golint warnings for daemon/execdriver/windows 
Addresses: #14756

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-08-03 09:54:02 +08:00
Lei Jitang
27a8f9937e Enable golint part of #14756 
pkg/broadcastwriter
pkg/graphdb
pkg/httputils
pkg/ioutils

Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-08-03 09:45:05 +08:00
Hu Keping
7390cc5300 Fix golint warning on pkg/sysinfo 
Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-08-01 18:24:49 +08:00
Tibor Vass
b48d744b07 Merge pull request #15175 from MHBauer/cliconfig-lint 
additional lint fix and enable linter for cliconfig package
 2015-07-30 23:07:19 -04:00
Morgan Bauer
e809919e26
lint fix and enable linter for cliconfig package 
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-07-30 14:37:37 -07:00
Tibor Vass
2f1a7c903f Merge pull request #14844 from WeiZhang555/golint-api 
fix golint errors/warnings of pkg api/
 2015-07-30 16:02:06 -04:00
root
cfeab585c0 fix golint errors/warnings of pkg api/ 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-07-30 09:46:25 +08:00
Qiang Huang
e34f562a77 Add back golint for daemon/execdriver/native 
It's broken by #15099 Fix it.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-07-30 08:58:54 +08:00
Jessie Frazelle
2ae174e491 Merge pull request #15138 from ewindisch/apparmor-fix-test-plus-unconfined 
Fix the proc integration test & include missing AA profile
 2015-07-29 15:32:13 -07:00
Tibor Vass
6a274e48dc Merge pull request #14843 from MHBauer/demonlogger-lint 
golint fixes for daemon/logger/*
 2015-07-29 18:09:46 -04:00
Eric Windisch
0f4e5f7149 Remove container AA profile from packaging 
Signed-off-by: Eric Windisch <eric@windisch.us>
 2015-07-29 17:47:38 -04:00
Srini Brahmaroutu
1d6e443119 /graph fix lin errors/warnings 
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-07-29 20:59:36 +00:00
Morgan Bauer
ccbe539e86
golint fixes for daemon/logger/* 
- downcase and privatize exported variables that were unused
 - make accurate an error message
 - added package comments
 - remove unused var ReadLogsNotSupported
 - enable linter
 - some spelling corrections

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-07-29 13:09:39 -07:00
root
929f2c2f40 api/client fix golint errors/warnings 
Addresses #14756

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-07-29 17:20:54 +00:00
Tibor Vass
dfcdde4d98 Merge pull request #14930 from brahmaroutu/lint_daemon_graphdriver_devmapper 
daemon/graphdriver/devmapper/ fix lint errors/warnings
 2015-07-29 13:29:57 -04:00
Tibor Vass
2cd058ce4f Merge pull request #14785 from brahmaroutu/lint_api_server 
fix golint errors/warnings
 2015-07-29 13:09:31 -04:00