clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-04-28 19:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,209 Commits 9 Branches 112 Tags
docs
Commit Graph

772 Commits

Author SHA1 Message Date
Jessica Frazelle
55e9551aaa minor cosmetic change to client output on pull 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
(cherry picked from commit 8bd6322760)
 2015-08-11 11:35:27 -05:00
Alessandro Boch
ed672d1609 Vendoring libnetwork bd3eecc96f3c05a4acef1bedcf74397bc6850d22 
Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit e35a5ae463)
 2015-08-06 19:55:05 -07:00
Jessica Frazelle
5916664220 revert apparmor changes back to how it was in 1.7.1, but keep tests 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
(cherry picked from commit ed248207d7)
 2015-08-06 19:55:05 -07:00
Filipe Oliveira
85f7f7cfc7 Adding support to forked distributions in installer script. 
Signed-off-by: Filipe Oliveira <contato@fmoliveira.com.br>
(cherry picked from commit f618de1543)
 2015-08-06 08:35:41 -07:00
Eric Windisch
5851e2da60 Remove container AA profile from packaging 
Signed-off-by: Eric Windisch <eric@windisch.us>
(cherry picked from commit 0f4e5f7149)
 2015-08-03 17:49:58 -07:00
Alessandro Boch
fc7697b050 Fix preallocated bridge networks 
- Because of a bug, all the statically preallocated
  bridge networks have /24 as network mask.

Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit dab0447ae0)
 2015-08-03 17:21:31 -07:00
Tibor Vass
60cbf4da6c Vendor docker/distribution to 7dc8d4a26b689bd4892f2f2322dbce0b7119d686 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 0cce1fb37f)
 2015-08-03 09:43:19 -07:00
Derek McGowan
b3c3c4cddc Vendor latest notary 
Use updated notary to pick up updates from security review

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
(cherry picked from commit d594c6fcd8)
 2015-08-03 09:37:34 -07:00
Alessandro Boch
98855c863d Vendoring libnetwork 31139cdb513aea5ad1ed08b60d4350a68b4c96db 
Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit 91274625ba)
 2015-07-31 08:59:42 -07:00
Jessica Frazelle
b1f394a247 fix regression 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
(cherry picked from commit b0af811272)
 2015-07-30 17:21:22 -07:00
Avi Miller
a819a60a94 Fix for #14924. Seperates lsb_dist detection from dist_version detection 
so that the latter can be distro specific.

Signed-off-by: Avi Miller <avi.miller@oracle.com>
(cherry picked from commit 5c6446f335)
 2015-07-30 17:21:21 -07:00
David Calavera
ebf396c6e8 Log each release step. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
(cherry picked from commit 776600fabb)
 2015-07-30 09:07:15 -07:00
Antonio Murdaca
686fe02020 Fix install script to handle debian 8.1 apt repo string 
Fix #14911

Signed-off-by: Antonio Murdaca <runcom@linux.com>
(cherry picked from commit 98f15cae89)
 2015-07-29 10:46:26 -07:00
Jessica Frazelle
b537508f8c only write distributions file if dne 
Signed-off-by: Jessica Frazelle <princess@docker.com>
(cherry picked from commit 2eee192366)
 2015-07-28 17:48:56 -07:00
Avi Miller
37e886eb7b Fix typo. 
Signed-off-by: Avi Miller <avi.miller@oracle.com>
(cherry picked from commit 59e48b3468)
 2015-07-28 09:39:55 -07:00
Avi Miller
50f65742ef Switch to using only the RPM command to determine the distro version. 
Signed-off-by: Avi Miller <avi.miller@oracle.com>
(cherry picked from commit a43199f143)
 2015-07-28 09:39:50 -07:00
Aaron Lehmann
fa85dc0030 Update vendored distribution repo to new version 
This version includes a fix that avoids checking against specific HTTP
status codes. The previous behavior violated the registry API spec.

Fixes #14975

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit 091dbc1034)
 2015-07-28 09:35:26 -07:00
Jessica Frazelle
90991ddb9b fix deb packaging systemd files 
Signed-off-by: Jessica Frazelle <princess@docker.com>
(cherry picked from commit a2ea8f2ad8)
 2015-07-28 09:34:48 -07:00
Arnaud Porterie
5bdd4d0ec4 Merge pull request #14966 from mrjana/vendor18 
Vendoring libnetwork
 2015-07-24 17:58:23 -07:00
Jana Radhakrishnan
2ad81da856 Vendoring libnetwork 
Vendoring libnetwork commit f1c5671f1ee2133055144e566cd8b3a0ae4f0433

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-07-24 17:11:47 -07:00
Jessie Frazelle
e1dea0c485 Merge pull request #14920 from jfrazelle/release-script-updates-for-new-repo 
warn the script is depreciated
 2015-07-24 11:09:35 -07:00
Jessica Frazelle
ff271f5190 warn the script is depreciated 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-07-24 10:34:41 -07:00
Derek McGowan
f5a4a8da15 Vendor notary 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-07-24 01:31:50 -07:00
Tibor Vass
84e917b876 Merge pull request #14835 from aaronlehmann/registry-lint-cleanup 
Improve documentation and golint compliance of registry package
 2015-07-24 16:23:23 -04:00
Aaron Lehmann
4fcb9ac40c Improve documentation and golint compliance of registry package 
* Add godoc documentation where it was missing

