clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-30 18:10:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,887 Commits 9 Branches 112 Tags
8c2cbfa0963e953cf75fe09ec688a6125689cc6d
Commit Graph
6887 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Rothfusz 8c2cbfa096 Add parent reference arrow. 
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
 2014-03-14 14:48:13 -07:00
Andy Rothfusz 50b12708e3 Updating base svg to remove references to aufs and lxc. 
Exported new png's from layers.
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
 2014-03-14 14:37:09 -07:00
unclejack 2c10fcc432 Merge pull request #4593 from crosbymichael/move-server 
Move server and buildfile into server pkg
 2014-03-14 22:51:50 +02:00
Michael Crosby 8cf0b80a78 Update integration tests for server pkg 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-14 09:46:56 -07:00
Michael Crosby 5239aa1f11 Move server and buildfile into server pkg 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-14 09:37:08 -07:00
unclejack 5c6d54073f Merge pull request #4660 from vieux/parsecommand 
create the cli obj before calling parseCommand
 2014-03-14 17:36:40 +02:00
unclejack 28a9ff7f25 Merge pull request #4653 from creack/fix_expose_cache 
Fix expose cache
 2014-03-14 16:09:13 +02:00
James Turnbull e1c54f6cb9 Merge pull request #4664 from tianon/fix-sphinx-warnings 
Fix sphinx warnings
 2014-03-14 09:21:44 -04:00
Tianon Gravi ae47f709ca Make sphinx warnings fatal in Travis 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-03-13 22:35:31 -06:00
Tianon Gravi f6efcf2094 Fix sphinx header underline warnings I introduced... 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-03-13 22:35:09 -06:00
Victor Vieux c349c9d14a create the cli obj before calling parseCommand 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-03-14 00:47:13 +00:00
Victor Vieux 9c21a73f74 Merge pull request #4659 from creack/more_info 
Have the exec driver and kernel version in non-debug mode in `docker info`
 2014-03-13 17:32:42 -07:00
Victor Vieux 400ae98d23 Merge pull request #4633 from crosbymichael/no-pid-kill 
Don't kill by pid for other drivers
 2014-03-13 17:31:37 -07:00
Guillaume J. Charmes 7b89af2a08 Add unit test for expose cache 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
 2014-03-13 17:06:17 -07:00
Guillaume J. Charmes 6411ee6d24 Have the exec driver and kernel version in non-debug mode in docker info 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
 2014-03-13 16:28:16 -07:00
Michael Crosby c0cef47b1e Merge pull request #4658 from vieux/fix_display_build 
fix build output
 2014-03-13 15:34:17 -07:00
Victor Vieux 212a870734 Merge pull request #4646 from tianon/double-dash 
Update to double-dash everywhere
 2014-03-13 15:31:14 -07:00
Victor Vieux 03f0ec35ae as you could have multiple messages per line with streams, don't \r 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-03-13 22:26:42 +00:00
Guillaume J. Charmes f88f232f53 Merge pull request #4657 from crosbymichael/update-libcontainer-docs 
Update libcontainer readme and todo list
 2014-03-13 15:19:29 -07:00
Michael Crosby cbd2a30cd6 Update libcontainer readme and todo list 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-13 15:18:08 -07:00
Michael Crosby 3fa99b35b0 Don't kill by pid for other drivers 
Closes #4575
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-13 15:04:23 -07:00
Michael Crosby 28994f86ee Merge pull request #4656 from crosbymichael/fix-ptmx-link 
Always symlink /dev/ptmx for libcontainer
 2014-03-13 14:57:17 -07:00
Guillaume J. Charmes c7ea6e5da8 Merge pull request #4422 from alexlarsson/internal-mounts 
Move all bind-mounts in the container inside the namespace
 2014-03-13 14:55:29 -07:00
Michael Crosby 747275d30c Always symlink /dev/ptmx for libcontainer 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-13 14:31:09 -07:00
Victor Vieux 192917a1cb Merge pull request #4624 from creack/fix_apparmor_init 
Fix issue when /etc/apparmor.d does not exists
 2014-03-13 14:04:13 -07:00
Guillaume J. Charmes ab26c16b32 Fix EXPOSE cache miss issue 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
 2014-03-13 13:58:09 -07:00
Tianon Gravi af58923847 Merge pull request #4649 from cglewis/release_add_breakathon 
Add a "breakathon" for a testing/QA period to the release checklist
 2014-03-13 13:43:37 -06:00
Charlie Lewis 6fc83eefd9 add a breakathon for testing 
Docker-DCO-1.1-Signed-off-by: Charlie Lewis <charliel@lab41.org> (github: cglewis)
 2014-03-13 12:39:24 -07:00
Michael Crosby 89d2e14ed0 Merge pull request #4648 from creack/fix_raw_mode_darwin 
Use BSD raw mode on darwin. Fixes nano, tmux and others
 2014-03-13 12:15:50 -07:00
