Andrea Luzzardi
d40ab6f123
Merge pull request #8299 from vieux/pr_7425
...
Add --security-opts options to allow user to customize container labels and apparmor profile
2014-09-30 17:53:11 -07:00
Aanand Prasad
ec5c864cc7
Merge pull request #460 from dnephin/fix_tests_for_docker_1.1
...
Fix test failures on docker 1.1.2
2014-09-30 17:52:38 -07:00
Sean Li
78c2fd09fe
Fixed bugs with image state syncing.
2014-09-30 17:14:34 -07:00
Sean Li
79ac85b025
Fixed bugs with image state syncing.
2014-09-30 17:14:34 -07:00
Aanand Prasad
cabe47a379
Merge pull request #505 from bfirsh/use-debian-wheezy-base-image
...
Compile against older version of GLIBC
2014-09-30 17:07:15 -07:00
Sean Li
0ea57733cd
Can now sync images.
2014-09-30 17:02:31 -07:00
Sean Li
0002395e7f
Can now sync images.
2014-09-30 17:02:31 -07:00
Ben Firshman
b4fbab4b56
Run pyinstaller build as normal user
...
... and test build on CI so we don't break it again!
Fixes #503
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-09-30 16:25:40 -07:00
Alexander Holbreich
6797a322b5
Changing to stable debian (wheezy).
...
Therefore it compiles agains more common version of GLIBC.
Now works out of the box on Debian wheezy, centos:centos6 and other stable
Of course it works on new distributions. Tested with:
debian:jessie and
ubuntu:14.04
Signed-off-by: Alexander Holbreich <alexander@holbreich.org >
Conflicts:
Dockerfile
2014-09-30 16:25:13 -07:00
Aanand Prasad
e04c5cb52c
Merge pull request #506 from bfirsh/make-test-script-use-docker
...
Make script/test use docker
2014-09-30 15:16:07 -07:00
Sean Li
85d247da20
Fixed app state syncing bugs.
2014-09-30 14:20:13 -07:00
Sean Li
61418d86a9
Fixed app state syncing bugs.
2014-09-30 14:20:13 -07:00
Ben Firshman
a3f70a9f64
Make script/test use Docker
...
Really easy to run entire test suite with Docker now. Also switch
Wercker to use the same script.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-09-30 13:51:42 -07:00
Ben Firshman
f407504679
Remove old Travis files
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-09-30 13:47:47 -07:00
Fred Lifton
42b377904b
Edits and fixes to Dockerfile Best Practices based on review feedback.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-09-30 13:30:14 -07:00
Sean Li
da0ca1b320
Container status sync'ed across app and docker host.
2014-09-30 13:12:16 -07:00
Sean Li
f69ddb1251
Container status sync'ed across app and docker host.
2014-09-30 13:12:16 -07:00
James Turnbull
5e69f4a188
Merge pull request #8291 from mieciu/master
...
Source the bash_completion after installation
2014-09-30 15:55:25 -04:00
James Turnbull
1d199f2d85
Merge pull request #8286 from ClusterHQ/8285-volume-api-docs
...
Document Volumes and Binds
2014-09-30 15:53:41 -04:00
Victor Vieux
08547dff29
update tests
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-09-30 19:10:03 +00:00
Michael Crosby
d4e5fa5728
Merge pull request #8092 from vishh/exec_api_docs
...
Exec remote API documentation
2014-09-30 11:50:23 -07:00
Vishnu Kannan
021ecb1d13
Adding exec remote API documentation along with minor code cleanup.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
2014-09-30 18:26:58 +00:00
Victor Vieux
226bc669aa
update docs
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-09-30 18:15:23 +00:00
Doug Davis
ee0b64f7a7
Add missing "tag" parameter to tag API
...
Closes #4877
Signed-off-by: Doug Davis <dug@us.ibm.com >
2014-09-30 10:53:29 -07:00
Alexandr Morozov
e32b54fe35
Merge pull request #8263 from jfrazelle/filter-status-name
...
Filter containers by status.
2014-09-30 10:40:02 -07:00
Davide Ceretti
17500eb188
Prettify docs-update.py
...
Remove commented code, use format for string concatenation, split long lines, fix how-to-run instructions
Signed-off-by: Davide Ceretti <dav.ceretti@gmail.com >
2014-09-30 17:00:15 +01:00
unclejack
1b6da6a6fe
Merge pull request #8309 from ArikaChen/master
...
Fix typo:betweem->between and PtySlace->PtySlave
2014-09-30 16:20:31 +03:00
ArikaChen
bfc9d8bbea
Fix typo:betweem->between and PtySlace->PtySlave
...
Signed-off-by: Arika Chen <eaglesora@gmail.com >
2014-09-30 07:22:09 -04:00
Rafe Colton
30d5a42c1f
Move archive package into pkg/archive
...
Now that the archive package does not depend on any docker-specific
packages, only those in pkg and vendor, it can be safely moved into pkg.
Signed-off-by: Rafe Colton <rafael.colton@gmail.com >
2014-09-29 23:23:36 -07:00
Rafe Colton
73f4bfed81
Move Matches() file path matching function into pkg/fileutils
...
This is the second of two steps to break the archive package's
dependence on utils so that archive may be moved into pkg. `Matches()`
is also a good candidate pkg in that it is small, concise, and not
specific to docker internals
Signed-off-by: Rafe Colton <rafael.colton@gmail.com >
2014-09-29 23:21:41 -07:00
Rafe Colton
b845a62149
Move Go() promise-like func from utils to pkg/promise
...
This is the first of two steps to break the archive package's dependence
on utils so that archive may be moved into pkg. Also, the `Go()`
function is small, concise, and not specific to the docker internals, so
it is a good candidate for pkg.
Signed-off-by: Rafe Colton <rafael.colton@gmail.com >
2014-09-29 23:16:27 -07:00
Jessica Frazelle
ea09f03682
Filter containers by status.
...
A continuation of #7616 .
Adds `docker ps --filter=status=(restarting|running|paused|stopped)` option.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-09-29 20:11:19 -07:00
Fred Lifton
8128339bc8
Merge pull request #8281 from dfarrell07/master
...
Doc update to clarify EXPOSE vs -p functionality.
2014-09-29 18:55:11 -07:00
James Turnbull
4b311e1bd2
Merge pull request #8280 from duglin/Issue3636
...
Add more info about when build cache is invalidated/used - Issue #3636
2014-09-29 21:52:42 -04:00
Daniel Farrell
5730abc167
Doc update to clarify EXPOSE vs -p functionality.
...
Signed-off-by: Daniel Farrell <dfarrell@redhat.com >
2014-09-29 20:59:12 -04:00
unclejack
35005595b9
Merge pull request #8296 from scollier/typo
...
Fixed simple typo
2014-09-30 03:48:48 +03:00
Victor Vieux
c2c5e57a8e
add apparmor:
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-09-30 00:43:47 +00:00
Tianon Gravi
07179a7eb1
Merge pull request #8293 from crosbymichael/update-libcontainer-sep8
...
Update libcontainer to c744f6470e37be5ce1f1ae09b842c15c1bee120d
2014-09-29 18:09:25 -06:00
Dan Walsh
87e732a0f3
Add --security-opts options to allow user to customize security configuration
...
security-opts will allow you to customise the security subsystem.
For example the labeling system like SELinux will run on a container.
--security-opt="label:user:USER" : Set the label user for the container
--security-opt="label:role:ROLE" : Set the label role for the container
--security-opt="label:type:TYPE" : Set the label type for the container
--security-opt="label:level:LEVEL" : Set the label level for the container
--security-opt="label:disabled" : Turn off label confinement for the container
Since we are passing a list of string options instead of a space separated
string of options, I will change function calls to use InitLabels instead of
GenLabels. Genlabels interface is Depracated.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-09-30 00:06:22 +00:00
Victor Vieux
595b5bf06e
Merge pull request #8295 from crosbymichael/type-exec-context
...
Strongly type exec driver context
2014-09-29 17:02:53 -07:00
Scott Collier
35aa3fd5f2
Fixed simple typo
...
Signed-off-by: Scott Collier <emailscottcollier@gmail.com >
2014-09-29 18:58:47 -05:00
Victor Vieux
999d4117f6
Merge pull request #8112 from dmcgowan/libtrust_key_management
...
Libtrust key management
2014-09-29 16:32:48 -07:00
Jessica Frazelle
6c60e8c784
Adding self to various maintainers files.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-09-29 15:43:07 -07:00
Michael Crosby
32dca1a7b0
Strongly type exec driver context
...
This also removes dead code in the native driver for a past feature that
was never fully implemented.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-09-29 22:40:26 +00:00
Victor Vieux
7c1aee6291
Merge pull request #8289 from duglin/FixTestcaseFor8230
...
Fixes the new testcase for PR #8230
2014-09-29 15:33:51 -07:00
Aanand Prasad
253b245a1c
Merge pull request #492 from dnephin/project_name_from_env
...
Support setting project name from the environment
2014-09-29 15:32:29 -07:00
Daniel Nephin
fac49b62b6
Support setting project name from the environment.
...
Signed-off-by: Daniel Nephin <dnephin@yelp.com >
2014-09-29 18:01:08 -04:00
Przemek Hejman
9f59e2223d
Source the bash_completion after installation
...
Signed-off-by: Przemek Hejman <przemyslaw.hejman@gmail.com >
2014-09-29 23:37:51 +02:00
Michael Crosby
532c29ef7d
Update native driver to set RootFs
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-09-29 21:35:25 +00:00
Fred Lifton
a7d61e0ffb
Merge pull request #8210 from dastergon/improve_gentoodoc
...
improve docs for Gentoo Linux installation
2014-09-29 14:35:21 -07:00