* Change identifier names that don't match Go style, such as INDEX_NAME

* Rename RegistryInfo to PingResult, which more accurately describes
  what this structure is for. It also has the benefit of making the name
  not stutter if used outside the package.

Updates #14756

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2015-07-24 11:55:07 -07:00
Derek McGowan
82685367d8 Keep license files 
Currently the vendor script removes directories which do not have imported go packages, however this also ends up removing license files which may be other directories.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-07-23 16:12:21 -07:00
Alexander Morozov
c6f4c192fe Merge pull request #14545 from Djelibeybi/oraclelinux6-rpm 
Updated docker-engine.spec to build on Oracle Linux 6.
 2015-07-23 13:29:48 -07:00
Doug Davis
b874ef8f43 Do Docker edits so we can use the new distribution code 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-07-23 10:24:46 -07:00
Doug Davis
8b69552b50 Vendor latest distributions so we can use the new errcode stuff 
ping @stevvooe @RichardScothern

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-07-23 10:24:46 -07:00
Jessie Frazelle
e5d8fb9658 Merge pull request #14903 from jfrazelle/fix-experimental-rpm-debs 
pass DOCKER_EXPERIMENTAL into build images
 2015-07-23 10:05:00 -07:00
Jessica Frazelle
76d6751600 pass DOCKER_EXPERIMENTAL into build images 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-07-23 09:42:22 -07:00
Sebastiaan van Stijn
d44e334a6e Merge pull request #14893 from Evalle/14653-fix-sles-issue 
Fixing SLES12 issue
 2015-07-23 18:22:38 +02:00
Jessica Frazelle
8192a9ac6c fix fedora release 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-07-23 09:16:35 -07:00
evalle
94119c58a1 Fixing SLES12 issue 
Signed-off-by: evalle <shmarnev@gmail.com>
 2015-07-23 08:59:23 +02:00
Jessie Frazelle
5fdc102396 Merge pull request #14878 from icecrime/14756_golint_on_ci 
Enable validate-lint as part of CI
 2015-07-22 16:32:29 -07:00
Jessie Frazelle
f218192754 Merge pull request #14638 from jfrazelle/new-repo-install-script 
update install script/docs for new apt and yum repos
 2015-07-22 15:25:27 -07:00
Arnaud Porterie
bc8b8e03b4 Enable validate-lint as part of CI 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-07-22 15:23:34 -07:00
Alexander Morozov
3198e76b77 Merge pull request #14862 from vdemeester/validate-lint-all-files 
Update validate-lint to lint all go files
 2015-07-22 15:18:02 -07:00
Jessica Frazelle
451d3f5950 update install script for new repos 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-07-22 15:08:19 -07:00
Vincent Demeester
fa34f07ec0 Update validate-lint to lint all go files 
By default, using go with package will only validate the go file for the
current platform (or at last misses file_windows.go for example). This
tries to fix that.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-07-22 23:21:18 +02:00
Jessie Frazelle
a7d8450312 Merge pull request #14864 from ewindisch/apparmor-engine-policy 
Add AppArmor policy for the docker binary
 2015-07-22 13:56:33 -07:00
David Calavera
1639288b0a Merge pull request #14067 from vbatts/vbatts-tar-split 
graph: layer tar disassembly and reassembly
 2015-07-22 12:53:26 -07:00
Alexander Morozov
c328e0c827 Merge pull request #14628 from estesp/update-docker-py 
Update docker-py commit to current master (~1.3.1 release)
 2015-07-22 12:41:41 -07:00
David Calavera
1c6fe58efc Merge pull request #14442 from cpuguy83/refactor_logdrvier_reader 
Refactor log driver reader
 2015-07-22 11:54:35 -07:00
Eric Windisch
39dae54a3f Add AppArmor policy for the engine 
Wraps the engine itself with an AppArmor policy.

This restricts what may be done by applications
we call out to, such as 'xz'.

Significantly, this policy also restricts the policies
to which a container may be spawned into. By default,
users will be able to transition to an unconfined
policy or any policy prefaced with 'docker-'.

Local operators may add new local policies prefaced
with 'docker-' without needing to modify this policy.
Operators choosing to disable privileged containers
will need to modify this policy to remove access
to change_policy to unconfined.

Signed-off-by: Eric Windisch <eric@windisch.us>
 2015-07-22 14:20:50 -04:00
Phil Estes
65fb04228e Update docker-py to current master (~docker-py 1.3.1) 
The docker-py commit used in the standard `Dockerfile` is from Feb. 2015
and is out of date with the current API level and has fixes for things
like the new docker cli config location and registry v2 changes/API
responses as well.

Also pass "NOT_ON_HOST=true" to docker-py test suite so that tests
relying on direct HOST interaction (versus running in a container) are
skipped.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2015-07-22 13:17:59 -04:00
Arnaud Porterie
b7184f8574 Update linted package list 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-07-22 08:46:42 -07:00
Vincent Batts
7fb061832a vendor: adding tar-split dependency for graph 
tar-split is a facility to disassemble and reassemble tar archives

Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2015-07-22 11:36:10 -04:00
Tibor Vass
875fffdff8 Merge pull request #14851 from bfirsh/golint-integration-cli 
Golint integration-cli
 2015-07-22 11:28:19 -04:00
Ben Firshman
6b3c928140 Fix golint warnings for integration-cli 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-07-22 14:03:50 +01:00