Alexander Larsson bf1b27dfcc Don't use separate bind mount for container 
Since we're not not mounting anything but the base filesystem outside
the container we no longer need the separate bind mount at
/var/lib/docker/container/$id/root in order to see the base filesystem
without extra mounts. So, we drop this and mount (again) the container
root directly at the real basefs mountpoint.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-03-13 20:08:29 +01:00
Alexander Larsson 6c266c4b42 Move all bind-mounts in the container inside the namespace 
This moves the bind mounts like /.dockerinit, /etc/hostname, volumes,
etc into the container namespace, by setting them up using lxc.

This is useful to avoid littering the global namespace with a lot of
mounts that are internal to each container and are not generally
needed on the outside. In particular, it seems that having a lot of
mounts is problematic wrt scaling to a lot of containers on systems
where the root filesystem is mounted --rshared.

Note that the "private" option is only supported by the native driver, as
lxc doesn't support setting this. This is not a huge problem, but it does
mean that some mounts are unnecessarily shared inside the container if you're
using the lxc driver.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-03-13 20:01:29 +01:00
Alexander Larsson 636959e20a Move .dockerenv parsing to lxc driver 
This is not needed for e.g. the native driver

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-03-13 20:01:29 +01:00
Guillaume J. Charmes 029aac9639 Use BSD raw mode on darwin. Fixes nano, tmux and others 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
 2014-03-13 11:11:02 -07:00
Victor Vieux 6ac6619a1e Merge pull request #4387 from unclejack/multiple_metadata_retrieval_attempts 
retry to retrieve layer metadata on failure during pull
 2014-03-13 11:03:52 -07:00
Tianon Gravi 44fe8cbbd1 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)
 2014-03-13 11:46:02 -06:00
Sven Dowideit 51a46e6a4f Merge pull request #4638 from ichik1/cli-doc-minor-fix 
Some minor fixes for cli docs
 2014-03-13 20:11:10 +10:00
James Turnbull 0e871edfeb Merge pull request #4636 from phillipalexander/fix-license 
Fix boilerplate text in Apache license
 2014-03-13 02:42:56 -04:00
Phillip Alexander 73596b00e0 Fix boilerplate text in Apache license 
This commit updates the Apache license boilerplate with actual information. The Apache license appendix (designed to be removed before publication) states:

```
APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!)...
```

Additionally, the copyright year was not included. Copyright notices must reflect the current year. This commit updates the listed year to 2014.

see: http://www.copyright.gov/circs/circ01.pdf for more info

Docker-DCO-1.1-Signed-off-by: Phillip Alexander <git@phillipalexander.io> (github: phillipalexander)
 2014-03-12 23:39:36 -07:00
Ken ICHIKAWA 841fcad0ba Add missing options -t and -v to images subcommand doc 
Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com> (github: ichik1)
 2014-03-13 15:19:42 +09:00
Ken ICHIKAWA 471aa870f5 Remove duplicated description of --mtu 
commit baa70e9751 duplicates
the description of --mtu.
This patch removes the duplicated description.

Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com> (github: ichik1)
 2014-03-13 14:18:13 +09:00
Guillaume J. Charmes c7564b5e4d Merge pull request #4612 from tianon/cleaner-test-output 
Cleaner test output
 2014-03-12 17:54:14 -07:00
Guillaume J. Charmes db1afee3f0 Merge pull request #4000 from cap10morgan/1141-merge-configs-on-commit 
merge existing config when committing
 2014-03-12 17:49:11 -07:00
Sven Dowideit 94f2d52405 Merge pull request #4619 from dgageot/patch-1 
Update port_redirection.rst
 2014-03-13 09:31:16 +10:00
Guillaume J. Charmes 8e0a4802ab Merge pull request #4492 from ichik1/add-ip-forward-to-docs 
Update daemon docs for --ip-forward
 2014-03-12 16:29:33 -07:00
Guillaume J. Charmes 6a325f1c7a Fix issue when /etc/apparmor.d does not exists 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
 2014-03-12 11:13:24 -07:00
Victor Vieux bd1c512594 Merge pull request #4621 from unclejack/fix_empty_cidfile 
don't leave empty CIDFile behind
 2014-03-12 11:12:51 -07:00
unclejack a56d1b93a1 don't leave empty cidFile behind 
This makes `--cidfile` clean up empty container ID files. These are
left behind when creating the container fails.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-03-12 19:36:19 +02:00
Michael Crosby 63dee4ebc4 Merge pull request #4604 from vieux/improve_deprecation_warning_flags 
improve deprecation message
 2014-03-12 10:18:49 -07:00
Michael Crosby ba49f5bce1 Merge pull request #4603 from creack/fix_osx_attach 
Fix OSX attach exit issue
 2014-03-12 10:08:55 -07:00
David Gageot 2a5e1abaa9 Update port_redirection.rst 
Fix flags
 2014-03-12 15:42:10 +01:00