unclejack
d344625847
Bump version to v1.3.3
2014-12-11 17:37:17 +02:00
Hans Rødtang
496c2748cf
Updated cover tool import path.
...
Signed-off-by: Hans Rødtang <hansrodtang@gmail.com >
2014-12-11 17:37:17 +02:00
Tibor Vass
ee8504bc5a
docs: Add release notes
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-12-10 18:19:10 -05:00
Alexandr Morozov
994e4a1c69
Change path breakout detection logic in archive package
...
Fixes #9375
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Conflicts:
integration-cli/docker_cli_cp_test.go
removed extra test
2014-12-09 23:16:03 +02:00
Arnaud Porterie
0de96a8163
Fix client-side HTTP hijacking over TLS
...
Properly CloseWrite() the client socket once done with stdin when using
TLS connection (this used to rely on an erroneous type assertion).
Fixes #8658 .
Fixes #8642 .
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Signed-off-by: Michael Crosby <crosby.michael@gmail.com >
2014-12-09 14:56:17 -05:00
Michael Crosby
c8fc8768b6
Flush stdin from within chroot archive
...
This makes sure that we don't buffer in memory and that we also flush
stdin from diff as well as untar.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Conflicts:
pkg/chrootarchive/diff.go
2014-12-09 14:56:17 -05:00
Lewis Marshall
f2008c5359
Fix chroot untar for zero padded archive from slow reader
...
Signed-off-by: Lewis Marshall <lewis@lmars.net >
2014-12-09 14:56:16 -05:00
unclejack
acf1720b3f
validate image ID properly & before load
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2014-12-09 14:56:16 -05:00
Arnaud Porterie
0e9a7bc3ce
Add integration test for xz path issue
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Conflicts:
integration-cli/docker_cli_build_test.go
2014-12-09 14:56:16 -05:00
Michael Crosby
313a1b7620
Decompress archive before streaming the unpack in a chroot
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Conflicts:
pkg/archive/archive.go
pkg/chrootarchive/archive.go
2014-12-09 14:56:16 -05:00
Michael Crosby
62d83404b5
Update chroot apply layer to handle decompression outside chroot
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Conflicts:
pkg/archive/diff.go
pkg/chrootarchive/archive.go
2014-12-09 14:56:16 -05:00
Cristian Staretu
aef842e7df
Add build tests covering extraction in chroot
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2014-12-09 14:56:16 -05:00
unclejack
e629e255d8
integ-cli: add test for links in volumes
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2014-12-09 14:56:16 -05:00
unclejack
134f8e6b47
integ-cli: add build test for absolute symlink
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2014-12-09 14:56:16 -05:00
Tibor Vass
1cd89729d5
Add another symlink breakout test
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-12-09 14:56:16 -05:00
Tibor Vass
566146bc13
symlink: add more tests
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-12-09 14:56:16 -05:00
Tibor Vass
1ebafeb635
symlink: cleanup names and break big test into multiple smaller ones
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-12-09 14:56:16 -05:00
Tibor Vass
18193ae0a3
Refactor of symlink tests to remove testdata dir
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-12-09 14:56:16 -05:00
Tianon Gravi
cd745d5c6e
Simplify FollowSymlinkInScope based on Go 1.3.3's EvalSymlinks
...
Signed-off-by: Andrew Page <admwiggin@gmail.com >
2014-12-09 14:56:16 -05:00
Tibor Vass
6f514d28c0
Merge pull request #9316 from tiborvass/bump_v1.3.2
...
Bump v1.3.2
2014-11-24 16:49:28 -05:00
Tibor Vass
39fa2faad2
Bump to version v1.3.2
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-11-24 12:38:01 -05:00
Tibor Vass
324953d74a
docs: Add 1.3.2 release notes
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-11-24 12:38:01 -05:00
Tibor Vass
b256616589
archive: do not call FollowSymlinkInScope in createTarFile
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-11-24 11:51:37 -05:00
unclejack
409f65bfd1
pkg/chrootarchive: provide TMPDIR for ApplyLayer
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-11-24 11:51:37 -05:00
Derek McGowan
87f59e3802
Skip V2 registry and immediately fallback to V1 when mirrors are provided
...
Since V2 registry does not yet implement mirrors, when mirrors are given automatically fallback to V1 without checking V2 first.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2014-11-14 15:30:58 -08:00
Tibor Vass
c650d17a26
Rewrite documentation for insecure registries
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Conflicts:
docs/sources/reference/commandline/cli.md
2014-11-14 14:20:19 -08:00
Tibor Vass
5e2d02ab73
Add the possibility of specifying a subnet for --insecure-registry
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Conflicts:
registry/endpoint.go
2014-11-14 14:20:19 -08:00
Tibor Vass
eb3738347a
registry: parse INDEXSERVERADDRESS into a URL for easier check in isSecure
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-11-14 14:20:19 -08:00
Tibor Vass
6152460c1e
Put mock registry address in insecureRegistries for unit tests
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Conflicts:
registry/registry_mock_test.go
2014-11-14 14:20:19 -08:00
Tibor Vass
1527979e87
registry: refactor registry.IsSecure calls into registry.NewEndpoint
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Conflicts:
registry/endpoint.go
registry/endpoint_test.go
registry/registry_test.go
2014-11-14 14:05:31 -08:00
Tibor Vass
04175d0763
archive: prevent breakout in ApplyLayer
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-11-14 23:45:37 +02:00
Tibor Vass
a111eea20c
archive: prevent breakout in Untar
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-11-14 23:45:29 +02:00
Tibor Vass
ea361c0476
archive: add breakout tests
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Conflicts:
pkg/archive/archive.go
fixed conflict which git couldn't fix with the added BreakoutError
2014-11-14 23:44:20 +02:00
Thomas Orozco
967f80f3cc
Fix: Failed Start breaks VolumesFrom
...
Running parseVolumesFromSpec on all VolumesFrom specs before initialize
any mounts endures that we don't leave container.Volumes in an
inconsistent (partially initialized) if one of out mount groups is not
available (e.g. the container we're trying to mount from does not
exist).
Keeping container.Volumes in a consistent state ensures that next time
we Start() the container, it'll run prepareVolumes() again.
The attached test demonstrates that when a container fails to start due
to a missing container specified in VolumesFrom, it "remembers" a Volume
that worked.
Fixes : #8726
Signed-off-by: Thomas Orozco <thomas@orozco.fr >
Conflicts:
integration-cli/docker_cli_start_test.go
cli integration test
2014-11-12 00:14:04 +02:00
unclejack
8d90b0faf8
don't call reexec.Init from chrootarchive
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-11-11 23:20:16 +02:00
Tibor Vass
3ac6394b80
pkg/chrootarchive: pass TarOptions via CLI arg
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-11-11 23:20:09 +02:00
unclejack
0357b26c1b
add pkg/chrootarchive and use it on the daemon
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-11-11 23:20:02 +02:00
unclejack
1d4a82365b
pkg/archive: add interface for Untar
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-11-11 23:19:54 +02:00
Josh Hawn
3ab5251f56
Use archive.CopyWithTar in vfs.Create
...
The vfs storage driver currently shells out to the `cp` binary on the host
system to perform an 'archive' copy of the base image to a new directory.
The archive option preserves the modified time of the files which are created
but there was an issue where it was unable to preserve the modified time of
copied symbolic links on some host systems with an outdated version of `cp`.
This change no longer relies on the host system implementation and instead
utilizes the `CopyWithTar` function found in `pkg/archive` which is used
to copy from source to destination directory using a Tar archive, which
should correctly preserve file attributes.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2014-11-11 23:19:43 +02:00
unclejack
d51a02091c
pkg/reexec: move reexec code to a new package
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Conflicts:
integration/runtime_test.go
fixed imports
2014-11-11 23:19:34 +02:00
Michael Crosby
0573b17b24
Add AppArmorProfile to container inspect json
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-11-10 21:04:17 +02:00
Michael Crosby
c9379eb3fb
Move security opts to HostConfig
...
These settings need to be in the HostConfig so that they are not
committed to an image and cannot introduce a security issue.
We can safely move this field from the Config to the HostConfig
without any regressions because these settings are consumed at container
created and used to populate fields on the Container struct. Because of
this, existing settings will be honored for containers already created
on a daemon with custom security settings and prevent values being
consumed via an Image.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-11-10 21:04:01 +02:00
unclejack
662ca4114d
pkg/symlink: avoid following out of scope
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-11-10 17:57:54 +02:00
shuai-z
1d1b813d25
removed redundant Clean
...
The doc (or src) says: The result is Cleaned.
http://golang.org/pkg/path/filepath/#Join
Signed-off-by: shuai-z <zs.broccoli@gmail.com >
2014-11-10 17:57:01 +02:00
Alexandr Morozov
fd9c2ae27d
Fix deadlock in ps exited filter
...
Fixes #8909
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Conflicts:
integration-cli/docker_cli_ps_test.go
fixed merge issue caused by missing tests
2014-11-07 16:35:50 +02:00
unclejack
09c38a8d43
bump fpm to 1.3.2
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-11-07 16:18:53 +02:00
Tibor Vass
86292adbd9
Merge pull request #8861 from tiborvass/bump_v1.3.1
...
Bump v1.3.1
2014-10-30 12:43:43 -04:00
Tibor Vass
4e9bbfa900
Bump to version v1.3.1
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-10-30 09:44:46 -04:00
Tibor Vass
e6efbd6596
Fix login command
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-10-30 09:17:11 -04:00
Erik Hollensbe
9fc8b7f4e1
builder: Restore /bin/sh handling in CMD when entrypoint is specified with JSON
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-10-30 09:17:11 -04:00
Erik Hollensbe
463297ffe9
builder: whitelist verbs useful for environment replacement.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-10-30 09:17:11 -04:00
Erik Hollensbe
2dac82eb82
builder: handle escapes without swallowing all of them.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-10-30 09:17:11 -04:00
Erik Hollensbe
7f8cdeb18b
builder: some small fixups + fix a bug where empty entrypoints would not override inheritance.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-10-30 09:17:11 -04:00
Tibor Vass
3d287811d7
Docs edits for dropping SSLv3 and under + release notes for 1.3.1
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Conflicts:
docs/sources/index.md
2014-10-28 10:42:30 -04:00
Erik Hollensbe
21ab75afe0
builder: handle cases where onbuild is not uppercase.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-10-21 17:08:05 -04:00
Brian Goff
66fba7c46e
Clean volume paths
...
Fixes #8659
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2014-10-20 19:11:44 -04:00
Alexandr Morozov
ff325bcb2f
Don't write pull output to stdout on container creating
...
Fixes #8632
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-10-20 17:35:43 -04:00
Erik Hollensbe
cf23053eb1
builder: fix escaping for ENV variables.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-10-20 16:53:37 -04:00
Daniel, Dao Quang Minh
8caacb18f8
Avoid fallback to SSL protocols < TLS1.0
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com > (github: dqminh)
Conflicts:
registry/registry.go
2014-10-20 16:51:06 -04:00
Tianon Gravi
7d9ccc2636
Fix more missing HOME references
...
Signed-off-by: Andrew Page <admwiggin@gmail.com >
2014-10-20 16:51:06 -04:00
Jessica Frazelle
ada9ac7b13
Setting iptables=false should propagate to ip-masq=false
...
Signed-off-by: Jessica Frazelle <jess@docker.com >
2014-10-20 16:51:06 -04:00
Tibor Vass
e134f1f74a
Do not verify certificate when using --insecure-registry on an HTTPS registry
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Conflicts:
registry/registry.go
registry/registry_test.go
registry/service.go
registry/session.go
2014-10-20 16:51:06 -04:00
Michael Crosby
f43e77fc12
Don't hard code true for auth job
...
Signed-off-by: Michael Crosby <michael@docker.com >
Conflicts:
registry/service.go
2014-10-20 16:51:05 -04:00
Michael Crosby
c66196a9dc
Expand documentation for --insecure-registries
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-10-20 16:51:05 -04:00
Michael Crosby
c0598aced0
Refactor IsSecure change
...
Fix issue with restoring the tag store and setting static configuration
from the daemon. i.e. the field on the TagStore struct must be made
internal or the json.Unmarshal in restore will overwrite the insecure
registries to be an empty struct.
Signed-off-by: Michael Crosby <michael@docker.com >
Conflicts:
graph/pull.go
graph/push.go
graph/tags.go
2014-10-20 16:51:05 -04:00
unclejack
f9b4bfa59b
make http usage for registry explicit
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Conflicts:
daemon/config.go
daemon/daemon.go
graph/pull.go
graph/push.go
graph/tags.go
registry/registry.go
registry/service.go
2014-10-20 16:51:05 -04:00
Michael Crosby
c78b920e01
Merge pull request #8323 from crosbymichael/bump_v1.3.0
...
Bump to version 1.3.0
2014-10-16 10:08:54 -07:00
Michael Crosby
c78088fe3d
Bump to version 1.3.0
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-10-15 19:15:24 +00:00
Michael Crosby
87bd2da5d8
Merge branch 'master' into bump_v1.3.0
2014-10-15 19:15:13 +00:00
Michael Crosby
9a82713772
Merge pull request #8578 from erikh/fix_slash
...
builder: Handle trailing \ appropriately.
2014-10-15 12:11:37 -07:00
Alexandr Morozov
abec82bdee
Merge pull request #8579 from erikh/builder_html_panic
...
builder: handle anything we cannot parse the command for as a fatal error
2014-10-15 12:01:52 -07:00
Fred Lifton
73792969e6
Merge pull request #8582 from SvenDowideit/api-docs-link-to-basics-page
...
The basics page moved, update link.
2014-10-15 11:34:25 -07:00
Erik Hollensbe
3f2eb353bd
builder: provide a friendly message on parser errors
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-10-15 18:08:23 +00:00
Fred Lifton
9c6346e9b2
Merge pull request #8583 from SvenDowideit/minimal-curl-command-to-tls-docker-socket
...
Add a little info on how to talk to the TLS encrypted Docker Socket
2014-10-15 11:01:05 -07:00
Alexandr Morozov
de5b1b8bb0
Merge pull request #8580 from erikh/filter_comments_first
...
builder: strip blank lines before processing any line continuations.
2014-10-15 11:00:31 -07:00
Erik Hollensbe
63637b9d27
builder: handle anything we cannot parse the command for as a fatal error.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-10-15 08:47:15 +00:00
Erik Hollensbe
96f342f703
builder: comments should also be elided in the middle of statements following a line continuation.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-10-15 08:44:14 +00:00
Sven Dowideit
1c68de798f
Add a little info on how to talk to the TLS encrypted Docker Socket
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-10-15 17:24:53 +10:00
Sven Dowideit
a64ff0bf7a
The basics page moved, update link.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-10-15 16:48:43 +10:00
Erik Hollensbe
a1ef2207dd
builder: strip blank lines before processing any line continuations.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-10-15 04:00:17 +00:00
Erik Hollensbe
7fa449191c
builder: Handle trailing \ appropriately.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-10-15 03:08:18 +00:00
Michael Crosby
dc243c812b
Merge pull request #8564 from tiborvass/remove-docker-dot-io
...
change docs.docker.io to docs.docker.com in install script
2014-10-14 10:53:10 -07:00
Tibor Vass
e5e0baa6d4
change docs.docker.io to docs.docker.com in install script
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-10-14 13:45:26 -04:00
Michael Crosby
a29837020b
Merge pull request #8563 from crosbymichael/remove-key-create
...
Remove client key.json generation for trust
2014-10-14 10:45:15 -07:00
Michael Crosby
712e8da885
Remove client key.json generation for trust
...
This removes the key generation for trust from main while it is not
being consumed. The problem is that because this is being set in main
if a user runs as root initially the files will be owned by root. Later
if the user sets up the docker group they are unable to read the keys.
This is half a user error and documentation problem and the other half
is management.
We decided to remove this code for now while it is not being used and
will revisit it later when the consuming features are added. A few
options are to generate lazily and provide a clear error message on an
EPERM so that the user knows what is wrong and can correct the
permissions.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-10-14 17:16:45 +00:00
James Turnbull
23be0486f6
Merge pull request #8558 from fgrehm/patch-4
...
docs: Fix some minor typos on dockerlinks guide
2014-10-14 10:01:45 -04:00
Fabio Rehm
06d633e1f6
docs: Fix some minor typos on dockerlinks guide
...
Signed-off-by: Fabio Rehm <fgrehm@gmail.com >
2014-10-14 10:15:35 -03:00
Victor Vieux
95b67895c4
Merge pull request #8553 from tianon/fix-over-aggressive-shell-interpolation-regex
...
Fix builder from being over-aggressive on ${}
2014-10-14 00:30:03 -07:00
Tianon Gravi
24189b2c36
Fix builder from being over-aggressive on ${}
...
`${SOME_VAR%pattern}` was turning into `SOME_VAL%pattern}` which the shell would then balk at.
I've updated the `TOKEN_ENV_INTERPOLATION` regex to account for this (ie, if `${` is used, it _must_ also match the closing `}`), and renamed the variable to not be exported (since it's not used outside the function following it).
I also added comments for the bits of `tokenEnvInterpolation` so they're easier to follow. 😄
Signed-off-by: Andrew Page <admwiggin@gmail.com >
2014-10-14 00:58:55 -06:00
Victor Vieux
0ab2f19278
Merge pull request #8552 from crosbymichael/update-libcontainer-oct2
...
Update to libcontainer 8d1d0ba38a7348c5cfdc05aea3b
2014-10-13 23:43:06 -07:00
Michael Crosby
018ce19b31
Update to libcontainer 8d1d0ba38a7348c5cfdc05aea3b
...
This fixes issues where the apparmor profile is not applied to processes
via docker exec. As a side effect the parent processes were unable to
kill the additional child processes because of the profile mismatch.
Easy way to reproduce on an apparmor system:
docker run -ti debian:jessie bash
ps auxZ
- look at the labels
- in another shell
docker exec <name> sleep 1000
- go back to the first container and
ps auxZ
- make sure all processes have the correct docker-default profile
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-10-14 06:24:38 +00:00
Michael Crosby
9d1c9a4075
Merge pull request #8548 from crosbymichael/config-path
...
Write s3cfg to $HOME
2014-10-13 20:45:16 -07:00
Michael Crosby
e0a1df8e68
Write s3cfg to $HOME
...
Because of the base image change, $HOME is not always / and we need to
write to the proper $HOME within the container to complete the release
process.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-10-14 03:34:24 +00:00
Michael Crosby
e4976b8cc1
Merge pull request #8545 from fredlf/1.3release-notes
...
Adding release notes for 1.3.
2014-10-13 19:30:33 -07:00
Michael Crosby
2c5ad1ac3e
Merge pull request #8547 from erikh/onbuild-cmd
...
builder: ONBUILD triggers were not accurately being executed in JSON cases
2014-10-13 19:29:16 -07:00
Sven Dowideit
18b507c49e
Merge pull request #8226 from SvenDowideit/more-daemon-option-information
...
More daemon option information
2014-10-14 12:06:14 +10:00
SvenDowideit
5bcff59feb
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
...
Add some information about the storage and execution driver choices
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-10-14 12:05:09 +10:00
Erik Hollensbe
1150c1639a
builder: ONBUILD triggers were not accurately being executed in JSON cases.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-10-14 01:59:45 +00:00
Sven Dowideit
587e2f1ddc
Merge pull request #8529 from SvenDowideit/update-version-dropdown-on-404
...
Remove version selector and edit on Github on search page, as it only se...
2014-10-14 11:55:12 +10:00
Sven Dowideit
5bf3ac5738
Remove version selector and edit on Github on search page, as it only searches the latest docs
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-10-14 11:54:41 +10:00
Sven Dowideit
9d5e3a54a0
Merge pull request #8525 from duglin/Issue4789
...
Add more info about the LINK env vars created
2014-10-14 11:24:17 +10:00
Fred Lifton
30cfa148b9
Adding release notes for 1.3.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-10-13 17:17:41 -07:00
Tibor Vass
839660ada1
Merge pull request #8541 from crosbymichael/update-libcontainer-oct1
...
Update libcontainer to 4f409628d80b9842004a3f17c92
2014-10-13 17:54:27 -04:00
Fred Lifton
939227a81a
Merge pull request #8462 from SvenDowideit/document-how-to-add-a-new-document
...
Mention the mkdocs.yml file for adding new documents
2014-10-13 13:15:00 -07:00
Fred Lifton
c2096d7096
Merge pull request #8530 from SvenDowideit/auto-scroll-to-auto-index-section-the-user-requested
...
Turn off editing for auto-generated index pages, and scroll the user to the right section
2014-10-13 13:12:05 -07:00
Fred Lifton
66b9694b58
Merge pull request #8532 from SvenDowideit/demote-readme.md-header
...
README.md is a sub-section in how to build automated builds
2014-10-13 13:02:41 -07:00
Michael Crosby
8fedf718ce
Update libcontainer to 4f409628d80b9842004a3f17c92
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-10-13 19:53:20 +00:00
Fred Lifton
547c42d8d0
Merge pull request #8528 from SvenDowideit/hide-side-toc-for-search
...
Hide the empty sidebar TOC on the search page
2014-10-13 12:13:06 -07:00
Fred Lifton
3040c8b759
Merge pull request #8527 from SvenDowideit/dissalow-robots-except-for-docs.docker.com
...
start sending robots.txt (and humans.txt) again, and set to dissallow if...
2014-10-13 12:12:18 -07:00
Fred Lifton
6ce3967f8f
Merge pull request #8517 from sequenceiq/master
...
docs: fixing docker.io api
2014-10-13 12:09:39 -07:00
Fred Lifton
ce669297df
Merge pull request #8503 from aanand/tlsverify-environment-variable
...
Add DOCKER_TLS_VERIFY environment variable, equivalent to --tlsverify flag
2014-10-13 10:20:10 -07:00
James Turnbull
42b217044a
Merge pull request #8435 from SvenDowideit/explain-docker-attach-more
...
Add more info on attach inspired by discussion in #2855
2014-10-13 13:19:22 -04:00
James Turnbull
e3101a3508
Merge pull request #8523 from duglin/FixLinkCmdLine
...
Fix href in docs w.r.t. cgroups freezer pointer
2014-10-13 13:18:49 -04:00
James Turnbull
8a32aa26c1
Merge pull request #8524 from duglin/Regardless
...
Fix typo: reguardless should be regardless
2014-10-13 13:18:21 -04:00
James Turnbull
fe03da7da8
Merge pull request #8507 from duglin/Issue3087
...
Add some docs about which env vars are defined in new containers
2014-10-13 13:13:43 -04:00
Aanand Prasad
19fb942d36
Add DOCKER_TLS_VERIFY environment variable, equivalent to --tlsverify flag
...
This makes it possible to make the Docker client "secure by default"
without wrapping the binary in a shell alias so that `--tlsverify` is
always passed.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2014-10-13 11:49:26 +01:00
Sven Dowideit
801edfa9b8
Add more info on attach inspired by discussion in #2855
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-10-13 17:30:08 +10:00
Sven Dowideit
3d2f10e28a
Mention the mkdocs.yml file for adding new documents
...
and move the complicated discussion about branches lower down,
hopefully most won't need to know
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-10-13 17:06:18 +10:00
Sven Dowideit
3732cd6612
README.md is a sub-section in how to build automated builds
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-10-13 17:00:58 +10:00
Sven Dowideit
687215c32f
Turn off editing for auto-generated index pages, and scroll the user to the right section
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-10-13 16:32:18 +10:00
Sven Dowideit
d883fb66b0
Hide the empty sidebad TOC on the search page
...
This uses @dnephin's changes to the base.html (thank you!)
and then adds the hide_toc: page meta
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-10-13 14:10:29 +10:00
Sven Dowideit
44e9a59665
start sending robots.txt (and humans.txt) again, and set to dissallow if its not the real docs site
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-10-13 13:53:16 +10:00
Doug Davis
61387427cb
Add more info about the LINK env vars created
...
@SvenDowideit see what you think. I'd like to get your take on this
before I submit the PR.
Closes #4789
Signed-off-by: Doug Davis <dug@us.ibm.com >
2014-10-12 18:34:18 -07:00
Doug Davis
ba7038c8d2
Fix typo: reguardless should be regardless
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2014-10-12 14:41:24 -07:00
Doug Davis
b10e11f30e
Fix href in docs w.r.t. cgroups freezer pointer
...
Apparently, the [...] and (http...) need to be right after each other instead
of on different lines.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2014-10-12 12:59:46 -07:00
Lajos Papp
137bad4b48
docs: fixing docker.io api
...
Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com >
2014-10-12 09:05:58 +02:00
unclejack
7fa7c42ce2
Merge pull request #8508 from vbatts/vbatts-too_many_open_files
...
cleaner handling of client socket access
2014-10-11 11:16:23 +03:00
Jessie Frazelle
9f482a66ab
Merge pull request #8393 from dmcgowan/provenance_pull_enhance
...
Make V2 code more defensive against malformed content
2014-10-10 17:19:59 -07:00
Victor Vieux
246ec5dd06
Merge pull request #8505 from crosbymichael/ps-name
...
Improve ps name parsing
2014-10-10 17:08:35 -07:00
Vincent Batts
fb7ceeb170
cleaner handling of client socket access
...
In the go stdlib net/http Transport, the used connections are cached
when idled. This behaviour is intended for TCP connections and does not
behave correctly for unix sockets. Despite the
DefaultMaxIdleConnsPerHost being 2, the idled connections are held open
during a session. For large sessions like `docker rm $(docker ps -a -q)`
of thousands of containers, it will cause the client _and_ the server to
open too many fails and have failures.
Having keep alives not used for only unix sockets is a work around for
this stdlib issue.
Also this includes disabling compression when communicating over the
local unix socket too.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2014-10-10 19:58:49 -04:00
Derek McGowan
3be4551a91
Enable V2 pull flow
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2014-10-10 16:09:56 -07:00
Derek McGowan
85fd8213af
Update verification message
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2014-10-10 16:04:29 -07:00
Derek McGowan
73a9089306
Support tarsum dev version to fix issue with mtime
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2014-10-10 16:04:29 -07:00
Derek McGowan
15d5c7f10f
Update manifest format to rename blobsums and use arrays of dictionaries
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2014-10-10 16:04:29 -07:00
Derek McGowan
456f493659
Add status message for V2 pull
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2014-10-10 16:04:29 -07:00
Derek McGowan
7d21ea6627
Update pull message and log
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2014-10-10 16:04:28 -07:00
Derek McGowan
a152f37674
Use direct registry url
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2014-10-10 16:04:28 -07:00
Derek McGowan
e8b8cf61a9
Make V2 code more defensive against malformed content
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2014-10-10 16:04:28 -07:00
Doug Davis
7d1e197f25
Add some docs about which env vars are defined in new containers
...
@SvenDowideit FYI
Closes #3087
Signed-off-by: Doug Davis <dug@us.ibm.com >
2014-10-10 15:40:52 -07:00
Michael Crosby
b10dfb7de3
Import ps name parsing for default name
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-10-10 22:18:25 +00:00
Brice Jaglin
4a5cefa173
on truncated output, show canonical name rather than first name
...
Docker-DCO-1.1-Signed-off-by: Brice Jaglin <bjaglin@teads.tv > (github: bjaglin)
2014-10-10 08:12:15 +02:00
Brice Jaglin
0099b5e68c
reflect changes introduced in d2ffcd9 in docs
...
Docker-DCO-1.1-Signed-off-by: Brice Jaglin <bjaglin@teads.tv > (github: bjaglin)
2014-10-10 08:12:12 +02:00
Sven Dowideit
248ec5d74e
Merge pull request #8384 from rhatdan/selinux-opts
...
Fix security-opt docs
2014-10-10 10:52:17 +10:00
Tianon Gravi
3b41439262
Merge pull request #8496 from jfrazelle/update-desktop-examples
...
Update desktop integration examples to be more awesome.
2014-10-09 18:44:03 -06:00
Jessica Frazelle
8aa468ef56
Update desktop integration examples to be more up to date.
...
Chromium > Iceweasel and cool new gparted example.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-10-09 17:13:13 -07:00
Victor Vieux
72d8d94284
Merge pull request #8497 from aluzzardi/disable-stable-ip
...
Disable stable IPs.
2014-10-09 15:54:33 -07:00
Victor Vieux
88a41aa7d1
Merge pull request #8470 from fgrehm/patch-3
...
docs: Remove `Detach` parameter from Exec Create example
2014-10-09 15:25:51 -07:00
Andrea Luzzardi
5b8379a434
Disable stable IPs.
...
Stable IPs causes some regressions in the way people use Docker, see GH#8493.
Reverting it for 1.3, we'll enable it back for the next release.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2014-10-09 15:15:17 -07:00
Tibor Vass
d095659c6e
Merge pull request #8495 from jpetazzo/8494-fix-debian-frontend-in-getdockercom-script
...
Add -E flag to sudo (fixes #8494 )
2014-10-09 18:05:18 -04:00
Michael Crosby
917529e45e
Merge pull request #8482 from jfrazelle/8481-content-type-bump-v
...
Revert #8101 and #7886 (content-type:x-json-stream/line delimited json)
2014-10-09 14:57:15 -07:00
Jérôme Petazzoni
e01e913d80
Add -E flag to sudo ( fixes #8494 )
...
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com > (github: jpetazzo)
2014-10-09 14:54:22 -07:00
Jessica Frazelle
b66ac6a809
Revert "Fix line delimited JSON response"
...
This reverts commit d2f75a3040jess@docker.com > (github: jfrazelle)
2014-10-09 13:46:21 -07:00
Jessica Frazelle
4c6b7cd1b5
Revert "Change content-type for json stream to application/x-json-stream."
...
This reverts commit 10ab2089cejess@docker.com > (github: jfrazelle)
2014-10-09 13:17:47 -07:00
Dan Walsh
a260772e48
Fix security-opt docs
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-10-09 15:18:28 -04:00
Fred Lifton
2f5f437bc1
Merge pull request #8419 from nhsiehgit/dockerfiletut
...
Dockerfiletut
2014-10-09 10:15:10 -07:00
Fred Lifton
950f271ee4
Merge pull request #8461 from SvenDowideit/copy-specific-files-from-context
...
Add a best practice to reduce cache invalidations
2014-10-09 10:03:50 -07:00
Michael Crosby
4eb812e042
Merge pull request #8457 from jfrazelle/pr_8455
...
Check /etc/resolv.conf every time for 127.* content
2014-10-08 16:21:14 -07:00
Jessica Frazelle
dbe6c6651e
cleanup resolve.conf code
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-10-08 15:15:51 -07:00
Michael Crosby
0486bd022e
Merge pull request #8450 from dqminh/fix-proxy-exit
...
dont close proxy's stdout/stderr prematurely
2014-10-08 14:20:33 -07:00
Andrea Luzzardi
d7bcc099be
Merge pull request #8475 from cpuguy83/fix_create_phantom_volumes_on_container_restart
...
Fixes re-creating volume on (re)start
2014-10-08 13:58:56 -07:00
Andrea Luzzardi
c417921f78
Merge pull request #8472 from cpuguy83/fix_volume_refs_on_daemon_restore
...
Restore volume refs after daemon restart
2014-10-08 13:58:30 -07:00
Nathan Hsieh
6a874cf711
added fixes to address comments
...
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
2014-10-08 13:46:44 -07:00
Nathan Hsieh
c257dcc9a4
Squashed commit of the following:
...
commit 3f9e9185fe7ee51f2fe55f0fc0d4fffdc4f289dc
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Mon Oct 6 10:57:35 2014 -0700
changed the title of back buttons
commit f86934424e85931ec293e711ceaa93ee920828fb
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Mon Oct 6 10:53:15 2014 -0700
Finished level 2, refactored tests
commit 8f502bce05293cccaf200b69ce5f5826eee72484
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Mon Oct 6 08:52:37 2014 -0700
stylized better and added level 2
commit 07b2276b346c34c0cc0faa57500c40e120e77888
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Fri Oct 3 18:17:29 2014 -0700
broke tutorial tests styles
commit 35d84147dc2f65b0ffeea5faf304add903219b1e
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Fri Oct 3 17:23:48 2014 -0700
structured test level1 md file
commit 808d01b0d55d67eb1017f290a29da6c7d38565f2
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Fri Oct 3 17:15:46 2014 -0700
Modified files and integrated tutorial through new page
commit 0f0093f2882489c3eeb6f8870f2b8aa64dc939a3
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Thu Oct 2 14:34:44 2014 -0700
more refactoring
commit 5a9b98e55ebd455ccf2c0ced20f984545a0b6d71
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Thu Oct 2 11:46:58 2014 -0700
clean js code
commit af3bbd8d5e1dffdaa1780f83b909ff566906e513
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Thu Oct 2 11:26:39 2014 -0700
level 1 cleanup
commit c4852a7766ab4fbd978d65c8352ace05eb427ef5
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Thu Oct 2 11:20:17 2014 -0700
fixed up fill-in level1
commit 7f02d80942549dec9c05f784b777fcb32d5bb81b
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Wed Oct 1 17:45:42 2014 -0700
added dockerfile tut, stylized lesson1 Questions
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
2014-10-08 13:46:44 -07:00
Nathan Hsieh
8ceb213b3e
merged conflicting commits
...
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
2014-10-08 13:44:21 -07:00
Brian Goff
c985302c5c
Fixes re-creating volume on (re)start
...
When a container is restarted all the volume configs are parsed again.
Even if the volume was already handled in a previous start it was still
calling "FindOrCreateVolume" on the volume repo causing a new volume to
be created.
This wasn't being detected because as part of the mount initialization
it checks to see if the the _mount_ was already initialized, but this
happens after the parsing of the configs.
So a check is added during parsing to skip a volume which was already
created for that container.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2014-10-08 16:25:51 -04:00
Brian Goff
9acf7c765c
Restore volume refs after daemon restart
...
Volume refs were not being restored on daemon restart.
This made it possible to remove a volume being used by other containers
after a daemon restart.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2014-10-08 14:17:27 -04:00
Daniel, Dao Quang Minh
3b9d88210e
pass extra file to child process as status handler
...
When stdout/stderr is closed prematurely, the proxy's writes to stdout/stderr
(i.e. `log.Errorf/log.Printf`) will returns with EPIPE error, and go runtime
will terminate the proxy when stdout/stderr writes trigger 10 EPIPE errors.
instead of using stdout/stderr as the status handler, we pass an extra file to
the child process and write `0\n` or `1\nerror message` to it and close it
after. This allow the child process to handle stdout/stderr as normal.
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com > (github: dqminh)
2014-10-08 12:53:43 -04:00
Fabio Rehm
2fd0e8eb5f
docs: Remove Detach parameter from Exec Create example
...
Signed-off-by: Fabio Rehm <fgrehm@gmail.com >
2014-10-08 10:31:12 -03:00
Victor Vieux
0d5daa4a8f
Merge pull request #8463 from jfrazelle/fix-invalid-tag-test
...
Fix Tag Test for longer tags
2014-10-08 01:07:24 -07:00
Jessica Frazelle
de32f48e66
Fix Tag Test for longer tags
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-10-07 19:37:08 -07:00
Victor Vieux
60908acff6
Merge pull request #8447 from burke/bump-tag-char-limit
...
Increase the tag length limit from 30 to 128
2014-10-07 18:31:35 -07:00
Sven Dowideit
a36ba19cca
Add a best practice to reduce cache invalidations
...
inspired by https://github.com/docker-training/docker-fundamentals/pull/206
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2014-10-08 11:26:48 +10:00
Victor Vieux
7f22fc32d5
Merge pull request #8431 from aluzzardi/b-alloc-network-error-handling
...
Container#AllocateNetwork: Simplify error handling.
2014-10-07 18:21:28 -07:00
James Turnbull
c2428ff865
Merge pull request #8437 from SvenDowideit/un-pto-sven-oct-2014
...
back from camping, and making fred the docs 'guy in charge'
2014-10-07 20:01:26 -04:00
Michael Crosby
989e064d6e
Merge pull request #8459 from crosbymichael/entrypoint-parent
...
Allow child to overwrite entrypoint from parent
2014-10-07 16:57:44 -07:00
Jessie Frazelle
85da74ce5f
Merge pull request #8451 from eparis/systemd
...
Fix system socket/service unit files
2014-10-07 16:54:20 -07:00
Jessica Frazelle
acd511786e
Test for check /etc/resolv.conf on every docker run for 127.* content.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-10-07 16:51:51 -07:00
Michael Crosby
50fa9dffcf
Allow child to overwrite entrypoint from parent
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-10-07 23:45:35 +00:00
Jessie Frazelle
12203e475d
Merge pull request #8434 from tiborvass/ignore_invalid_Dockerfile_instructions
...
Ignore unknown dockerfile instructions
2014-10-07 14:45:51 -07:00
Dan Walsh
9ced509e6d
Check /etc/resolv.conf every time for 127.* content
...
Currently if you start the docker -d on a system with 127.0.0.1 in /etc/resolv.conf
It will set the default dns to 8.8.8.8 8.8.4.4 permanently.
This causes a problem at boot on Fedora machines where NetworkManager has not
populated /etc/resolv.conf before docker gets started.
This fix checks /etc/resolv.conf on every docker run. And only populates
daemon.config.Dns if the user specified it on the command line.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-10-07 16:19:02 -04:00
Eric Paris
053c3557b3
Fix system socket/service unit files
...
Two problems how they are today:
In the current systemd unit files it is impossible to have the
docker.service started at system boot. Instead enableing docker.service
will actually enable docker.socket. This is a problem, as that means
any container with --restart=always will not launch on reboot. And of
course as soon as you log in and type docker ps, docker.service will be
launched and now your images are running. Talk about a PITA to debug!
The fix is to just install docker.service when people ask docker.service
to be enabled. If an admin wants to enable docker.socket instead, that
is fine and will work just as it does today.
The second problem is a common docker devel workflow, although not
something normal admins would hit. In this case consider a dev doing
the following:
systemctl stop docker.service
docker -d
[run commands]
[^C]
systemctl start docker.service
Running docker -d (without -F fd://) will clean up the
/var/run/docker.sock when it exits. Remember, you just ran the docker
daemon not telling it about socket actviation, so cleaning up its socket
makes sense! The new docker, started by systemd will expect socket
activation, but the last one cleaned up the docker.sock. So things are
just broken. You can, today, work around this by restarting
docker.socket. This fixes it by telling docker.socket that it is
PartOf=docker.service. So when docker.service is
started/stopped/restarted docker.socket will also be
started/stopped/restarted. So the above semi-common devel workflow will
be fine. When docker.service is stopped, so is docker.socket, docker
-d (without -F fd://) will create and delete /var/run/docker.sock.
Starting docker.service again will restart docker.socket, which will
create the file an all is happy in the word.
Signed-off-by: Eric Paris <eparis@redhat.com >
2014-10-07 14:09:08 -04:00
Burke Libbey
c95b0e0292
Increase the tag length limit from 30 to 128
...
Signed-off-by: Burke Libbey <burke.libbey@shopify.com >
2014-10-07 11:29:47 -04:00
Sven Dowideit
9b5e6d40f5
back from camping, and making fred the docs 'guy in charge'
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-10-07 15:54:30 +10:00
Sven Dowideit
7813f85e7d
Merge pull request #8382 from jamtur01/cli
...
Multiple fixes to the cli.md document.
2014-10-07 15:07:57 +10:00
Sven Dowideit
8f58025b70
Merge pull request #8304 from davide-ceretti/chore/prettify-docs-update.py
...
Prettify docs-update.py
2014-10-07 14:30:24 +10:00
Sven Dowideit
40cad37f0a
Merge pull request #8341 from unclejack/add_workdir_test
...
add test for workdir env vars and add docs
2014-10-07 14:27:32 +10:00
Tibor Vass
0a2c481c7f
ignore invalid Dockerfile instructions and do not consider "docker-version" a Dockerfile instruction
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-10-06 23:26:59 -04:00
James Turnbull
92a9b87a57
Merge pull request #8426 from proppy/patch-12
...
google: fix typo
2014-10-06 23:18:54 -04:00
Tibor Vass
9fe1dd3103
Add test for ignoring invalid dockerfile instructions
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-10-06 23:14:25 -04:00
Andrea Luzzardi
300c51c3a4
Container#AllocateNetwork: Simplify error handling.
...
The defer logic was a little tricky and was hiding one bug: `err` was
being redefined (with `:=`) and thus it escaped the defer error checking
logic.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2014-10-06 17:59:12 -07:00
Johan Euphrosine
0a056a31fa
google: fix typo
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-10-06 15:28:50 -07:00
Alexandr Morozov
a650ab7f29
Merge pull request #8409 from unclejack/integcli_lint
...
integcli: lint fixes
2014-10-06 14:32:08 -07:00
unclejack
c0e632246d
integcli: lint fixes
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-10-06 23:15:17 +03:00
Victor Vieux
6157af8292
Merge pull request #8416 from LK4D4/fix_build_cache_test
...
Fix TestBuildCacheADD to check cache in out, not in id
2014-10-06 11:56:18 -07:00
Michael Crosby
128c52f583
Merge pull request #8417 from cpuguy83/8398_fix_automatic_data_copy_for_volumesfrom
...
volumes copying data unexpectedly
2014-10-06 11:43:41 -07:00
Victor Vieux
40070609da
Merge pull request #8369 from vieux/add_test_rm
...
add test and move one from rm to rmi
2014-10-06 11:30:12 -07:00
Brian Goff
e95b6fb648
Fix #8398 - volumes copying data unexpectedly
...
Prior to the volumes re-factor, data was not being copied on
volumes-from or host-mounted volumes.
After the re-factor, data was being copied for volumes-from.
This reverts this unintentional change in behavior.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2014-10-06 14:21:46 -04:00
Victor Vieux
3e473c08b4
update test
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-10-06 18:18:25 +00:00
Victor Vieux
7bd482d570
Merge pull request #8370 from duglin/ParserIndent
...
Fix builder/parser so it keeps some whitespace on split lines.
2014-10-06 10:32:02 -07:00
Michael Crosby
a761698700
Merge pull request #8391 from crosbymichael/disable-v2-registry
...
Remove registry v2 code path
2014-10-06 10:12:20 -07:00
Fred Lifton
3fc04f36e5
Merge pull request #8343 from duglin/Issue5278
...
Make fixed font sizes smaller per Issue #5278
2014-10-06 10:11:01 -07:00
Alexandr Morozov
21dff8cbec
Fix TestBuildCacheADD to check cache in out, not in id
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-10-06 10:04:10 -07:00
Victor Vieux
887d9238f5
Merge pull request #8408 from tonistiigi/8407-fix-host-header
...
Fix Host header on stream commands
2014-10-06 09:48:12 -07:00
Victor Vieux
166c56cabd
Merge pull request #8413 from tonistiigi/build-content-type
...
Fix streaming JSON Content-type for postBuild
2014-10-06 09:38:52 -07:00
Tonis Tiigi
30d6ff99fc
Fix streaming JSON Content-type for postBuild
...
See #8101
lineDelim is used by streamJSON() so it needs to be set
before its called.
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com > (github: tonistiigi)
2014-10-06 19:20:10 +03:00
Tonis Tiigi
e457b21db3
Fix Host header on stream commands
...
Fixes #8407
Setting Host on URL only works if the Request does not
already have its Host property set.
Note that the API version was also swallowed.
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com > (github: tonistiigi)
2014-10-06 17:04:27 +03:00
Doug Davis
9c201c5836
Make fixed font sizes smaller per Issue #5278
...
Closes #5278
Signed-off-by: Doug Davis <dug@us.ibm.com >
2014-10-06 06:49:33 -07:00
Doug Davis
f440c6b224
Fix builder/parser so it keeps some whitespace on split lines.
...
If previous line ends with whitespace, or next line starts with whitepsace
we need to preserve a space otherwise things line:
RUN echo\
hello
will appear as: RUN echohello
Noticed this while looking at #5744 because he had lines ending in &&\
Signed-off-by: Doug Davis <dug@us.ibm.com >
2014-10-03 20:33:12 -07:00
James Turnbull
44264f48e4
Merge pull request #8388 from merty/patch-1
...
Fixed a typo in "Installing Docker on Mac OS X"
2014-10-03 22:03:50 -04:00
James Turnbull
62391d68a4
Merge pull request #8360 from duglin/Issue5509
...
Add note to docs about lack of shell processing in JSON form - Issue 5509
2014-10-03 22:03:31 -04:00
James Turnbull
95e169a6a1
Merge pull request #8222 from fredlf/adding_official-repo-guidelines
...
Edits and fixes based on review.
2014-10-03 22:03:05 -04:00
Andrea Luzzardi
84d9fd37b0
Merge pull request #8392 from jfrazelle/pr_8389
...
Invalid mount mode for volumes in
2014-10-03 17:22:21 -07:00
Jessica Frazelle
b10b458b6e
Add test for invalid mount mode for volumes in.
...
Closes #8389 .
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-10-03 16:17:51 -07:00
Michael Crosby
1c62e0ae4e
Remove registry v2 code path
...
As this feature requires more testing it is much safter to get the
underlying changes into the codebase first then enable the feature in
another release after proper testing and verification can be done.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-10-03 22:24:14 +00:00
Victor Vieux
d152a93b5f
Merge pull request #8297 from aluzzardi/f-stable-ip
...
Stable Networking: Keep the same network settings during the entire container lifecycle.
2014-10-03 14:19:46 -07:00
Brian Goff
007b4f6340
Fixes bad validMountMode check
...
Needed to check if the mode was invalid and return error, not valid and
return error.
This didn't get picked up because the existing integration-cli tests
were all either expecting errors when a valid mode was passed in (e.g.
"ro" passed in, we expected an error because it was testing write). So
modified a test which was testing for "rw" to actually pass in "rw"
instead of assuming the "rw"
Docker-DCO-1.1-Signed-off-by: Brian Goff <bgoff@cpuguy83-mbp.home > (github: cpuguy83)
2014-10-03 16:55:39 -04:00
Andrea Luzzardi
b669025949
Stable MAC addresses: Add support for MAC address restoring.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2014-10-03 13:46:24 -07:00
Andrea Luzzardi
f1087c5fcf
Daemon: Restore network settings at startup.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2014-10-03 13:46:24 -07:00
Andrea Luzzardi
a487593729
Stable Networking: Keep the same network settings across container restarts.
...
This change will allocate network settings (IP and public ports) at
container creation rather than start and keep them throughout the
lifetime of the container (i.e. until it gets destroyed) instead of
discarding them when the container is stopped.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2014-10-03 13:46:24 -07:00
Andrea Luzzardi
deffc572ce
Container: Add restore network functionality.
...
RestoreNetwork() allows the container to restore its NetworkSettings (IP
and public ports).
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2014-10-03 13:46:24 -07:00
Andrea Luzzardi
ab4188c08d
Container: Make allocateNetwork and releaseNetwork public.
...
Since we are moving network allocation outside of container scope (it
will be managed by create/destroy), those functions need to be
accessible from the outside.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2014-10-03 13:46:24 -07:00
Andrea Luzzardi
103a4e0676
Network Allocation: Proper rollback in case of failure allocation.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2014-10-03 13:46:24 -07:00
James Turnbull
ee101c3b2c
Multiple fixes to the cli.md document.
...
*. Fixed headings so the side menu will now be consistent. Some sections
had H3s that were displaying and others did not leaving the left menu
very mismatched.
* Fixed several spelling errors.
* Re-formatted several long lines and badly laid out paragraphs.
* Fixed several double backticks.
* Added backticks to several outputs and variables.
* Removed two issues that are no longer valid.
* Removed several double spaces and extra lines.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-10-03 16:28:43 -04:00
Alexandr Morozov
beff5067c8
Merge pull request #8371 from aluzzardi/f-consistent-mac
...
Support for consistent MAC address.
2014-10-03 13:28:03 -07:00
Andrea Luzzardi
88e21c6a75
Support for consistent MAC address.
...
Right now, MAC addresses are randomly generated by the kernel when
creating the veth interfaces.
This causes different issues related to ARP, such as #4581 , #5737 and #8269 .
This change adds support for consistent MAC addresses, guaranteeing that
an IP address will always end up with the same MAC address, no matter
what.
Since IP addresses are already guaranteed to be unique by the
IPAllocator, MAC addresses will inherit this property as well for free.
Consistent mac addresses is also a requirement for stable networking (#8297 )
since re-using the same IP address on a different MAC address triggers the ARP
issue.
Finally, this change makes the MAC address accessible through docker
inspect, which fixes #4033 .
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2014-10-03 13:22:38 -07:00
Mert Yazıcıoğlu
81cddaaa7d
Fixed a typo in "Installing Docker on Mac OS X"
...
evironment -> environment
2014-10-03 23:18:40 +03:00
Michael Crosby
94da44cacf
Merge pull request #8375 from fgrehm/patch-2
...
docs: Update `docker exec` examples
2014-10-03 11:30:37 -07:00
Michael Crosby
5a627e41ff
Merge pull request #8324 from cpuguy83/6231_fix_chunked_encoding
...
Fix #6231 - Accept chunked encoding on start
2014-10-03 11:27:57 -07:00
Brian Goff
86bfb9bca6
Fix #6231 - Accept chunked encoding on start
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-10-03 14:18:25 -04:00
Michael Crosby
23dc2ca2d5
Merge pull request #8336 from kwk/improve_docs_with_note_about_registry_frontend_web_app
...
Improve docs with note about registry frontend web app
2014-10-03 11:00:32 -07:00
Michael Crosby
eaaf9e3125
Merge pull request #8320 from dmcgowan/provenance_pull
...
Official image provenance pull flow
2014-10-03 10:56:54 -07:00
Michael Crosby
6deeb103cf
Merge pull request #8372 from cpuguy83/change_volume_containers_to_private
...
Make volume.Containers private
2014-10-03 10:44:21 -07:00
Doug Davis
98ceae1a84
Add note to docs about lack of shell processing in JSON form
...
Closes #5509
Signed-off-by: Doug Davis <dug@us.ibm.com >
2014-10-03 05:18:25 -07:00
Fabio Rehm
6480b30a99
docs: Update docker exec examples
...
Signed-off-by: Fabio Rehm <fgrehm@gmail.com >
2014-10-03 01:13:59 -03:00
Brian Goff
c5e728c953
Make volume.Containers private
...
Also wrap access in mutex.
Makes sure we don't have any pontential for races in accessing this.
It also doesn't really need to be/shouldn't be in the config.json anyway
Docker-DCO-1.1-Signed-off-by: Brian Goff <bgoff@cpuguy83-mbp.home > (github: cpuguy83)
2014-10-02 20:46:17 -04:00
Derek McGowan
22e59009e4
Add comment for permission and fix wrong format variable
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2014-10-02 17:41:57 -07:00
Victor Vieux
c68e6b15a5
add test and move one from rm to rmi
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-10-02 23:39:39 +00:00
Victor Vieux
06b74875b6
Merge pull request #8368 from vieux/fix_docker_rm
...
docker rm <unknown>
2014-10-02 16:30:37 -07:00
Jessie Frazelle
8a0733ce69
Merge pull request #8351 from kencochrane/8347_fix_broken_doc_build
...
Fixed issue with docs not getting built due to ssl error.
2014-10-02 15:58:18 -07:00
Victor Vieux
3eaa1c99c1
docker rm <unknown>
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-10-02 22:52:37 +00:00
Victor Vieux
b2ee63000e
Merge pull request #8367 from crosbymichael/update-libcontainer-sep9
...
Update libconatiner to b3570267c7b7995d5d618974d8f
2014-10-02 15:41:06 -07:00
Michael Crosby
193654e3ef
Update libconatiner to b3570267c7b7995d5d618974d8f
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-10-02 22:19:56 +00:00
Jessie Frazelle
45667fb1bb
Merge pull request #8364 from tianon/bash-completion-filters
...
Optimize the bash completion even further
2014-10-02 15:00:01 -07:00
Victor Vieux
34f4144b7f
Merge pull request #8358 from docker/6969-reponame-rest-api
...
Added validity checks for repo name and tag in build job
2014-10-02 14:22:57 -07:00
Tianon Gravi
0597b6445d
Optimize the bash completion even further
...
The biggest/bestest change here is cutting down on the number of calls to Docker in the filtering helpers (`__docker_containers_running`, etc), especially calls to the really heavy `docker images`.
Signed-off-by: Andrew Page <admwiggin@gmail.com >
2014-10-02 15:13:37 -06:00
Fred Lifton
36db0a30fa
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-10-02 14:08:39 -07:00
Michael Scharf
cbb81c30bd
add bash completion support for pause and unpause
...
Signed-off-by: Michael Scharf <github@scharf.gr >
2014-10-02 14:18:47 -06:00
Jessie Frazelle
f69a262464
Merge pull request #8213 from brahmaroutu/pull_status_2404
...
Print a status message when pull command is executed
2014-10-02 09:56:18 -07:00
Joffrey F
aabba9801a
Added validity checks for repo name and tag in build job.
...
Signed-off-by: Joffrey F <joffrey@docker.com >
2014-10-02 17:37:13 +02:00
Konrad Kleine
e08f22cdb2
Typo: changed "Maintainers" to "maintainers"
...
Signed-off-by: Konrad Kleine <konrad.wilhelm.kleine@gmail.com >
2014-10-02 08:43:30 +02:00
Derek McGowan
7c88e8f13d
Add provenance pull flow for official images
...
Add support for pulling signed images from a version 2 registry.
Only official images within the library namespace will be pull from the
new registry and check the build signature.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2014-10-01 18:26:06 -07:00
Ken Cochrane
7f261ebe6c
Fixed issue with docs not getting built due to ssl error.
...
Signed-off-by: Ken Cochrane <ken@docker.com >
2014-10-01 21:11:10 -04:00
Jessie Frazelle
7304c09ecc
Merge pull request #8346 from juliantaylor/mkimage-debootstrap
...
fix help message for mkimage debootstrap with components
2014-10-01 17:47:26 -07:00
Srini Brahmaroutu
ecff6303a3
Print a status message when pull command is executed
...
Using repo tag in the status message for better usability, as per review comments
Added documentation and Changed code to print Status after downloads are complete
Addresses #2404
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2014-10-01 22:55:29 +00:00
Michael Crosby
4c8b8861ec
Merge pull request #8350 from erikh/add_erikh_maintainer_proxy
...
Add erikh as maintainer of pkg/proxy
2014-10-01 15:50:41 -07:00
Erik Hollensbe
10efa07fa2
Add erikh as maintainer of pkg/proxy
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-10-01 15:37:46 -07:00
Fred Lifton
23221c5566
Merge pull request #8337 from tjwebb123/patch-1
...
Update host_integration.md
2014-10-01 15:37:02 -07:00
Julian Taylor
34672240b4
fix help message for mkimage debootstrap with components
...
debootstrap needs the suite as the second argument, for this the script
reorders arguments beginning with a minus but components separated by
space, as stated by the help message, is not handled and will lead to
the rootfs being passed as suite to debootstrap.
The poor mans solution is to fix the help message to pass the long
option as one argument.
Signed-off-by: Julian Taylor <jtaylor.debian@googlemail.com >
2014-10-01 23:18:23 +02:00
Derek McGowan
8a6c7100ea
Update libtrust version
...
Updated to version of libtrust with the trust graph implementation
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2014-10-01 13:19:40 -07:00
Vincent Batts
61c6f206b0
registry: getting Endpoint ironned out
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2014-10-01 13:19:40 -07:00
Fred Lifton
04251b3e54
Merge pull request #8316 from duglin/Issue4787
...
Add a note about using an open schema model - Issue #4787
2014-10-01 11:21:09 -07:00
Doug Davis
c8f3151aa6
Add a note about using an open schema model
...
Closes : #4787
Signed-off-by: Doug Davis <dug@us.ibm.com >
2014-10-01 11:05:12 -07:00
Fred Lifton
f852233a01
Merge pull request #8313 from duglin/Issue4877
...
Add missing "tag" parameter to tag API - Issue #4877
2014-10-01 10:34:57 -07:00
Alexandr Morozov
516c72d71b
Merge pull request #8340 from unclejack/bump_go_to_1.3.3
...
bump Go to 1.3.3
2014-10-01 08:08:12 -07:00
unclejack
4424d15f99
Merge pull request #8302 from rafecolton/move_archive_package_to_pkg
...
Move archive package to pkg
2014-10-01 18:03:34 +03:00
Adrien Folie
2c5b5cfc92
Add ENV variables support to WORKDIR build command
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com > (github: folieadrien)
Conflicts:
builder/builder.go
This file has been deleted.
2014-10-01 17:34:36 +03:00
unclejack
da34672de6
bump Go to 1.3.3
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-10-01 17:14:48 +03:00
tjwebb123
f10a08887e
Update host_integration.md
2014-10-01 14:51:47 +01:00
Konrad Kleine
12fe99ae47
Add registry_api_client_libraries.md to mkdocs.yml
...
Signed-off-by: Konrad Kleine <konrad.wilhelm.kleine@gmail.com >
2014-10-01 15:32:21 +02:00
Konrad Kleine
3446735a3e
Create registry_api_client_libraries.md
...
Signed-off-by: Konrad Kleine <konrad.wilhelm.kleine@gmail.com >
2014-10-01 15:20:49 +02:00
Andrea Luzzardi
3f2e4e94d7
Merge pull request #8266 from cpuguy83/fix_race_in_createing_volumes
...
Fix potential race in volume creation
2014-09-30 18:03:00 -07:00
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
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
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
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
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
Michael Crosby
392eec2075
Update libcontainer to c744f6470e37be5ce1f1ae09b84
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-09-29 21:23:42 +00:00
Doug Davis
83f0f46b7c
Add more info about when build cache is invalidated/used - Issue #3636
...
Plus some edits as suggested by @jamtur01
Closes #3636
Signed-off-by: Doug Davis <dug@us.ibm.com >
2014-09-29 14:13:39 -07:00
Pavlos Ratis
f90d201d88
improve docs for Gentoo Linux installation
...
Changes summary:
* Added available USE flags table(description included).
* Added some tips regarding the use of docker in the Gentoo environment.
* Sorted out docker installation ways.
* Added information about the newly created Gentoo Docker team.
* Misc improvements
Signed-off-by: Pavlos Ratis <dastergon@gentoo.org >
2014-09-29 23:59:43 +03:00
Doug Davis
8b3fbac15c
Fixes the new testcase for PR #8230
...
This new version makes sure that the same context is used for the two
builds run in the test. If you don't use the same build then about 1/2 the
time the file copied into the container will look like a different file,
probably due to timestamp differences. But reusing the same context we
re-use the same file on disk and therefore avoid the change in timestamps,
and we use the cache on the 2nd build.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2014-09-29 13:35:09 -07:00
Jessie Frazelle
826439c537
Merge pull request #8273 from duglin/Issue7941
...
Fix error paring null JSON - Issue7941
2014-09-29 12:59:34 -07:00
Tibor Vass
670c8696a2
Merge pull request #8284 from erikh/fix_cmd_again
...
builder: Fix CMD to inject /bin/sh -c when provided with a non-json value
2014-09-29 15:56:16 -04:00
Erik Hollensbe
9f142bf9be
builder: Fix CMD to inject /bin/sh -c when provided with a non-json value.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-09-29 12:22:18 -07:00
Jean-Paul Calderone
8e70d553f9
Document Volumes and Binds
...
Signed-off-by: Jean-Paul Calderone <jean-paul@clusterhq.com >
2014-09-29 14:59:48 -04:00
Alexandr Morozov
6cd8602827
Merge pull request #8047 from rhatdan/RemoveLocalDns
...
Remove nameserver 127.0.0.1 line rather then dumping resolv.conf
2014-09-29 11:58:27 -07:00
Brian Goff
8d7c7bd2e3
Fix potential race in volume creation
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-09-29 14:56:04 -04:00
James Turnbull
2682393ce1
Merge pull request #8227 from SvenDowideit/list-container-events
...
The list of events that 'grep' told me about
2014-09-29 14:34:48 -04:00
James Turnbull
1dae56c893
Merge pull request #8245 from filbranden/patch-1
...
Update google.md to point to latest container-vm version
2014-09-29 14:30:24 -04:00
Erik Hollensbe
1cd6135972
Merge pull request #8230 from duglin/Issue6820
...
add wildcard support to COPY/ADD (part 2 of issue #6820 )
2014-09-29 11:19:01 -07:00
Victor Vieux
22bd54be4a
Merge pull request #8276 from dqminh/8262-validate-build-tag
...
Fix #8262 : check tag's validity before building.
2014-09-29 10:57:54 -07:00
Michael Crosby
74dbea81d6
Merge pull request #8175 from hqhq/master
...
graph: add VirtualSize for inspect output
2014-09-29 10:50:28 -07:00
Vincent Batts
dab061bb64
Merge pull request #8282 from proppy/patch-10
...
api/server/MAINTAINERS: back from vacation
2014-09-29 13:12:06 -04:00
Johan Euphrosine
8019eec681
api/server/MAINTAINERS: back from vacation
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-09-29 10:03:07 -07:00
Erik Hollensbe
27c5269b4e
Merge pull request #8274 from tianon/parallel-shellshock
...
Move the body of go_compile_test_dir into a file since GNU Parallel breaks on sourcing exported Bash functions thanks to the shellshock fixes
2014-09-29 09:34:36 -07:00
James Turnbull
6fec88f0b3
Merge pull request #8246 from brahmaroutu/doc_resize_tty_7840
...
Documenting Container Tty resize api
2014-09-29 12:29:32 -04:00
James Turnbull
a9e31285b5
Merge pull request #8255 from rhatdan/execman
...
docker-exec man page is not created.
2014-09-29 12:20:14 -04:00
Dan Walsh
a297d6ab8c
Replace utils.CheckLocalDns with bytes.Contains line
...
Since RemoveLocalDns patch will remove all localhost entries
from resolv.conf we no longer need anything more then
!bytes.Contains(resolvConf, []byte("nameserver")
To check for no nameserver entry in dns config.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-09-29 06:37:31 -04:00
Dan Walsh
65640994fd
Remove nameserver 127.0.0.1 line rather then dumping resolv.conf
...
We have a bug report complaining about docker dumping the contents of the
hosts resolv.conf if it container 127.0.0.1. They asked that instead
of dropping the file altogether, that we just remove the line.
This patch removes the 127.0.0.1 lines, if they exist and then
checks if any nameserver lines exist.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-09-29 06:37:31 -04:00
Daniel, Dao Quang Minh
8833d800bf
check tag's validity before building.
...
When user passes an invalid tag to `docker build`
(i.e. `docker build -t abcd:A0123456789B0123456789C0123456789 .`), check the
tag first and terminate-early so user can specify the tag again
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com > (github: dqminh)
2014-09-29 06:21:54 -04:00
Tianon Gravi
8ffdf6022e
Move the body of go_compile_test_dir into a file since GNU Parallel breaks on sourcing exported Bash functions thanks to the shellshock fixes
...
Signed-off-by: Andrew Page <admwiggin@gmail.com >
2014-09-28 21:51:44 -06:00
Doug Davis
a7cd25b8b6
Fix error paring null JSON - Issue7941
...
Closes #7941
Treat a null in JSON, when reading the config of a container, as if the
property was never included. W/o this fix the null would be saved in the
property as a string with a value of "null".
Signed-off-by: Doug Davis <dug@us.ibm.com >
2014-09-28 19:51:00 -07:00
Michael Crosby
d142b18aab
Merge pull request #8260 from cpuguy83/8259_fix_bindmount_symlink_reuse
...
Fix #8259 - Can't reuse symlink'd bindmount
2014-09-26 16:37:56 -07:00
Derek McGowan
ea6a480128
Add libtrust key identity management
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2014-09-26 15:52:08 -07:00
Derek McGowan
a049ac32d1
Vendor libtrust
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2014-09-26 15:48:12 -07:00
Brian Goff
882223c0f8
Fix #8259 - Can't reuse symlink'd bindmount
...
volumes.Get was not checking for symlinked paths meanwhile when adding a
new volume it was following the symlink.
So when trying to use a bind-mount that is a symlink, the volume is
added with the correct path, but when another container tries to use the
same volume it got a "Volume exists" error because volumes.Get returned
nil and as such attempted to create a new volume.
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-09-26 14:36:44 -04:00
Michael Crosby
0bb5f98731
Merge pull request #8233 from tiborvass/pr-7658
...
Fix Interactive container hangs when redirecting stdout
2014-09-26 11:31:29 -07:00
Victor Vieux
bef8bad9d1
Merge pull request #8254 from unclejack/bump_go_to_1.3.2
...
bump Go to 1.3.2
2014-09-26 10:34:19 -07:00
Srini Brahmaroutu
c7f3fdc629
Documenting Container Tty resize api
...
Addresses #7840
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2014-09-26 16:26:21 +00:00
Tibor Vass
07da2e03b1
Merge pull request #8224 from cpuguy83/7843_fix_start_attach_error_hang
...
Fix #7843 start -a can cause frozen term
2014-09-26 11:54:39 -04:00
Brian Goff
9ae9d7db57
Fix #7843
...
When doing `docker start -a` on a container that won't start, terminal
was getting stuck on the attach, even after container removal.
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-09-26 11:31:02 -04:00
Dan Walsh
0a8fb80d99
docker-exec man page is not created.
...
docker-exec.md needs to be renamed in order to build man page.
Should be docker-exec.1.md
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-09-26 09:31:59 -04:00
unclejack
0f15221240
bump Go to 1.3.2
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-26 12:48:28 +03:00
James Turnbull
3151ecd7bb
Merge pull request #8252 from SvenDowideit/sven-oct-2014-pto
...
comment out my MAINTAINER line: Gone Camping
2014-09-25 23:46:26 -07:00
Sven Dowideit
afacaba79b
Gone Camping
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-09-26 14:28:39 +10:00
Doug Davis
acd40d5079
add wildcard support to copy/add
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2014-09-25 20:44:51 -07:00
SvenDowideit
71e28f9d64
Add the 2 image events found using git grep 'Job("log"'
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-09-26 11:55:36 +10:00
SvenDowideit
05060a7c94
The list of events that 'grep' told me about
...
docker(master) $ git grep 'LogEvent("' | sed 's/.*("//' | sed 's/").*//'
| sort | uniq | paste -s -d","
create,destroy,die,export,kill,pause,restart,start,stop,unpause
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-09-26 11:25:36 +10:00
Sven Dowideit
6df533adb4
Merge pull request #8209 from brahmaroutu/doc_dockerignore_7724
...
Adding details on how to use .dockerignore file
2014-09-26 10:53:36 +10:00
Victor Vieux
f721075283
Merge pull request #8237 from dmcgowan/tarsum_buffer_fix
...
tarsum: fix panic with dynamic buffer
2014-09-25 16:22:02 -07:00
Jessie Frazelle
0dfee56ca4
Merge pull request #8247 from aluzzardi/f-run-hostconfig
...
API: Provide the HostConfig during "run".
2014-09-25 16:09:55 -07:00
Derek McGowan
5cdf7f5077
pkg/tarsum: fix panic with dynamic buffer
...
When read is called on a tarsum with a two different read sizes, specifically the second call larger than the first, the dynamic buffer does not get reallocated causing a slice read error.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2014-09-25 15:58:35 -07:00
Victor Vieux
0913009ebe
Merge pull request #8191 from vieux/improve_error_exec_lxc
...
Improve error for docker exec & LXC
2014-09-25 15:58:21 -07:00
Andrea Luzzardi
1df87b9506
API: Provide the HostConfig during "run".
...
Currently, the HostConfig is only passed from the CLI to Docker only
when issuing a docker create, but not when doing a docker run.
In the near future, in order to allocate ports at creation time rather
than start time, we will need to have the HostConfig readily available
at container creation.
This PR makes the client always pass the HostConfig when creating a
container (regardless of whether it's for a run or create).
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2014-09-25 15:24:38 -07:00
Filipe Brandenburger
7c22b3d599
Update google.md to point to latest container-vm version
...
In order to match the version listed here:
https://cloud.google.com/compute/docs/containers/container_vms#starting_a_bare_container-vm_instance
2014-09-25 15:19:59 -07:00
Jessie Frazelle
1d8c66347e
Merge pull request #8241 from vbatts/vbatts-devmapper_version
...
devmapper: include the version in `info`
2014-09-25 14:53:43 -07:00
Erik Hollensbe
993033d67a
Merge pull request #8239 from erikh/hack_options
...
hack: TIMEOUT (for controlling test timeout) and forwarding of BUILDFLAGS to binary/dynbinary.
2014-09-25 14:36:00 -07:00
Jessie Frazelle
1156314589
Merge pull request #8243 from vieux/not_not
...
not not -> not
2014-09-25 14:35:26 -07:00
Erik Hollensbe
aa129b356f
hack: TIMEOUT (for controlling test timeout) and forwarding of
...
BUILDFLAGS to binary/dynbinary.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-09-25 14:25:43 -07:00
Victor Vieux
d19d800898
not not -> not
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-09-25 21:23:27 +00:00
Vincent Batts
5630d466b2
devmapper: include the version in info
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2014-09-25 15:51:02 -04:00
Srini Brahmaroutu
d7725ececa
Adding details on how to use .dockerignore file
...
Addresses #7724
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2014-09-25 12:48:17 -07:00
Tibor Vass
1379c6ec50
Merge pull request #8193 from jfrazelle/8141-pull-all-image-aliases-for-id
...
Pull all image aliases for id
2014-09-25 15:22:46 -04:00
Fred Lifton
d024a6a316
Merge pull request #8228 from SvenDowideit/latest-commandline-doc-changes
...
Updated output from the docker cli help
2014-09-25 12:03:10 -07:00
Tibor Vass
29a62ceefc
Add DockerCli tests
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-09-25 20:58:43 +02:00
Vojtech Vitek (V-Teq)
d742c57f53
DockerCli: Check IsTerminal() for both STDIN and STDOUT
...
`docker events > /tmp/out` should not print control
characters to non-terminal STDOUT.
This addresses commit 26b4a4920a#6509 .
Signed-off-by: Vojtech Vitek (V-Teq) <vvitek@redhat.com >
2014-09-25 20:58:24 +02:00
Victor Vieux
e2728d9892
Merge pull request #8235 from duglin/Issue2515
...
Add checks for app/json - issue #2515
2014-09-25 11:56:31 -07:00
Jessica Frazelle
7d74be162c
Pull all image aliases for id. Closes #8141 .
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-09-25 11:48:49 -07:00
Victor Vieux
857b739e29
Merge pull request #8208 from estesp/7851-fix-hostname-fqdn
...
Provide full hostname with domainname to underlying container layer
2014-09-25 11:33:50 -07:00
Vojtech Vitek (V-Teq)
40c7b53791
Fix #6509 : Interactive container hangs when redirecting stdout
...
Cli IsTerminal() SYS_IOCTL operation should be determined from STDIN,
not from STDOUT.
Signed-off-by: Vojtech Vitek (V-Teq) <vvitek@redhat.com >
2014-09-25 20:14:25 +02:00
Tibor Vass
d369612b41
Merge pull request #7994 from erikh/parser_fix_volume_parsing
...
builder: Fix handling of VOLUME command where multiple volumes are specified in a space delimited list.
2014-09-25 12:45:48 -04:00
Erik Hollensbe
a5ca549a18
builder: Fix handling of VOLUME command where multiple volumes are
...
specified in a space delimited list.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-09-25 09:44:19 -07:00
Doug Davis
e2b8d4bd4a
Add checks for app/json - issue #2515
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2014-09-25 08:54:48 -07:00
Phil Estes
5239ba3d06
Provide full hostname with domainname to underlying container layer
...
Addresses #7851
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2014-09-25 09:23:39 -04:00
SvenDowideit
cb6b196ab4
Updated output from the docker cli help
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-09-25 16:07:55 +10:00
Sven Dowideit
4547b6d529
Merge pull request #8205 from sequenceiq/master
...
Fix code example formatting in best-practices article
2014-09-25 12:34:36 +10:00
Sven Dowideit
2431345639
Merge pull request #8212 from hugoduncan/patch-1
...
Fix quoting of TESTFLAGS in devenvironment.md
2014-09-25 12:34:12 +10:00
Tibor Vass
3fa0ed0142
Merge pull request #8195 from tiborvass/migrate-get.docker.io
...
Replace get.docker.io -> get.docker.com and test.docker.io -> test.docker.com
2014-09-24 19:06:09 -04:00
Tibor Vass
808257654a
Replace get.docker.io -> get.docker.com and test.docker.io -> test.docker.com
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-09-24 18:53:27 -04:00
Victor Vieux
a936842208
Merge pull request #8207 from LK4D4/rewrite_more_fixtures_test
...
Rewrite more fixtures test to not use fixtures.
2014-09-24 15:07:03 -07:00
Andrea Luzzardi
4479d69d56
Merge pull request #8200 from aluzzardi/f-ipallocator-check-range
...
IPAllocator: Ensure the allocated IPs are within network range.
2014-09-24 14:29:39 -07:00
Andrea Luzzardi
a471eb4d93
IPAllocator: Ensure the allocated IPs are within network range.
...
Since it is possible to request a specific IP, IPAllocator has to verify
that the request is within boundaries.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2014-09-24 11:04:28 -07:00
unclejack
f2fad5c290
Merge pull request #8173 from crosbymichael/update-mem-limit
...
Update memory limit for container
2014-09-24 20:55:25 +03:00
Hugo Duncan
7aa88a4ff6
Fix quoting of TESTFLAGS in devenvironment.md
...
Copy and pasting the example should now work, rather than TESTFLAGS being silently ignored.
2014-09-24 13:30:39 -04:00
Victor Vieux
75ecfdd63c
Merge pull request #8182 from LK4D4/logjson_benchmark
...
pkg/logjson benchmark and test
2014-09-24 10:00:22 -07:00
Alexandr Morozov
d302d92961
Rewrite TestContextTar tests to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-24 17:09:18 +04:00
Alexandr Morozov
51a56399f6
Rewrite TestBuildWithInaccessibleFilesInContext to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-24 17:09:14 +04:00
Alexandr Morozov
52cf331206
Rewrite TestBuildRm to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-24 13:15:55 +04:00
Lajos Papp
be4454c4f0
Fix code example formatting in best-practices article
...
Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com >
2014-09-24 10:45:56 +02:00
Alexandr Morozov
ab4738b49f
Rewrite TestBuildHistory to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-24 12:38:48 +04:00
Alexandr Morozov
1625cbfc4c
Rewrite TestBuildForceRm to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-24 12:29:27 +04:00
Fred Lifton
8dd11c7175
Merge pull request #8197 from fredlf/adding_official-repo-guidelines
...
Docs for Official Repo release
2014-09-23 20:55:07 -07:00
Fred Lifton
f68f5fd521
Merge pull request #8157 from SvenDowideit/sshd-pam-fix
...
Fix for user kicked off after login on some hosts
2014-09-23 20:42:27 -07:00
Fred Lifton
a1609a7324
Merge pull request #8178 from SvenDowideit/systemd-example-moved
...
That Systemd example URL isn't there anymore
2014-09-23 20:41:13 -07:00
Fred Lifton
950eccab4a
Revisions and edits based on feedback.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-09-23 18:26:02 -07:00
Victor Vieux
827634d355
Merge pull request #7973 from LK4D4/persist_execdriver_dir
...
Persist execdriver dir
2014-09-23 16:01:03 -07:00
Fred Lifton
6747dfc803
Typo and formatting fixes. Copy edits.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-09-23 15:51:17 -07:00
Tibor Vass
b12f3a6cca
Merge pull request #8192 from unclejack/lower_timeout_integ
...
integration: lower timeout for stop/restart tests
2014-09-23 18:46:58 -04:00
unclejack
6a5f09b752
integration: lower timeout for stop/restart tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-24 01:20:41 +03:00
Victor Vieux
81a643211b
Merge pull request #8186 from duglin/ErrInCopyCache
...
Make sure COPY/ADD on dirs doesn't grab too many files
2014-09-23 15:16:57 -07:00
Tibor Vass
27567e5593
Merge pull request #8187 from erikh/builder_onbuild_output
...
builder: properly communicate onbuild trigger information during subsequent builds.
2014-09-23 18:04:59 -04:00
Victor Vieux
ab30e19b96
Improve error for docker exec & LXC
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-09-23 21:47:33 +00:00
Fred Lifton
d9fd5f6199
Adding new Dockerfile Best Practices doc, and links thereto.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-09-23 14:21:00 -07:00
Doug Davis
cd329d062b
Make sure COPY/ADD on dirs doesn't grab too many files
...
Add check for / first - per LK4D4's comment.
Add a comment to explain why we're adding a /
Signed-off-by: Doug Davis <dug@us.ibm.com >
2014-09-23 14:16:00 -07:00
Erik Hollensbe
8edacc673a
builder: properly communicate onbuild trigger information during
...
subsequent builds.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-09-23 13:55:51 -07:00
Victor Vieux
42ec80bec0
Merge pull request #8101 from jfrazelle/6974-correct-ct-json-stream
...
Change content-type for json stream to application/x-json-stream.
2014-09-23 11:24:31 -07:00
Tibor Vass
e3f1f0d354
Merge pull request #8170 from duglin/Issue7547
...
Allow user to change email/passwd via login - Issue 7547
2014-09-23 13:57:56 -04:00
Tibor Vass
5ce7ee61ef
Merge pull request #8179 from erikh/parser_fix_cmd_null
...
Parser fix cmd null
2014-09-23 13:42:55 -04:00
Victor Vieux
f2bc723bc6
Merge pull request #8181 from rhatdan/selinux_btrfs
...
--selinux-enabled flag should be ignored on Disabled SELinux systems
2014-09-23 10:31:19 -07:00
Michael Crosby
437fa0650e
Merge pull request #8165 from duglin/Issue7309
...
If the Rename during an image delete fails, just delete the original dir - Issue #7309
2014-09-23 10:28:48 -07:00
Dan Walsh
9e2eb0f1cc
--selinux-enabled flag should be ignored on Disabled SELinux systems
...
On Fedora and RHEL we ship selinux-enabled flag in the docker.service config,
but if people setup the /var/lib/docker as btrfs and disable SELinux,
we should not block the daemon from running.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-09-23 13:21:25 -04:00
Victor Vieux
7e461915a6
Merge pull request #8168 from LK4D4/rewrite_fixture_tests
...
Rewrite some tests to not use fixtures
2014-09-23 10:02:59 -07:00
Tibor Vass
5c110b63dd
Merge pull request #8127 from estesp/8107-fix-wait-error-return
...
Fix container wait error message to match server template for returning ...
2014-09-23 12:03:39 -04:00
Alexandr Morozov
2add198a7a
Test for jsonlog.WriteLog
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-23 19:19:25 +04:00
Alexandr Morozov
0c899cefdd
Rewrite TestBuildAddWholeDirToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-23 18:58:32 +04:00
Alexandr Morozov
570f1153b9
Rewrite TestBuildAddEtcToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-23 18:58:28 +04:00
Tibor Vass
9941b03af1
Merge pull request #8172 from vbatts/vbatts-devmapper_fix_devicset_status_devices
...
devmapper: `docker info` devices hard coded
2014-09-23 10:28:31 -04:00
Alexandr Morozov
81c9927f8f
Benchmark for jsonlog.WriteLog
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-23 18:24:18 +04:00
Alexandr Morozov
c58391bbd0
Rewrite TestBuildAddDirContentToExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-23 15:15:58 +04:00
Alexandr Morozov
2d802d7f23
Rewrite TestBuildAddDirContentToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-23 15:15:58 +04:00
Alexandr Morozov
139b6ed3aa
Rewrite TestAddSingleFileToNonExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-23 15:15:58 +04:00
Alexandr Morozov
6bb44b6d74
Rewrite TestAddSingleFileToExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-23 15:15:58 +04:00
Alexandr Morozov
5e2ea69606
Rewrite TestAddSingleFileToWorkdir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-23 15:15:58 +04:00
Alexandr Morozov
682fbe0134
Rewrite TestAddSingleFileToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-23 15:15:09 +04:00
Alexandr Morozov
3824ec62e8
Rewrite TestBuildSixtySteps to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-23 15:15:09 +04:00
Erik Hollensbe
d1613e1d59
builder: integration-cli test for the previous commit.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-09-22 23:18:46 -07:00
Erik Hollensbe
1e93639aed
builder: Appropriately initialize the Cmd in runconfig.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-09-22 23:10:05 -07:00
Sven Dowideit
46319a5c33
That URL isn't there anymore
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-09-23 15:04:00 +10:00
Doug Davis
86a3a9a282
if the Rename during an image delete fails, just delete the original dir
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2014-09-22 18:47:20 -07:00
Tianon Gravi
3ea5a20776
Merge pull request #8094 from smerrill/feature/avoid-docker-start-woes
...
Try to avoid issues when the Docker daemon restarts or stops on RHEL/CentOS 6
2014-09-22 19:06:51 -06:00
Qiang Huang
ec000cbf30
graph: add VirtualSize for inspect output
...
Currently inspect output just shows Size info, and that usally be
very small and even 0 which is confusing.
Fixes #8016
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2014-09-23 08:42:32 +08:00
Sven Dowideit
513f5a358a
Merge pull request #8156 from SvenDowideit/tedyoung-patch-1
...
Misc. fixes and formatting clean-up
2014-09-23 10:16:05 +10:00
Sven Dowideit
ab43ad7d5f
Apply @tedyoung's changes to the entire set of API docs.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-09-23 10:09:49 +10:00
Ted M. Young
f304d4b190
Misc. fixes and formatting clean-up
...
Cleaned up and corrected some invalid "example responses".
Added some missing double-quotes for examples that resulted in invalid JSON.
Other general cleanup of stray characters and typos.
Docker-DCO-1.1-Signed-off-by: Ted M. Young <tedyoung@gmail.com > (github: SvenDowideit)
2014-09-23 10:09:49 +10:00
Victor Vieux
99caa68a46
Merge pull request #7564 from unclejack/integcli-add_utils
...
integration cli: add some utility functions and use them
2014-09-22 17:00:01 -07:00
Sven Dowideit
60f6b0299a
Merge pull request #8123 from dcro/docs-clarifications
...
Updated the documentation to to clarify random port mapping when using -...
2014-09-23 09:57:19 +10:00
Michael Crosby
9b755412ab
Update memory limit for container
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-09-22 21:41:14 +00:00
Vincent Batts
636e8561a8
devmapper: resizepool hardcodes files as well
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2014-09-22 17:03:31 -04:00
Vincent Batts
7e9ba22dc3
devmapper: docker info devices hard coded
...
If `--storage-opt dm.datadev=/dev/loop0 --storage-opt
dm.metadatadev=/dev/loop1 ` were provided, the information was not
reflected in the information output.
Closes : #7137
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2014-09-22 16:40:20 -04:00
Alexandr Morozov
4778d7d52d
Merge pull request #8125 from somaopensource/8102-fix
...
Check whether net.ParseIP returned nil or not
2014-09-22 23:00:25 +04:00
Doug Davis
e315493b0c
Allow user to change email/passwd via login
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2014-09-22 11:58:09 -07:00
Alexandr Morozov
652cd6a842
Test on execdriver dir behavior
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-09-22 22:49:21 +04:00
Alexandr Morozov
623ebf203b
Persistent directory for container in execdriver
...
This is needed for persistent namespaces
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-09-22 22:48:26 +04:00
unclejack
06d0853682
Merge pull request #8169 from unclejack/avoid_attach_alloc
...
daemon/attach: avoid mem alloc for interface
2014-09-22 21:29:50 +03:00
unclejack
950bfe4193
daemon/attach: avoid mem alloc for interface
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-22 21:17:50 +03:00
Victor Vieux
350b1cf6ea
Merge pull request #5956 from vbatts/vbatts-tarsum_hashes
...
tarsum: allow for generic hashes
2014-09-22 11:11:25 -07:00
unclejack
c6965e3e45
integcli: add & use dockerCmdWithTimeout & InDir
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-22 21:02:51 +03:00
Victor Vieux
28e308c25e
Merge pull request #7942 from estesp/7747-stderr-stdout-bug
...
Fix gh#7747: filter bare newline output and log client pull to stdout
2014-09-22 10:53:34 -07:00
unclejack
5d1cb9d005
integcli: add util to fetch container status
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-22 20:34:57 +03:00
unclejack
97b50e0f29
integcli: consolidate cmd exit code processing
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-22 20:32:50 +03:00
Jessica Frazelle
10ab2089ce
Change content-type for json stream to application/x-json-stream.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-09-22 10:29:56 -07:00
Tibor Vass
ac75835931
Merge pull request #8109 from unclejack/avoid_jsonlog_alloc
...
daemon/logs: avoid JSONLog struct alloc in loop
2014-09-22 12:53:31 -04:00
unclejack
c8f5c686a5
Merge pull request #8166 from unclejack/integcli_pull_scratch
...
integcli: pull scratch for pull test
2014-09-22 19:16:30 +03:00
unclejack
77d29847e2
integcli: pull scratch for pull test
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-22 19:03:19 +03:00
unclejack
d2c104c3a0
daemon/logs: lower allocations in loop
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-22 18:57:28 +03:00
unclejack
473bb5274c
pkg/jsonlog: avoid JSONLog allocation in loop
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-22 18:57:28 +03:00
Tibor Vass
9c7d975614
Merge pull request #8159 from LK4D4/fix_goroutine_leak_in_logs
...
Fix goroutine leak in logs following
2014-09-22 11:16:48 -04:00
Alexandr Morozov
1df4255102
Merge pull request #8164 from unclejack/fix_utils_race
...
integcli: fix race in runCommandWithStdoutStderr
2014-09-22 19:14:40 +04:00
unclejack
c69896d8a0
integcli: fix race in runCommandWithStdoutStderr
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-22 17:53:12 +03:00
Tibor Vass
3c03506cc2
Merge pull request #8121 from bbinet/cleanup-hello-world-container
...
Automatically clean up hello-world container with --rm
2014-09-22 10:52:50 -04:00
unclejack
9fb34ae571
Merge pull request #6101 from LK4D4/ip_range_#4986
...
Implement allocating IPs from CIDR within bridge network
2014-09-22 17:09:16 +03:00
Alexandr Morozov
5ad82d3ea6
Merge pull request #8137 from jfrazelle/8135-event-log-die-start-fail
...
After container fails to start, log the event die.
2014-09-22 12:47:04 +04:00
Oh Jinkyun
c2dc4245f1
Check whether net.ParseIP returned nil or not
...
This is fix of #8102
Signed-off-by: Oh Jinkyun <tintypemolly@gmail.com >
2014-09-22 16:52:23 +09:00
Alexandr Morozov
a7ee201ee8
Close logs pipes and catch write errors
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-22 10:55:46 +04:00
Alexandr Morozov
fd3f2e175f
Change unused WriteCloser to Writer
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-22 10:54:58 +04:00
Dan Cotora
a8775d2f9a
Doc update to clarify random port mapping on docker run -P
...
Signed-off-by: Dan Cotora <d@bluevision.ro >
2014-09-22 08:39:09 +03:00
SvenDowideit
7faa43d707
Fix for user kicked off after login on some hosts
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-09-22 13:33:38 +10:00
Sven Dowideit
27226d47c1
Merge pull request #8124 from jyrkiput/patch-1
...
Fix detaching from attached container
2014-09-22 09:28:10 +10:00
Sven Dowideit
23fdbbfee4
Merge pull request #8151 from shazow/sort-exec-docs
...
Cleanup: Fixed cli docs' command header sorting
2014-09-22 09:21:38 +10:00
Andrey Petrov
c5805c8772
Cleanup: Fix cli docs: Sorted command headers.
...
Signed-off-by: Andrey Petrov <andrey.petrov@shazow.net >
2014-09-20 18:10:11 -07:00
Alexandr Morozov
e7a9662974
Merge pull request #7972 from cpuguy83/split_volumes_from_daemon
...
Split volumes out from daemon
2014-09-20 16:23:20 +04:00
Alexandr Morozov
f8c998c605
Merge pull request #8144 from crosbymichael/reduce-logging
...
This reduces the amount of logging in the integration tests
2014-09-20 11:17:03 +04:00
Michael Crosby
8a9e827216
This reduces the amount of logging in the integration tests
...
There were a new areas in the brige driver that did not need to have log
output. Those were removed. Also set the engine's logging to false
when running the integration tests.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-09-19 17:30:37 -07:00
Jessica Frazelle
d64d55eca8
After container fails to start, log the event die.
...
Fixes #8135 .
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-09-19 16:06:49 -07:00
Jessie Frazelle
11446d30f7
Merge pull request #8139 from aluzzardi/fix-drone-integration-goenv
...
Fix drone integration
2014-09-19 16:05:52 -07:00
Brian Goff
45407cf00a
Split volumes out from daemon
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-09-19 17:47:47 -05:00
Andrea Luzzardi
07cedaab86
Drone Config: Disable integration-cli/docker_cli_exec_test as it breaks.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2014-09-19 15:40:48 -07:00
Andrea Luzzardi
72fe4c8daa
Drone Config: Use AUTO_GOPATH instead of hacking around.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2014-09-19 15:20:35 -07:00
Jessie Frazelle
ba726d9148
Merge pull request #8129 from vbatts/vbatts-archive_comments
...
archive: adding comment to exported functions
2014-09-19 14:36:52 -07:00
Tianon Gravi
77193089d8
Merge pull request #8130 from aluzzardi/f-drone-integration
...
Add drone.io configuration
2014-09-19 14:59:40 -06:00
Tibor Vass
7fafe170cf
Merge pull request #8133 from crosbymichael/update-libcontainer-sep7
...
Update libcontainer to 185328a42654f6dc9a41814e578
2014-09-19 14:58:51 -04:00
Michael Crosby
63c8b8bf30
Merge pull request #8131 from unclejack/fix_perm_detection
...
integcli: fix permission detection for aufs
2014-09-19 11:55:56 -07:00
Jessie Frazelle
a8e964ebb2
Merge pull request #8134 from LK4D4/prefix_naming_cli
...
Prefix naming integration-cli tests
2014-09-19 11:54:04 -07:00
Michael Crosby
c41bc79098
Merge pull request #8118 from tiborvass/merge-8031
...
FIX 6613:launch docker fail with space named drive (squashed commits from 8031)
2014-09-19 11:44:43 -07:00
Michael Crosby
2531fba389
Update libcontainer to 185328a42654f6dc9a41814e578
...
Mac address support to the netlink pkg.
Cgroup performance and memory issues.
Netlink refactoring.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-09-19 11:21:44 -07:00
Erik Hollensbe
41f2b3c6bc
Merge pull request #8128 from bfirsh/two-level-cli-commands
...
Add support for multiple level CLI commands
2014-09-19 11:14:36 -07:00
Alexandr Morozov
2e2422b0eb
Use prefix naming for rmi tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-19 22:11:54 +04:00
Alexandr Morozov
cc54b77fce
Use prefix naming for rm tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-19 22:11:54 +04:00
Alexandr Morozov
1ddd013b19
Use prefix naming for restart tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-19 22:11:54 +04:00
Alexandr Morozov
00b82fcab6
Use prefix naming for ps tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-19 22:11:54 +04:00
Alexandr Morozov
6e8c9e7bee
Use prefix naming for port tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-19 22:11:54 +04:00
Alexandr Morozov
b6325907e9
Use prefix naming for links tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-19 22:11:54 +04:00
Alexandr Morozov
27a27b7388
Use prefix naming for create tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-19 22:11:54 +04:00
Alexandr Morozov
66cd3640f1
Use prefix naming for build tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-19 22:11:50 +04:00
unclejack
1a0347ff1d
integcli: fix permission detection for aufs
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-19 21:08:57 +03:00
Vincent Batts
0fe56ce1b9
archive: adding comment to exported functions
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2014-09-19 14:02:12 -04:00
Andrea Luzzardi
ed072ed71d
Add drone.io configuration
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2014-09-19 11:00:28 -07:00
Alexandr Morozov
f312f784e1
Use prefix naming for attach tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-19 21:56:25 +04:00
Alexandr Morozov
3812a6a846
Use prefix naming for inspect tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-19 21:56:25 +04:00
Alexandr Morozov
9720078f9e
Use prefix naming for events test
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-19 21:56:25 +04:00
Alexandr Morozov
aa536b27a7
Use prefix naming for docker_cli_run_test.go
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-19 21:56:24 +04:00
Ben Firshman
e1b968f198
Add support for multiple level CLI commands
...
E.g. "docker groups create" will attempt to call the function
CmdGroupsCreate
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-09-19 10:43:50 -07:00
Phil Estes
be6bce6ab8
Fix container wait error message to match server template for returning 404
...
Addresses #8107
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com >
2014-09-19 13:33:00 -04:00
Jyrki Puttonen
1d2a1598c5
Fix detaching from attached container
...
Text was copied from man-pages https://raw.githubusercontent.com/docker/docker/master/docs/man/docker-attach.1.md
Signed-off-by: Jyrki Puttonen <jyrkiput@gmail.com >
2014-09-19 19:34:05 +03:00
Guillaume Dufour
acea488eb6
FIX 6613:launch docker fail with space named drive
...
Signed-off-by: Guillaume Dufour <guillaume.duff@gmail.com >
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-09-19 12:07:53 -04:00
Erik Hollensbe
e91de29e08
Merge pull request #8076 from duglin/MultiCopyAdd
...
Add support for copy/add with multiple src files
2014-09-19 09:01:29 -07:00
Bruno Binet
d78936b418
Automatically clean up hello-world container with --rm
...
Signed-off-by: Bruno Binet <bruno.binet@gmail.com >
2014-09-19 12:22:39 +02:00
Sven Dowideit
39ed048aab
Merge pull request #8091 from jfrazelle/exec-main-manpage
...
Add docker-exec to main manpage
2014-09-19 16:17:11 +10:00
James Turnbull
742eb7e001
Merge pull request #8116 from SvenDowideit/use-boot2docker-shellinit
...
boot2docker shellinit will set any and all env vars needed.
2014-09-19 00:46:15 -04:00
Doug Davis
05b8a1eb36
Add support for copy/add with multiple src files
...
Part one of solution for issue #6820
Signed-off-by: Doug Davis <dug@us.ibm.com >
2014-09-18 20:12:13 -07:00
Michael Crosby
72e9015591
Merge pull request #7694 from eyakubovich/master
...
Add an option to disable IP masquerading
2014-09-18 18:33:45 -07:00
Michael Crosby
d5537e0f03
Merge pull request #6950 from jfrazelle/6831-check-flag-centos6.5
...
Fix duplicate iptables rules
2014-09-18 17:51:15 -07:00
Sven Dowideit
82aa895c6d
Merge pull request #8061 from SvenDowideit/document-image-tarball-format
...
Add a little description of the image tarball format.
2014-09-19 10:32:13 +10:00
Jessie Frazelle
031231b5ed
Merge pull request #8111 from acroca/master
...
Grammar fix
2014-09-18 17:27:24 -07:00
Sven Dowideit
7797572249
boot2docker shellinit will set any and all env vars needed.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-09-19 10:20:12 +10:00
Albert Callarisa
4e11902d05
'an file' -> 'a file' grammar fix
...
Signed-off-by: Albert Callarisa Roca <albert@acroca.com >
2014-09-19 08:12:33 +08:00
Alexandr Morozov
e909bbccc3
Merge pull request #8115 from vishh/exec_panic_fix
...
Initialize execStore while restoring a container from checkpoint.
2014-09-19 02:22:51 +04:00
Jessica Frazelle
42dafe4bd8
test for panic on daemon restart
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-09-18 21:54:42 +00:00
Vishnu Kannan
003afaf1ce
Initialize execStore while restoring a container from checkpoint.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
2014-09-18 21:40:53 +00:00
Vincent Batts
4e9925d780
tarsum: allow for alternate block ciphers
...
Not breaking the default cipher and algorithm for calculating checksums,
but allow for using alternate block ciphers during the checksum
calculation.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-09-18 10:34:58 -04:00
Steven Merrill
640d2ef6f5
Try to avoid issues when the Docker daemon restarts.
...
This change will allow the Docker daemon's init script to wait up to 5
minutes before being forcibly terminated by the initscript. Many
non-trivial containers will take more than the default 3 seconds to
stop, which can result in containers whose rootfs is still mounted and
will not restart when the daemon starts up again, or worse, orphan
processes that are still running.
Signed-off-by: Steven Merrill <steven.merrill@gmail.com >
2014-09-18 08:21:00 -04:00
unclejack
db5edfb748
Merge pull request #8105 from LK4D4/build_test_little_fix
...
Little fixes in cli build tests
2014-09-18 10:32:10 +03:00
Alexandr Morozov
184fe67bbc
Add Build prefix to Copy tests
...
Now we can do "-run TestBuild" to test all build-tests and "-run
TestBuildCopy" for test all copy-tests
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-18 09:09:10 +04:00
Alexandr Morozov
aa0449c813
Fix logDone message for TestCopySingleFileToExistDir
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-18 09:02:05 +04:00
Frederick F. Kautz IV
3bb12d390a
Adding additional documentation for fixed-cidr networking
...
Docker-DCO-1.1-Signed-off-by: Frederick F. Kautz IV <fkautz@alumni.cmu.edu > (github: fkautz)
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-18 08:48:24 +04:00
Sven Dowideit
db9f8ba55c
Add a little description of the image tarball format.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-09-18 10:40:55 +10:00
Sven Dowideit
e9b5acba4b
Merge pull request #8081 from abh1nav/master
...
Update remote_api_client_libraries.md
2014-09-18 10:24:53 +10:00
Sven Dowideit
c7c78acf81
Merge pull request #8025 from davidpelaez-forks/docs-fix
...
Improved X-Registry-Auth content instructions
2014-09-18 09:54:25 +10:00
Michael Crosby
f8be5f586f
Merge pull request #8097 from erikh/builder_maintainers
...
Add a new MAINTAINERS file for the builder.
2014-09-17 15:42:34 -07:00
Erik Hollensbe
1ff1befd12
Add a new MAINTAINERS file for the builder.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-09-17 15:36:04 -07:00
Michael Crosby
77d30e7112
Merge pull request #8041 from unclejack/lower_allocations_broadcastwriter
...
lower the number of allocations in broadcastwriter
2014-09-17 15:26:44 -07:00
Tibor Vass
12f522ac65
Merge pull request #8095 from jfrazelle/cp-parse-subcommand-rebase
...
Removed runconfig.ParseSubcommand
2014-09-17 18:04:28 -04:00
Oh Jinkyun
9aa71549d6
Removed runconfig.ParseSubcommand
...
Removed runconfig.ParseSubcommand, changed it to runconfig.Parse and editted related tests and modules
Signed-off-by: Oh Jinkyun <tintypemolly@gmail.com >
2014-09-17 14:38:22 -07:00
unclejack
458b019e62
Merge pull request #7889 from vbatts/vbatts-tarsum_name_collision
...
tarsum: name collision fix
2014-09-17 21:59:39 +03:00
Jessica Frazelle
fc75ade4f8
Add docker-exec to main manpage
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-09-17 11:46:49 -07:00
Vincent Batts
c5e6362c53
tarsum: name collision fix
...
If a tar were constructed with duplicate file names, then depending on
the order, it could result in same tarsum.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2014-09-17 14:37:46 -04:00
Alexandr Morozov
c171cf0cc3
Merge pull request #8088 from unclejack/integcli-keep_permissions
...
integcli: run inaccessible context test in tmpdir
2014-09-17 22:06:26 +04:00
unclejack
be924087eb
integcli: run build tests in tmpdir
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-17 20:05:33 +03:00
Tibor Vass
8b97e2c287
Merge pull request #8084 from unclejack/improve_stdcopy
...
stdwriter: improve perf by avoiding buffer growth
2014-09-17 12:47:00 -04:00
Jessie Frazelle
129da8f842
Merge pull request #8085 from tianon/hack-install-location
...
Add "hack/install.sh" to the "PRs welcome" note in the end of the install script
2014-09-17 09:20:33 -07:00
unclejack
2f6b1d7f4e
Merge pull request #6 from LK4D4/benchmark_for_8084
...
Benchmark for StdWriter.Write
2014-09-17 18:39:46 +03:00
Alexandr Morozov
55cac6c942
Benchmark for StdWriter.Write
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-09-17 19:24:07 +04:00
unclejack
277aa9c674
stdcopy: improve perf by avoiding buffer growth
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-17 18:06:17 +03:00
unclejack
1f03e60c2a
move stdcopy to pkg/stdcopy
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-17 18:06:17 +03:00
Tianon Gravi
adb6910095
Add "hack/install.sh" to the "PRs welcome" note in the end of the install script
...
Also, simplified the output method by using `cat >&2 <<EOF ...` instead of multiple lines of `echo >&2 '...'`.
Signed-off-by: Andrew Page <admwiggin@gmail.com >
2014-09-17 08:09:39 -06:00
Tianon Gravi
459b403c2f
Merge pull request #8083 from unclejack/install_apparmor
...
hack/install.sh: install apparmor when enabled
2014-09-17 08:05:29 -06:00
unclejack
9851e8c4c1
use custom marshalling for JSONLog
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-17 17:03:54 +03:00
Tianon Gravi
bcf7ca0731
Merge pull request #8080 from SvenDowideit/test-for-ext4-fs-kernel-options
...
It seems that we need these 2 options enabled for both aufs and devicema...
2014-09-17 08:01:20 -06:00
unclejack
9ae3134dc9
add the timeutils package
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-17 14:30:08 +03:00
unclejack
9619ce9dd1
hack/install.sh: install apparmor when enabled
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-17 12:13:31 +03:00
Abhinav Ajgaonkar
ad65930d0b
Update remote_api_client_libraries.md
...
Ordering all clients alphabetically, by language.
Including all available languages in `page_keywords`.
Signed-off-by: Abhinav Ajgonkar <abhinav316@gmail.com >
2014-09-17 03:42:57 -04:00
Sven Dowideit
b7259dc6d4
It seems that we need these 2 options enabled for both aufs and devicemapper drivers when running on EXT4 - so test for them
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-09-17 17:03:58 +10:00
Tianon Gravi
41e625eb7c
Merge pull request #8001 from jfrazelle/fix-key-for-test-release-ubuntu
...
use correct apt-key for test.docker.io/ubuntu
2014-09-17 00:06:57 -06:00
Fred Lifton
b03f506303
Merge pull request #8073 from ClusterHQ/7743-restart-policy-api-doc
...
Add some documentation for the RestartPolicy feature.
2014-09-16 20:06:55 -07:00
Eugene Yakubovich
4dc4d56db9
Add an option to disable IP masquerading
...
For the cases where --bip option is used it is sometimes best to disable
IP masquerading as the provided bridge IP range may be routable.
Signed-off-by: Eugene Yakubovich <eugene.yakubovich@coreos.com >
2014-09-16 20:00:15 -07:00
David Pelaez
8c2b170c6e
Improved X-Registry-Auth content instructions
...
Hi,
this is a small contribution to fix some slightly unprecise information about the `X-Registry-Auth` header required to pull from private registries through the remote API. After a lot of trial and I error I managed to find that the documentation indications had this issues:
* Apparently single quotes cannot be used and double quotes (regular JSON) is required.
* Also the `auth` key must be passed even if empty or a 403 will result.
* It was not clear what the `serveraddress` had to be.
I added some small clarifications for anyone taking a look at the docs to keep them from the problems I've encountered. Hope this is helpful.
Thanks to all the contributors for bringing so much awesomeness to the linux world. :)
Signed-off-by: David Pelaez Tamayo <hello@davidpelaez.me >
2014-09-16 19:20:47 -05:00
Jessie Frazelle
f98a1f1f7d
Merge pull request #8019 from thockin/add-host
...
Allow extra lines in /etc/hosts
2014-09-16 17:19:16 -07:00
Tim Hockin
68e48b65a6
Allow extra lines in /etc/hosts
...
This adds a --add-host host:ip flag which appends lines to /etc/hosts. This is needed in places where you want the container to get a different name resolution than it would through DNS. This was submitted before as #5525 , closed, and now I am re-opening. It has come up 2 or 3 times in the last couple days.
Signed-off-by: Tim Hockin <thockin@google.com >
2014-09-16 23:38:23 +00:00
Alexandr Morozov
ca39a3e36b
Merge pull request #7110 from tiborvass/merge-6907
...
Docker create (rebase of 6907)
2014-09-17 03:23:50 +04:00
Tibor Vass
37b3b34afa
Merge pull request #7989 from jlhawn/graphdriver_differ_refactor
...
Refactor use of graphdriver.Differ
2014-09-16 18:58:38 -04:00
Alexandr Morozov
ffbd8fe5b9
Merge pull request #8068 from jfrazelle/cleanup-various-fix-me-refs
...
Cleanup various fix me refs
2014-09-17 02:54:54 +04:00
Tibor Vass
e49c701092
Resolve conflicts with restart policies
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-09-16 18:40:25 -04:00
SvenDowideit
22eb3a3a50
add 'docker create' man page
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-09-16 18:40:25 -04:00
Tibor Vass
1ec283c3eb
Add create to contrib/completion
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-09-16 18:40:25 -04:00
Tibor Vass
7c85cf5f39
docs fix
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-09-16 18:40:24 -04:00
Alexander Larsson
b0cb37fd3b
integration-cli: Add docker create tests
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-09-16 18:40:24 -04:00
Alexander Larsson
3a90004f3c
Add "docker create" support
...
This exposes the already existing "create container" operation. It is
very similar to "docker run -d" except it doesn't actually start the
container, but just prepares it. It can then be manually started using
"docker start" at any point.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Conflicts:
api/client/commands.go
runconfig/parse.go
server/container.go
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-09-16 18:40:24 -04:00
Tibor Vass
9c3eedae89
Merge pull request #8074 from unclejack/add_exec_help
...
add exec to the commands list
2014-09-16 18:17:08 -04:00
unclejack
fccb026221
add exec to the commands list
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-17 01:13:43 +03:00
Alexandr Morozov
ed957232a1
Merge pull request #8055 from cpuguy83/7792_fix_volume_mount_ordering
...
Fix #7792 - Order mounts
2014-09-17 02:13:35 +04:00
Josh Hawn
09ad65ebd5
graphdriver interface name change, typo fix
...
Signed-off-by: Josh Hawn <josh.hawn@docker.com >
2014-09-16 15:10:32 -07:00
Josh Hawn
dee6b481fe
Refactor use of graphdriver.Differ
...
Some graphdrivers are Differs and type assertions are made
in various places throughout the project. Differ offers some
convenience in generating/applying diffs of filesystem layers
but for most graphdrivers another code path is taken.
This patch brings all of the logic related to filesystem
diffs in one place, and simplifies the implementation of some
common types like Image, Daemon, and Container.
Signed-off-by: Josh Hawn <josh.hawn@docker.com >
2014-09-16 15:10:32 -07:00
Alexandr Morozov
eb21197c6b
Merge pull request #8035 from duglin/Issue7965
...
Add timeout to client - fix for #7965
2014-09-17 01:55:48 +04:00
Brian Goff
0a3211f131
Fix #7792 - Order mounts
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-09-16 14:51:06 -07:00
Jean-Paul Calderone
d758da386a
Add some documentation for the RestartPolicy feature.
...
Signed-off-by: Jean-Paul Calderone <jean-paul@clusterhq.com >
2014-09-16 17:40:56 -04:00
Jessie Frazelle
51b26853ef
Merge pull request #7976 from duglin/Issue7902
...
Fix for issue 7902 - add trailing zeros to timestamps so logs align
2014-09-16 13:55:03 -07:00
Tianon Gravi
3ff8d45b35
Merge pull request #8070 from jfrazelle/exec-autocompletions
...
Add exec to autocompletions
2014-09-16 14:07:42 -06:00
Jessica Frazelle
c9c004d700
Add exec to autocompletions
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-09-16 13:01:10 -07:00
Alexandr Morozov
00fd008170
Merge pull request #8062 from vishh/run_in_phase2
...
Add support for 'docker exec' - phase 2
2014-09-16 23:56:12 +04:00
Vincent Batts
0a6fd743ea
Merge pull request #8063 from jlhawn/tarsum_empty_tar_archive
...
tarsum: correct close and finish reads
2014-09-16 15:41:28 -04:00
Vishnu Kannan
c786a8ee5e
Adding docker exec support in CLI.
...
Fixed a bug in daemon that resulted in accessing of a closed pipe.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
2014-09-16 19:24:25 +00:00
Tibor Vass
f88e2e8b99
Merge pull request #8054 from estesp/6830-fix-json-strings
...
Proper JSON handling of strings that could be represented as other types
2014-09-16 15:11:25 -04:00
Tibor Vass
28f09f0632
Merge pull request #8059 from estesp/8057-refactor-regexp-to-package-var
...
Refactor all pre-compiled regexp to package level vars
2014-09-16 15:04:23 -04:00
Phil Estes
1b0b1ec657
Proper JSON handling of strings that could be represented as other types
...
Addresses #6830
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2014-09-16 13:51:02 -04:00
Jessica Frazelle
23b2c39a40
Return errors in NewDaemonFromDirectory instead of calling Fatal
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-09-16 10:42:59 -07:00
Jessica Frazelle
67c254a60a
DisableNetworkBidge doesn't need to be public anymore
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-09-16 10:37:50 -07:00
Doug Davis
cd7a5f5c09
Fix for issue 7902.
...
Use utils.RFC3339NanoFixed ("2006-01-02T15:04:05.000000000Z07:00")
instead of time.RFC3339Nano to format our log timestamps - this way
things are aligned, in particular the nano seconds are padded with zeros
Signed-off-by: Doug Davis <dug@us.ibm.com >
2014-09-16 10:28:37 -07:00
Phil Estes
4119c9d7d9
Refactor all pre-compiled regexp to package level vars
...
Addresses #8057
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com >
2014-09-16 12:57:44 -04:00
Tibor Vass
23bb6513a0
Merge pull request #8026 from tonistiigi/validate-context-error-handling
...
Improve ValidateContextDirectory error handling.
2014-09-16 12:44:55 -04:00
Josh Hawn
bc956c6b79
Correct tarsum finish logic
...
Tarsum now correctly closes the internal TarWriter which appends
a block of 1024 zeros to the end of the returned archive.
Signed-off-by: Josh Hawn <josh.hawn@docker.com >
2014-09-16 09:34:21 -07:00
Tonis Tiigi
a8914293fb
Improve ValidateContextDirectory error handling.
...
- Errors sent to the walker callback functions were ignored. This meant that
one could get a panic when calling methods on a nil FileInfo object. For
example when the file did not exists any more.
- Lstat calls inside walker callback are reduntant because walker already calls
Lstat and passes the result to the callback.
- Error returned from filepath.Rel() can never be EACCES because it compares
strings and does not care about actual files.
- If Matched() returns error then ValidateContextDirectory() must return error.
Currently it still kept walking although the outcome was already known.
- Function will now fail in case of unknown error(not EACCES nor ENOENT).
Previous implementation did not make a clear decision about this (but
panicked because of the issues above).
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com > (github: tonistiigi)
2014-09-16 19:17:34 +03:00
unclejack
4da86f88a0
Merge pull request #5977 from vbatts/vbatts-tarsum_xattrs
...
tarsum: include xattr headers in to the checksum
2014-09-16 18:07:03 +03:00
James Turnbull
b645589071
Merge pull request #8056 from SvenDowideit/use-sudo-docker-everywhere
...
Consistently use 'sudo docker' in examples
2014-09-16 08:43:58 -04:00
James Turnbull
b040ba99d0
Merge pull request #8060 from SvenDowideit/missing-t-in-get-api-eg
...
Added missing 't' from the end of the /images/{{id}}/get eg.
2014-09-16 08:43:26 -04:00
Sven Dowideit
4352ea7b0a
Added missing 't' from the end of the /images/{{id}}/get eg.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-09-16 15:27:44 +10:00
Tianon Gravi
0954fb32a4
Merge pull request #8013 from unclejack/fix_testimportdisplay
...
integ-cli: fix TestImportDisplay & add FileServer
2014-09-15 22:36:51 -06:00
Sven Dowideit
fc9a3b1c1b
Consistently use 'sudo docker' in examples
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-09-16 11:49:05 +10:00
Fred Lifton
023241614e
Merge pull request #8034 from michaljemala/patch-1
...
The default name of the bridge created is called 'docker0'.
2014-09-15 17:32:57 -07:00
Doug Davis
f013aa7f96
Add a timeout when trying to connect to the server, otherwise sometimes it just hangs
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2014-09-15 17:30:38 -07:00
Sven Dowideit
602dc6865b
Merge pull request #8030 from SvenDowideit/add-help-if-selinux-is-out-of-date
...
Help new users if their SELinux is not-upgraded yet.
2014-09-16 10:19:29 +10:00
Sven Dowideit
a3f51da98a
Help new users if their SELinux is not-upgraded yet.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-09-16 10:18:50 +10:00
Sven Dowideit
2f65ed0968
Merge pull request #8036 from unclejack/kernel_version_requirement
...
docs: change kernel version requirement
2014-09-16 10:14:02 +10:00
Sven Dowideit
62b86613e8
Merge pull request #8037 from unclejack/shrink_docs_images
...
docs: shrink images
2014-09-16 10:13:03 +10:00
Vishnu Kannan
39030382c4
Adding state to exec commands to prevent multiple starts of a single exec command.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
2014-09-15 23:14:04 +00:00
Vishnu Kannan
bfebdfde78
Splitting the exec remote API into two separate APIs inorder to support resizing of tty sessions.
...
1. /container/<name>/exec - Creates a new exec command instance in the daemon and container '<name>'. Returns an unique ID for each exec command.
2. /exec/<name>/start - Starts an existing exec command instance. Removes the exec command from the daemon once it completes.
Adding /exec/<name>/resize to resize tty session of an exec command.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
2014-09-15 22:56:47 +00:00
unclejack
9e5592d6a1
integ-cli: fix TestImportDisplay & add FileServer
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-16 01:54:21 +03:00
Tibor Vass
8b18a2da54
Merge pull request #8051 from jfrazelle/image-tag-can-be-one-letter-test-update
...
Update integration-cli tests to allow one-letter tag as valid
2014-09-15 18:25:59 -04:00
Jessica Frazelle
985fae256f
Update integration-cli tests to allow one-letter tag as valid.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-09-15 15:17:50 -07:00
Jessie Frazelle
09982d0f97
Merge pull request #8049 from unclejack/fix_tag_validation
...
graph: validate tags properly & add unit tests
2014-09-15 14:32:02 -07:00
unclejack
ada883b198
graph: validate tags properly & add unit tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-16 00:13:54 +03:00
Fred Lifton
4b0bb71627
Merge pull request #8023 from nerab/patch-1
...
Append instead of replace file contents
2014-09-15 13:54:41 -07:00
Vincent Batts
0ecafb8a69
tarsum: version the addition of xattrs
...
Now that TarSum can be versioned, move the addition of xattr headers in
to the next version of TarSum
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2014-09-15 16:08:05 -04:00
Fred Lifton
c892423209
Merge pull request #8005 from SvenDowideit/document-sshd-env-vars
...
Document how to pass ENV vars to the user's shell
2014-09-15 12:44:56 -07:00
Fred Lifton
fd501d4b3a
Merge pull request #8044 from brahmaroutu/container_copy_6107
...
Change the copy command Content-Type header to x-tar
2014-09-15 12:06:48 -07:00
Vincent Batts
448c8ecb0f
tarsum: include xattr headers in to the checksum
...
this is to enhance the tarsum algorithm, but _MUST_ be done in lock step
with the same for docker-registry. (PR will be cited)
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-09-15 15:05:01 -04:00
Alexandr Morozov
fbae71326c
Merge pull request #8020 from erikh/rewrite_hosts_files
...
Links v2: Mutable network files
2014-09-15 23:03:30 +04:00
Srini Brahmaroutu
788e4acaa3
Change the copy command Content-Type header to x-tar
...
Addresses #6107
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2014-09-15 10:45:06 -07:00
Vishnu Kannan
0029180f7f
Removing 'exec' feature from the CLI until the docker daemon supports resizing of
...
tty sessions for exec'ed commands.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
2014-09-15 17:06:07 +00:00
Vishnu Kannan
669561c2aa
Address review comments.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
2014-09-15 17:00:00 +00:00
Vishnu Kannan
d980589de6
Adding integration tests for docker exec feature.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
2014-09-15 16:59:59 +00:00
Vishnu Kannan
e1818d2a69
Update cli.md to include 'docker exec' feature.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
2014-09-15 16:59:05 +00:00
Vishnu Kannan
d130c10ab7
Fix bug in attach handling for docker exec. Add docs for 'docker exec' feature.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
2014-09-15 16:59:05 +00:00
Vishnu Kannan
e1cf95b593
Import nsenter in docker.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
2014-09-15 16:59:05 +00:00
Vishnu Kannan
985d579586
Adding 'exec' command to remote API and CLI.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
2014-09-15 16:59:03 +00:00
Vishnu Kannan
5130fe5d38
Adding support for docker exec in daemon.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
2014-09-15 16:57:52 +00:00
Vishnu Kannan
f3c767d798
Adding Exec method to native execdriver.
...
Modified Attach() method to support docker exec.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
2014-09-15 16:57:52 +00:00
Alexandr Morozov
88a786d3c4
Merge pull request #8038 from unclejack/failed_build_context_cleanup
...
clean up the context when a build fails
2014-09-15 17:50:50 +04:00
unclejack
31c0039022
clean up the context when a build fails
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-15 16:01:23 +03:00
unclejack
a10a86d437
Merge pull request #7698 from tamsky/tune2fs_base_filesystem
...
use tune2fs to disable ext4 mount counts and mount intervals
2014-09-15 15:42:52 +03:00
unclejack
0619512582
docs: change kernel version requirement
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-15 15:15:55 +03:00
unclejack
90dcc7c840
docs: shrink images
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-15 14:46:29 +03:00
Michal Jemala
140229677a
The default name of the bridge created is called 'docker0'.
2014-09-15 12:10:46 +01:00
unclejack
c751e1739d
Merge pull request #8010 from LK4D4/fix_ps_s_hang_#7999
...
Fix ps -s hang
2014-09-15 13:54:29 +03:00
Sven Dowideit
0658be89d0
Merge pull request #8028 from SvenDowideit/ekristen-patch-1
...
HTTP Status 201 not 200
2014-09-15 11:00:05 +10:00
Erik Kristensen
c4db3b8075
HTTP Status 201 not 200
...
The http status should be 201 not 200.
Docker-DCO-1.1-Signed-off-by: Erik Kristensen <erik@erikkristensen.com > (github: SvenDowideit)
2014-09-15 10:58:45 +10:00
Sven Dowideit
0c5a7ad577
Merge pull request #8008 from dwgebler/master
...
fixes incorrect environment variable labeling in container linking guide
2014-09-15 10:51:38 +10:00
Nicholas E. Rabenau
81357e12e7
Append instead of replace file contents
...
I think the `DOCKER_OPTS` should be appended to `/etc/default/docker` and not replace the entire contents.
2014-09-13 22:26:40 +02:00
Erik Hollensbe
09b700288e
Allow /etc/hosts and /etc/resolv.conf to be updated both outside and
...
inside the container.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-09-13 11:27:34 -07:00
Tibor Vass
23f490427f
Merge pull request #7983 from vbatts/vbatts-tarsum_switch_names
...
tarsum: TarSum should be the interface
2014-09-12 17:01:35 -04:00
unclejack
da4dba2e8c
Merge pull request #8014 from jfrazelle/8012-prevent-container-names-starting-dash
...
Ensure container names start with a-zA-Z0-9
2014-09-12 23:15:16 +03:00
Michael Crosby
63a1548688
Merge pull request #8004 from duglin/Issue6447
...
Fix parsing of proto/port - issue 6447
2014-09-12 12:00:57 -07:00
Doug Davis
658a9d0f47
Fix parsing of proto/port
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2014-09-12 11:39:14 -07:00
Michael Crosby
a96811272a
Merge pull request #7934 from LK4D4/fix_double_allocation
...
Fix error propagation from userland-proxy
2014-09-12 11:39:10 -07:00
Jessica Frazelle
aa2af817be
Ensure container names start with a-zA-Z0-9
...
Closes #8012 .
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-09-12 10:45:07 -07:00
Fred Lifton
64ecef59af
Merge pull request #7986 from abh1nav/master
...
Update remote_api_client_libraries.md
2014-09-12 10:37:00 -07:00
Fred Lifton
1501adad29
Merge pull request #7987 from SvenDowideit/stop-hurting-blackrosezys-eyes
...
Yep, its been hurting my eyes too - and you've finally inspired me to fi...
2014-09-12 10:35:30 -07:00
James Turnbull
127f72d3ba
Merge pull request #8011 from fsouza/fix-typo-remote-api
...
docs/reference/api: fix typo in docs
2014-09-12 13:26:24 -04:00
Francisco Souza
fe5b72e7bb
docs/reference/api: fix typo in docs
...
Signed-off-by: Francisco Souza <f@souza.cc >
2014-09-12 13:57:43 -03:00
Alexandr Morozov
a612d85916
Merge pull request #8009 from unclejack/better_run_test_debug
...
integ-cli: better debug output for run & import
2014-09-12 18:38:46 +04:00
unclejack
3ec564bfda
integ-cli: better debug output for run & import
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-12 16:51:21 +03:00
James Turnbull
b6b85a58fd
Merge pull request #7998 from duglin/Issue5701
...
Add notes about single-quotes (for issue 5701)
2014-09-12 07:41:31 -04:00
David Gebler
78fe117076
Signed-off-by: David Gebler <davidgebler@gmail.com>
...
modified: userguide/dockerlinks.md
fixes incorrect environment variable labeling in container linking guide
2014-09-12 11:04:40 +01:00
Alexandr Morozov
41cbce8c00
Test for docker ps -s
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-09-12 11:45:50 +04:00
Alexandr Morozov
82bdd88e9c
Use unlocked version of changes for GetImage
...
Fixes #7999
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-09-12 11:44:51 +04:00
Alexandr Morozov
555ce0cb54
Use defined variable
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-09-12 11:42:12 +04:00
Alexandr Morozov
41e9e93e27
Fix my own comments from #7927
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-09-12 10:05:07 +04:00
Erik Hollensbe
3b6a29b81a
Fix an issue where already allocated ports would not trigger an error.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-09-12 09:51:14 +04:00
Tibor Vass
3109fc9537
Add Test for port allocation bug (port already in use by other programs than docker)
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-09-12 09:51:14 +04:00
Sven Dowideit
0517099a91
Document how to pass ENV vars to the user's shell
...
As this is a somewhat common question.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-09-12 13:34:01 +10:00
Sven Dowideit
df8dbfa45d
Override prettyPrint's colour choice (red) for strings in quotes.
...
I've moved the docs.css to last so it can tweak any existing css, and
then set that to the same grey colour used for 'normal' text.
While testing I found and fixed an over-zealous line wrap.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-09-12 11:10:07 +10:00
Michael Crosby
32b5d145fa
Merge pull request #7963 from jfrazelle/7845-remove-image-fail-dont-untag
...
Failing to remove an image, will not remove the image name/tag.
2014-09-11 18:06:18 -07:00
Sven Dowideit
990da301cf
Merge pull request #7988 from markotibold/patch-1
...
Fixed a typo
2014-09-12 10:41:12 +10:00
Sven Dowideit
c0783dfceb
Merge pull request #7991 from laktek/master
...
Fixed a typo in docs (outpu -> output).
2014-09-12 10:40:16 +10:00
Sven Dowideit
6941931daa
Merge pull request #8000 from estesp/7985-networkport-doc-changes
...
Match docs to actual port range used in code.
2014-09-12 10:18:03 +10:00
Michael Crosby
d9c7c1a7da
Merge pull request #7957 from bfirsh/consistent-help-messages
...
Consistent help messages
2014-09-11 15:25:28 -07:00
Jessica Frazelle
440eb7fee8
use correct apt-key for test.docker.io/ubuntu
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-09-11 15:22:36 -07:00
Michael Crosby
98e409172c
Merge pull request #7996 from estesp/7943-validate-tagnames
...
Validate tag names similar to repository name validation; add tests
2014-09-11 15:19:50 -07:00
Jessie Frazelle
2d4e43b26b
Merge pull request #7959 from crosbymichael/update-libcontainer-sep6
...
Update libcontainer to 84ad9386a0240acb7475429a835
2014-09-11 14:59:24 -07:00
Phil Estes
46eb4140c9
Validate tag names similar to repository name validation; add tests
...
Addresses #7943
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2014-09-11 17:52:36 -04:00
Phil Estes
d6f4b2ebb4
Match docs to actual port range used in code.
...
Addresses #7985
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2014-09-11 17:20:01 -04:00
Jessica Frazelle
b2efdc538d
Removing an image that fails, also removes the image name/tag.
...
Fixes #7845 and #7801 , and a real pain point I had :)
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-09-11 11:29:25 -07:00
Michael Crosby
ed7fb3bbda
Merge pull request #7202 from timbot/add-registry-mirror-flag
...
Add daemon flag to specify public registry mirrors
2014-09-11 11:11:01 -07:00
Michael Crosby
08f1a91ccd
Merge pull request #7806 from erikh/fix_cmd_handling_in_parser
...
Fix cmd and entrypoint handling in parser
2014-09-11 10:42:22 -07:00
Jessie Frazelle
e550fc532c
Merge pull request #7984 from vbatts/vbatts-engine_env_comments
...
engine.Env: comments and tests for Get()
2014-09-11 10:19:58 -07:00
Doug Davis
b47a2fbdc5
Add notes about single-quotes
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2014-09-11 10:19:07 -07:00
Erik Hollensbe
91bed43621
builder: Fix an error check being done at the wrong spot in run
...
dispatcher
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-09-11 06:00:24 -07:00
Erik Hollensbe
576416c99a
move entrypoint integration-cli test for blank entrypoint to separate function
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-09-11 06:00:24 -07:00
Erik Hollensbe
92f885d7bd
Do not populate path to prevent runconfig merge conflict; remove
...
autoConfig seeding of entrypoint.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-09-11 06:00:24 -07:00
Erik Hollensbe
78a847a47a
evaluator: ensure entrypoint stays blank if set blank while CMD is set.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-09-11 06:00:24 -07:00
Erik Hollensbe
ac107995ae
builder: Fix entrypoint and cmd semantics in evaluator. Test c/o @cnf
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-09-11 06:00:24 -07:00
Erik Hollensbe
3a6d1228a8
builder: Fix a small bug that could improperly cache.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-09-11 06:00:24 -07:00
Erik Hollensbe
6b322ad2d3
builder/parser: fix handling of empty strings as the only argument.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-09-11 06:00:24 -07:00
Erik Hollensbe
234f0e4f79
builder/parser/dumper: Handle newlines appropriately.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-09-11 06:00:24 -07:00
Lakshan Perera
7b1fdd6c04
Fixed a typo in docs (outpu -> output).
...
Signed-off-by: Lakshan Perera <lakshan@laktek.com >
2014-09-11 09:09:59 +00:00
Abhinav Ajgaonkar
c7310b6463
Update remote_api_client_libraries.md
...
Adding docker rust client lib.
Signed-off-by: Abhinav Ajgonkar <abhinav316@gmail.com >
2014-09-11 03:04:35 -04:00
Marko Tibold
ef3920278e
Fixed typo
2014-09-11 08:55:45 +02:00
Vincent Batts
6e0bc06018
engine.Env: comments and tests for Get()
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2014-09-10 22:20:49 -04:00
Vincent Batts
ec01eb653d
tarsum: TarSum is not the interface
...
don't export the exsisting TarSum struct and call the interface 'TarSum'
instead.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2014-09-10 21:56:20 -04:00
Sven Dowideit
2d1c8bd786
Merge pull request #7975 from passy/patch-2
...
Fix link for configuring automated builds
2014-09-11 09:16:41 +10:00
Michael Crosby
48fe9c1082
Merge pull request #7689 from vbatts/vbatts-tarsum_versioning
...
TarSum: versioning
2014-09-10 15:08:36 -07:00
Fred Lifton
dd5657ffd1
Merge branch 'adding_official-repo-guidelines' of https://github.com/fredlf/docker into adding_official-repo-guidelines
...
Conflicts:
docs/sources/docker-hub/official_repos.md
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-09-10 14:30:19 -07:00
Fred Lifton
a2ba4d56eb
Fixes a couple small typos
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-09-10 14:26:03 -07:00
Fred Lifton
0164cf0e9c
Merge pull request #1 from yosifkit/adding_official-repo-guidelines
...
Fix formatting, change to markdown block for long
2014-09-10 14:25:36 -07:00
Joe Ferguson
bcb9378c5b
Fix formatting, change to markdown block for long
...
Signed-off-by: Joe Ferguson <joe@infosiftr.com >
2014-09-10 14:46:11 -06:00
Vincent Batts
747f89cd32
TarSum: versioning
...
This introduces Versions for TarSum checksums.
Fixes: https://github.com/docker/docker/issues/7526
It preserves current functionality and abstracts the interface for
future flexibility of hashing algorithms. As a POC, the VersionDev
Tarsum does not include the mtime in the checksum calculation, and would
solve https://github.com/docker/docker/issues/7387 though this is not a
settled Version is subject to change until a version number is assigned.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2014-09-10 15:41:52 -04:00
Pascal Hartig
ecbc8de249
Fix link for configuring automated builds
2014-09-10 21:08:05 +02:00
Michael Crosby
25f7840993
Merge pull request #7955 from LK4D4/ignore_delete_err_on_unmap_#7954
...
Deallocate port before trying to delete iptables chain
2014-09-09 17:41:26 -07:00
Michael Crosby
f9c345ddfa
Merge pull request #7897 from LK4D4/refactoring_net_mode
...
Add IsPrivate method for NetworkMode
2014-09-09 14:20:59 -07:00
Alexandr Morozov
080ca86191
Add IsPrivate method for NetworkMode
...
This method indicates that container using private network stack
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-09-10 00:46:43 +04:00
Alexandr Morozov
2e7cf6b0ce
Deallocate port before trying to delete iptables chain
...
Fixes #7954
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-09-10 00:40:46 +04:00
Vincent Batts
197f9b1e2b
Merge pull request #7921 from unclejack/increase_tarsum_buffer_size
...
pkg/tarsum: make buffer size dynamic
2014-09-09 16:10:02 -04:00
Tim Smith
69a75c673c
Add daemon flag to specify public registry mirrors
...
Adds support for a --registry-mirror=scheme://<host>[:port]
daemon flag. The flag may be present multiple times. If
provided, mirrors are prepended to the list of endpoints used
for image pull. Note that only mirrors of the public
index.docker.io registry are supported, and image/tag resolution
is still performed via the official index.
Docker-DCO-1.1-Signed-off-by: Tim Smith <timbot@google.com > (github: timbot)
2014-09-09 19:03:38 +00:00
Michael Crosby
b5a4c70455
Merge pull request #7960 from vbatts/vbatts-tarsum_debugf_not_infof
...
tarsum: use Debugf, not Infof
2014-09-09 11:51:36 -07:00
Jessie Frazelle
2a832f617b
Merge pull request #7948 from SvenDowideit/add-more-port-specification-doc
...
add -p PORT as a valid format specification
2014-09-09 11:43:25 -07:00
Jessie Frazelle
971240696f
Merge pull request #7660 from rhatdan/selinux-volumes
...
Change default label of container volumes to shared SELinux Label
2014-09-09 11:16:19 -07:00
Vincent Batts
6a8cae3e03
tarsum: use Debugf, not Infof
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2014-09-09 14:07:20 -04:00
Michael Crosby
c604dc292e
Update libcontainer to 84ad9386a0240acb7475429a835
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-09-09 11:05:58 -07:00
Jessie Frazelle
49c32189c0
Merge pull request #7958 from dqminh/fix-lxc-template-console
...
fix console attribute in lxc template
2014-09-09 11:00:48 -07:00
Daniel, Dao Quang Minh
4b3b54ca38
fix console attribute in lxc template
...
commit 4aa5da278fdqminh89@gmail.com > (github: dqminh)
2014-09-09 13:51:13 -04:00
Ben Firshman
fec81690cc
Consolidate documentation for -H option
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-09-09 10:12:03 -07:00
James Turnbull
1ed467a9ae
Merge pull request #7953 from SvenDowideit/reformat-api-docs
...
Reformat the API docs so I can read them
2014-09-09 12:52:26 -04:00
Jessie Frazelle
17314e2fe8
Merge pull request #7951 from taohu/typo
...
typo fix: immediatly -> immediately
2014-09-09 09:44:51 -07:00
Dan Walsh
73617e5e18
Change default label of container volumes to shared SELinux Label
...
Since these will be shared between containers we want to label
them as svirt_sandbox_file_t:s0. That will allow multiple containers
to write to them.
Currently we are allowing container domains to read/write all content in
/var/lib/docker because of container volumes. This is a big security hole
in our SELinux story.
This patch will allow us to tighten up the security of docker containers.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-09-09 08:18:20 -04:00
Sven Dowideit
f36dfbdcaf
Reformat the API docs so I can read them
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-09-09 16:17:38 +10:00
Hu Tao
fcc7ec8073
typo fix: immediatly -> immediately
...
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com >
2014-09-09 01:16:19 -04:00
Fred Lifton
f1095b801e
Merge pull request #7949 from SvenDowideit/remove-doubled-up-page-heading
...
Make the side bar about in-document navigation by removing the duplicated h1
2014-09-08 20:50:06 -07:00
Sven Dowideit
1f25bfea2d
Make the side bar about in-document navigation by removing the duplicated h1
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-09-09 11:44:51 +10:00
Sven Dowideit
e4d2a8231a
add -p PORT as a valid format specification
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-09-09 11:16:02 +10:00
Fred Lifton
5b6c4051d5
More format wrestling.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-09-08 17:32:29 -07:00
Fred Lifton
5fea2b5be3
More format fixes.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-09-08 16:30:39 -07:00
Ben Firshman
d128d9e669
Add instructions on how to get help on commands
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-09-08 16:09:16 -07:00
Ben Firshman
f3ed7b601f
Print consistent help with options and commands
...
These commands now all output the same thing:
- docker
- docker help
- docker --help
- docker -h
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-09-08 16:08:50 -07:00
Fred Lifton
bb8ea1fdc1
Merge pull request #7931 from jamtur01/device
...
Added --device flag to run reference
2014-09-08 14:33:56 -07:00
Fred Lifton
577066fb45
Merge pull request #7930 from jamtur01/nformat
...
Very minor formatting update for docs/sources/articles/networking.md
2014-09-08 14:28:29 -07:00
Fred Lifton
10e4ca760c
Merge pull request #7929 from SvenDowideit/doc-tar-stream
...
Sven Dowideit Update export, copy and build API to say 'TAR STREAM' for all versions.
2014-09-08 14:27:45 -07:00
Michael Crosby
85314e7e58
Merge pull request #7759 from unclejack/pull_latest_by_default
...
make docker pull only the latest tag by default
2014-09-08 13:43:21 -07:00
Fred Lifton
a899b8a63e
Format and typo fixes
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-09-08 12:36:52 -07:00
Tibor Vass
d7e29a2cc8
Merge pull request #7891 from tlipinski/master
...
Allows installation on Linux Mint Debian Edition
2014-09-08 14:44:07 -04:00
Fred Lifton
eb8d0c1ccf
Revisions based on feedback.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-09-08 11:43:09 -07:00
Jessie Frazelle
7bb5ec3be6
Merge pull request #7862 from Gandi/bugfixes/segfault-registry-session
...
Fix SEGFAULT if dns resolv error
2014-09-08 11:38:34 -07:00
Tomasz Lipinski
021722cf7a
Allows installation on Linux Mint Debian Edition
...
Otherwise platform won't be detected
Signed-off-by: Tomasz Lipinski <me@tlipinski.net >
2014-09-08 20:38:02 +02:00
Jessie Frazelle
f7429a2121
Merge pull request #7871 from vincentbernat/update/zsh-completion-1
...
zsh: update zsh completion for docker command
2014-09-08 11:25:55 -07:00
Tibor Vass
43eab4034b
Merge pull request #7938 from unclejack/make_run_test_verbose
...
integ-cli: increase verbosity for mem & cpu test
2014-09-08 14:10:58 -04:00
Michael Crosby
18edea2a6f
Merge pull request #7609 from ewindisch/max_imgname
...
Restrict length of repository names
2014-09-08 11:06:54 -07:00
Michael Crosby
11700512b9
Merge pull request #7920 from unclejack/fix_layer_permissions
...
ensure correct permissions are set for directories
2014-09-08 10:51:50 -07:00
unclejack
05a76477e6
integ-cli: increase verbosity for mem & cpu test
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-08 20:46:45 +03:00
unclejack
cc5fb986b0
integ-cli: test correct directory permissions
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-08 20:02:40 +03:00
Alexandr Morozov
2360d4a440
Merge pull request #7886 from jfrazelle/7047-json-line-delim
...
Fix line delimited JSON response
2014-09-08 20:47:21 +04:00
Jessica Frazelle
d2f75a3040
Fix line delimited JSON response
...
For GET /events, line delimit JSON.
Fixes #7047
Signed-off-by: Jessica Frazelle <jfrazelle@users.noreply.github.com >
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jfrazelle@users.noreply.github.com > (github: )
2014-09-08 09:41:26 -07:00
Tibor Vass
68e07f3fa0
Merge pull request #7914 from jfrazelle/7802-backwards-compat-state
...
fixes #7802 , when api version 1.11 is `json.Marshal`ing the container st...
2014-09-08 12:39:55 -04:00
Tianon Gravi
60ab9eaf4a
Merge pull request #7868 from baloo/patch-1
...
Switch TESTFLAGS to use `-test.run` instead of `-run`
2014-09-08 10:34:49 -06:00
Jessica Frazelle
f49c3f287b
fixes #7802 , when api version 1.11 is json.Marshaling the container struct
...
Signed-off-by: Jessica Frazelle <jfrazelle@users.noreply.github.com >
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jfrazelle@users.noreply.github.com > (github: )
2014-09-08 09:30:33 -07:00
Leszek Kowalski
691bbf6a29
Include directories that contain changes inside them when calculating diff. Fixes #6722
...
Docker-DCO-1.1-Signed-off-by: Leszek Kowalski <github@leszekkowalski.pl > (github: ljk)
2014-09-08 19:11:48 +03:00
James Turnbull
8f0034c3ee
Merge pull request #7933 from ahmetalpbalkan/doc-remote_api_client_libraries.md
...
add C# docker client library link to remote API client libraries doc
2014-09-08 07:25:24 -04:00
Ahmet Alp Balkan
cde53c51b5
add C# docker client library link
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2014-09-07 23:29:04 -07:00
James Turnbull
9e34c42d20
Added --device flag to run reference
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-09-07 23:17:14 -04:00
James Turnbull
1ce3e22efc
Very minor formatting update for docs/sources/articles/networking.md
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-09-07 22:39:37 -04:00
Sven Dowideit
77fa306d63
Update export, copy and build API to sat 'TAR STREAM' for all versions.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-09-08 11:54:21 +10:00
Mustafa Akın
b9e889c309
Update docker_remote_api_v1.14.md
...
It is a tar stream, you should mention that somehow.
Here is the proof:
```
host:~$ docker run -t -i ubuntu:14.04 bash
root@c39be4c7b7c8:/# echo "my file contents" > abc
root@c39be4c7b7c8:/# cat abc
my file contents
root@c39be4c7b7c8:/# exit
host:~$ curl -H "Content-Type: application/json" -d '{"Resource":"/abc"}' http://localhost:4500/containers/c39be4c7b7c8/copy
abc0100644000000000000000000000002112402102531007674 0ustar0000000000000000my file contents
host:~$ curl -H "Content-Type: application/json" -d '{"Resource":"/abc"}' http://localhost:4500/containers/c39be4c7b7c8/copy > response_content
% Total % Received % Xferd Average Speed Time Time Time Current
Dload Upload Total Spent Left Speed
100 2067 100 2048 100 19 56968 528 --:--:-- --:--:-- --:--:-- 58514
host:~$ tar xvf response_content
abc
host:~$ cat abc
my file contents
```
Docker-DCO-1.1-Signed-off-by: Mustafa Akın <mustafa91@gmail.com > (github: SvenDowideit)
2014-09-08 11:52:27 +10:00
Sven Dowideit
4b3ee6c106
Merge pull request #7908 from nhsiehgit/issue363imgfix
...
added a css fix for the image bug issue
2014-09-08 11:10:03 +10:00
Jessica Frazelle
f3a68ffa39
Fix duplicate iptables rules
...
If iptables version is < 1.4.11, try to delete the rule vs. checking if it exists. Fixes #6831 .
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jfrazelle@users.noreply.github.com > (github: jfrazelle)
2014-09-07 15:12:19 -07:00
unclejack
7ef3440750
pkg/tarsum: add dynamic buffer sizing
...
This commit makes tarsum buffer allocation dynamic. This change
is required to avoid allocating memory excessively after the archive
buffering changes.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-06 17:39:43 +03:00
Phil Estes
b5184d3c24
Fix gh#7747 - filter bare newline output and log client pull to stdout
...
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2014-09-06 01:06:18 -04:00
Marc Tamsky
d229821501
use tune2fs to disable ext4 mount counts and mount intervals
...
Signed-off-by: Marc Tamsky <mtamsky@gmail.com > (github: tamsky)
2014-09-05 19:32:39 -07:00
Nathan Hsieh
e44bdd612b
added a css fix for the image bug issue
...
Docker-DCO-1.1-Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
(github: nhsiehgit)
2014-09-05 10:48:51 -07:00
Tianon Gravi
38186084b3
Merge pull request #7893 from tianon/travis-run-tests
...
Update Travis to also run the test suite
2014-09-05 09:19:38 -06:00
James Turnbull
712702aa79
Merge pull request #7894 from SvenDowideit/use-local-jquery
...
Use a local copy of jquery so that the docs work in China, and offline too.
2014-09-05 08:51:09 -04:00
Arthur Gautier
3e6c69e5a1
Fix SEGFAULT if dns resolv error
...
Per registry.doRequest, res and client might be nil in case of error
For example, dns resolution errors, /etc/docker/certs.d perms, failed
loading of x509 cert ...
This will make res.StatusCode and res.Body SEGFAULT.
Signed-off-by: Arthur Gautier <baloo@gandi.net >
2014-09-05 13:40:06 +02:00
Sven Dowideit
5fe94f0d91
Use a local copy of jquery so that the docs work in China, and offline too.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-09-05 11:48:34 +10:00
Fred Lifton
58e8987837
Adding first draft of Official Repo Guidelines
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-09-04 18:09:00 -07:00
Victor Vieux
b0cff06c97
Merge pull request #7883 from LK4D4/fix_build_race
...
Fix race between dispatchers.run and toDisk
2014-09-04 17:32:46 -07:00
Sven Dowideit
03fdc7d2c1
Merge pull request #7890 from fredlf/docs-cherry-pick-update-process
...
Changes to Sven's cherry pick process
2014-09-05 09:58:18 +10:00
Tianon Gravi
068b9ac4d2
Update Travis to also run the test suite
...
Signed-off-by: Andrew Page <admwiggin@gmail.com >
2014-09-04 17:20:02 -06:00
Tibor Vass
1a2a4f61ab
Merge pull request #7878 from LK4D4/fix_net_for_none
...
Don't initialize network for 'none' mode
2014-09-04 15:30:03 -07:00
Tianon Gravi
d3b5bf5d24
Merge pull request #7763 from jamtur01/kate
...
Add syntax highlighting file for KDE's "Kate" editor
2014-09-04 15:28:11 -06:00
Fred Lifton
b23daef3ec
Changes to Sven's cherry pick process
...
Added content and revised after walk-through
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-09-04 13:32:16 -07:00
James Turnbull
f7c0ac9a8b
Merge pull request #7873 from jankeromnes/patch-1
...
Update SSH demo to ubuntu 14.04
2014-09-04 15:45:55 -04:00
Jan Keromnes
98f57d1c39
Update SSH demo to ubuntu 14.04
...
Signed-off-by: Jan Keromnes <janx@linux.com >
2014-09-04 20:27:41 +02:00
James Turnbull
bc26aa7b50
Merge pull request #7876 from nhsiehgit/typofix
...
small typo. wrapping cut code snippet
2014-09-04 12:37:07 -04:00
Alexandr Morozov
f17410da5e
Fix race between dispatchers.run and toDisk
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-09-04 19:43:28 +04:00
Alexandr Morozov
ba24820284
Don't initialize network for 'none' mode
...
Fixes #7837
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-09-04 09:50:58 +04:00
Sven Dowideit
dbe1123607
Merge pull request #7828 from vieux/update_api_docs
...
Remote api docs for POST /containers/create were out of sync with runconfig/config.go
2014-09-04 13:05:06 +10:00
Sven Dowideit
e1907bafb7
Merge pull request #7858 from somaopensource/typo-fix
...
Dockerfile documentation typo and content fix
2014-09-04 13:03:04 +10:00
Michael Crosby
d9fc61066d
Merge pull request #7864 from unclejack/fix_panic_registry_session
...
registry/session: fix panic in GetRemoteImageLayer
2014-09-03 18:17:03 -07:00
Nathan Hsieh
adc9a14db4
small typo. fixed broken code snippet
...
Docker-DCO-1.1-Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com > (github: nhsiehgit)
2014-09-03 17:53:45 -07:00
Victor Vieux
68c256cd40
Merge pull request #7875 from tiborvass/fix-integration-panic
...
Fix panic in integration-cli
2014-09-03 17:33:04 -07:00
Tibor Vass
39310448da
handle empty envvars for DOCKER_GRAPHDRIVER and DOCKER_EXECDRIVER in daemon test framework
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-09-03 17:14:19 -07:00
Tibor Vass
defe01daf8
fix race in daemon test framework
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-09-03 17:14:19 -07:00
Victor Vieux
affef9e785
Merge pull request #7865 from cure/master
...
fix typos in error messages
2014-09-03 16:03:20 -07:00
Tibor Vass
782cde2c0f
Merge pull request #7818 from thomasleveil/completion-docker-build
...
Add --force-rm to docker build command completion
2014-09-03 14:44:13 -07:00
James Turnbull
a3326c3469
Merge pull request #7850 from fredlf/add_cherrypick_process
...
Add cherrypick process
2014-09-03 17:33:49 -04:00
Vincent Bernat
dc2eab2cf4
zsh: update zsh completion for docker command
...
zsh completion is updated with the content of
felixr/docker-zsh-completion.
The major change since the last merge is the removal of use of
sed/awk. This should help a lot OSX users who previously had to install
gawk and gsed.
Docker-DCO-1.1-Signed-off-by: Vincent Bernat <vincent@bernat.im > (github: vincentbernat)
2014-09-03 22:30:11 +02:00
Ward Vandewege
a447894946
fix typos in error messages
...
Signed-off-by: Ward Vandewege <ward@jhvc.com > (github: cure)
2014-09-03 13:12:10 -04:00
Arthur Gautier
2a7770a712
The correct option for go test is -test.run not -run
2014-09-03 19:06:25 +02:00
unclejack
6ba5d67a51
docker build: pull just latest if tag uspecified
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-03 18:32:47 +03:00
SvenDowideit
82b0c3e59c
add a little documentation for docker pull
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-09-03 18:32:41 +03:00
unclejack
9c08364a41
add --all-tags to pull & pull latest by default
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-03 18:03:14 +03:00
unclejack
9c413e3e6f
registry/session: fix panic in GetRemoteImageLayer
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-03 17:26:56 +03:00
Thomas LÉVEIL
40f0bf7564
Add --force-rm to docker build command completion
...
Signed-off-by: Thomas LEVEIL <thomasleveil@gmail.com >
2014-09-03 14:26:16 +02:00
Oh Jinkyun
476f1df36f
Dockerfile documentation typo and content fix
...
Signed-off-by: Oh Jinkyun <tintypemolly@gmail.com >
2014-09-03 19:28:01 +09:00
Alexandr Morozov
58dc474e65
Merge pull request #7542 from unclejack/refactor_archive_buffering
...
Refactor archive buffering
2014-09-03 12:39:14 +04:00
unclejack
84d76e556b
archive: use pooled bufio readers and writers
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-03 11:37:03 +03:00
unclejack
2d2016b81b
pkg/pool: add pools for bufio readers & writers
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-03 11:36:39 +03:00
unclejack
bd130e72a0
pkg/ioutils: add ReaderErrWrapper to readers
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-03 11:36:21 +03:00
unclejack
c93b9e81c0
pkg/ioutils: add NewBufReaderWithDrainbufAndBuffer
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-03 11:36:21 +03:00
unclejack
7b6f34057c
pkg/ioutils: add WriteCloserWrapper
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-03 11:36:21 +03:00
unclejack
76212635b5
move some io related utils to pkg/ioutils
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-03 11:36:21 +03:00
unclejack
2da75f7079
Merge pull request #7315 from vieux/add_pb
...
add progress bar to ADD
2014-09-03 11:00:31 +03:00
Tibor Vass
426fbee810
Merge pull request #7800 from djbk/master
...
Cleanup: Typo in job.go
2014-09-02 17:47:18 -07:00
Fred Lifton
23cf3f7407
Adding Docs Deploy process to Docs ReadMe
...
Additions and revisions to Sven's cherry-pick process doc.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-09-02 17:44:36 -07:00
Byung Kang
cc84ec3f61
Cleanup: Typo in job.go
...
Signed-off-by: Byung Kang <byungk91@gmail.com >
2014-09-02 19:37:14 -05:00
Victor Vieux
4e40d09a2b
Add a progress bar for ADD <url> <dst>
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-09-03 00:17:08 +00:00
Jessie Frazelle
f74b901da6
Merge pull request #7839 from LK4D4/embed_state_to_container
...
Use State as embedded to Container
2014-09-02 15:18:32 -07:00
Alexandr Morozov
e0339d4b88
Use State as embedded to Container
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-09-03 00:01:11 +04:00
unclejack
6db078dea7
Merge pull request #7191 from tiborvass/test-daemon
...
Add Daemon restart test along with Daemon utils
2014-09-02 22:40:23 +03:00
Victor Vieux
6eef7de396
Merge pull request #7842 from unclejack/build_delete_context
...
clean up context on build completion & add test
2014-09-02 12:19:47 -07:00
Tibor Vass
ca24e91408
Merge pull request #7765 from erikh/test_unit_testflags
...
hack/make: fix test-unit target to propogate TESTFLAGS properly
2014-09-02 12:18:40 -07:00
Tibor Vass
a9971a89cc
Add TestDaemonRestartWithRunningContainersPorts
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-09-02 12:13:21 -07:00
Erik Hollensbe
9a2d4e9273
hack/make: fix test-unit target to propogate TESTFLAGS properly
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-09-02 12:10:47 -07:00
Tibor Vass
054b921a2c
Add Daemon test utils
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-09-02 10:58:36 -07:00
unclejack
1858746978
clean up context on build completion & add test
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-02 17:35:25 +03:00
Alexandr Morozov
5f6b420f91
Merge pull request #7833 from crosbymichael/mem-test
...
Add more error info to TestDockerRunEchoStdoutWithMemoryLimit
2014-09-02 07:51:04 +04:00
Michael Crosby
c0a5ec75c5
Add more error info to TestDockerRunEchoStdoutWithMemoryLimit
...
This test fails on my CI server often so we need more info when it does
happen with this test.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-09-01 17:09:52 -07:00
Victor Vieux
0704010313
Merge pull request #7832 from crosbymichael/fix-nat-test
...
Make nat test less racy and accurate
2014-09-01 16:57:26 -07:00
Michael Crosby
72652c5973
Make nat test less racy and accurate
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-09-01 16:54:32 -07:00
Michael Crosby
ca63cceae5
Merge pull request #7830 from crosbymichael/update-libcontainer-sep1
...
Update libcontainer to version 55430d0db7c6bb1198c0bb573a9700a859d5ec26
2014-09-01 16:13:38 -07:00
Victor Vieux
40cc889a7c
Merge pull request #7780 from unclejack/disallow_dns_with_net_host
...
disallow net=host and net=container with links and dns
2014-09-01 15:32:08 -07:00
Michael Crosby
688741df31
Update mount struct with reference
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-09-01 15:18:30 -07:00
Michael Crosby
cf31787cd0
Update libcontainer to 55430d0db7c6bb1198c0bb573a9
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-09-01 15:18:25 -07:00
Michael Crosby
7ff488e741
Merge pull request #7829 from crosbymichael/process-config
...
Refactor exec drivers for multi process
2014-09-01 14:41:24 -07:00
Vishnu Kannan
3a7e07355a
Rename 'StdConfig' to 'StreamConfig'.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
2014-09-01 14:31:01 -07:00
Vishnu Kannan
4aa5da278f
Refactoring execdriver.Command and Container structs to support 'docker exec' and other
...
similar features in the future.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
2014-09-01 14:30:16 -07:00
James Turnbull
9ffb0f76f2
Merge pull request #7819 from SvenDowideit/debian-wheezy-notes
...
Debian wheezy notes - minor md tweaks
2014-09-01 15:45:47 -04:00
Victor Vieux
2d8695761d
more updates
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-09-01 18:41:42 +00:00
Michael Crosby
efc6c9ba2f
Merge pull request #7825 from LK4D4/move_integration_to_cli
...
Move integration to cli
2014-09-01 11:38:57 -07:00
Anand Patil
eac6a5d789
v1.13 and 1.14 api docs now match runconfig/config.go
2014-09-01 18:33:13 +00:00
Michael Crosby
388ed88042
Merge pull request #7812 from erikh/fix_top
...
docker top: fix command when multiple arguments are supplied
2014-09-01 11:31:38 -07:00
Michael Crosby
ec87846908
Merge pull request #7809 from LK4D4/use_increment
...
Use increment operator
2014-09-01 11:16:25 -07:00
Michael Crosby
ac69b661ee
Merge pull request #7791 from SvenDowideit/mflag-Visit-returns-nil-flag
...
fs.Visit() returns nil flag
2014-09-01 11:13:32 -07:00
Victor Vieux
09d3670907
Merge pull request #7814 from erikh/fix_parser_env
...
Fix panic when `ENV ARG=ARG` is used.
2014-09-01 11:03:21 -07:00
Alexandr Morozov
195cee9983
Move TestRunCidFileCheckIDLength to integration-cli
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-09-01 20:15:20 +04:00
Alexandr Morozov
8892320835
Move TestRunCidFileCleanupIfEmpty to integration-cli
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-09-01 19:55:39 +04:00
Sven Dowideit
2aaa8892e3
Merge pull request #7820 from SvenDowideit/eik3-exit-doc-patch
...
alternative to `exit` command: `CTRL-D`
2014-08-31 20:39:23 -07:00
Eike Herzbach
c0c525b3d1
alternative to exit command: CTRL-D
...
Docker-DCO-1.1-Signed-off-by: Eike Herzbach <eike@herzbach.net > (github: eik3)
2014-09-01 13:38:25 +10:00
Sven Dowideit
ead942156c
document the cherry-pick process I'm using to make docs updates
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-09-01 11:32:52 +10:00
Sven Dowideit
2852037018
Try to go for 80-char lines and a little md wrangling.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-09-01 09:55:53 +10:00
Vishal Doshi
d27f1bb000
Update debian.md
...
Add some instructions for Debian 7 (aka Wheezy/Stable)
Signed-off-by: Vishal Doshi <vishal.doshi@gmail.com >
2014-09-01 00:50:49 +05:30
James Turnbull
014471ad39
Merge pull request #7751 from dchen1107/master
...
Bump containervm version to the latest one: 20140826
2014-08-31 14:16:22 -04:00
James Turnbull
a25594c867
Merge pull request #7805 from nzwsch/patch-1
...
Update nodejs_web_app.md
2014-08-31 14:14:40 -04:00
Alexandr Morozov
c8999dc326
Merge pull request #7817 from cnf/fix_cli_top_test_priv
...
Fixed error check using the wrong error value
2014-08-31 19:24:33 +04:00
Frank Rosquin
d93c95a332
Fixed error check using the wrong error value
...
errorOut was using the err from the previous test.
same as #7816 but on TestTopPrivileged, which I missed last time
Signed-off-by: Frank Rosquin <frank.rosquin@gmail.com >
2014-08-31 16:35:38 +02:00
Alexandr Morozov
d301146c4b
Merge pull request #7816 from cnf/fix_cli_top_test
...
fixed error check using the wrong error value
2014-08-31 18:28:29 +04:00
Frank Rosquin
82c536aacd
fixed error check using the wrong error value
...
errorOut was using the err from the previous test.
Signed-off-by: Frank Rosquin <frank.rosquin@gmail.com >
2014-08-31 16:21:53 +02:00
Erik Hollensbe
d7dd35bbd6
Add a test for the multiple arguments passed to docker top
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-31 05:53:05 -07:00
Erik Hollensbe
a0255ba502
Fix panic when ENV ARG=ARG is used.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-31 05:39:36 -07:00
Erik Hollensbe
394a6d3154
docker top: fix command when multiple arguments are supplied
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-31 01:18:15 -07:00
Alexandr Morozov
16e850fe3e
Use increment operator
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-30 21:43:48 +04:00
nzwsch
2d1ec162be
Update nodejs_web_app.md
2014-08-30 16:02:47 +09:00
Victor Vieux
280b64bc7b
Merge pull request #7775 from LK4D4/merge_state_lock
...
Merge Container and State mutexes
2014-08-29 11:25:21 -07:00
Michael Crosby
8b74ac6717
Merge pull request #7795 from LK4D4/style_fixes
...
Some more style fixes
2014-08-29 10:59:37 -07:00
Victor Vieux
9c0b851e4c
Merge pull request #6628 from SvenDowideit/6501-list-all-docker-ports
...
List all ports when calling `docker port container`
2014-08-29 10:57:20 -07:00
Alexandr Morozov
b101022dbe
Implement allocating IPs from CIDR within bridge network
...
Fixes #4986
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-29 16:21:07 +04:00
Alexandr Morozov
42dd48315f
More ipallocator refactoring
...
Now x1.5 faster
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-29 16:20:49 +04:00
Alexandr Morozov
114838cbda
Some more style fixes
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-29 15:21:28 +04:00
Alexandr Morozov
517ba44e37
Merge Container and State mutexes
...
Resolved all deadlocks and fixed race between kill and
monitor.resetContainer
Fixes #7600
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-29 12:56:04 +04:00
SvenDowideit
4e340cedec
List all ports when calling docker port container
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-08-29 18:31:51 +10:00
Sven Dowideit
f1934e5979
fs.Visit() returns nil flag
...
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
2014-08-29 15:38:03 +10:00
Victor Vieux
6eaac7d571
Merge pull request #5518 from vbatts/vbatts-save_many
...
docker save: ability to save multiple images
2014-08-28 18:40:28 -07:00
Vincent Batts
79501dcd4f
save many: adding an integration-cli test
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2014-08-28 21:33:13 -04:00
James Turnbull
f1a42fb609
Merge pull request #7789 from SvenDowideit/add-css-for-strong-tag
...
Give the <strong> tag some CSS (the .content-body resets it)
2014-08-28 18:12:54 -07:00
Fred Lifton
d420b2cce0
Merge pull request #7786 from psftw/volume_removal
...
Be more explicit about volume lifecycle
2014-08-28 18:11:28 -07:00
SvenDowideit
7de977368c
Give the <strong> tag some CSS (the .content-body resets it)
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-08-29 11:08:56 +10:00
Sven Dowideit
2bf41be514
Merge pull request #7769 from fredlf/1.2.0_release-notes
...
Adding release notes to docs home
2014-08-28 17:37:15 -07:00
Fred Lifton
810c231b91
Fixed typos based on feedback.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-08-28 17:29:09 -07:00
Vincent Batts
e64131d1bf
docker save: ability to save multiple images
...
Now from a single invocation of `docker save`, you can specify multiple
images to include in the output tar, or even just multiple tags of a
particular image/repo.
```
> docker save -o bundle.tar busybox ubuntu:lucid ubuntu:saucy fedora:latest
> tar tf ./bundle.tar | wc -l
42
> tar xOf ./bundle.tar repositories
{"busybox":{"latest":"2d8e5b282c81244037eb15b2068e1c46319c1a42b80493acb128da24b2090739"},"fedora":{"latest":"58394af373423902a1b97f209a31e3777932d9321ef10e64feaaa7b4df609cf9"},"ubuntu":{"lucid":"9cc9ea5ea540116b89e41898dd30858107c1175260fb7ff50322b34704092232","saucy":"9f676bd305a43a931a8d98b13e5840ffbebcd908370765373315926024c7c35e"}}
```
Further, this fixes the bug where the `repositories` file is not created
when saving a specific tag of an image (e.g. ubuntu:latest)
document multi-image save and updated API docs
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-08-28 20:22:33 -04:00
Sven Dowideit
31d2701377
Merge pull request #7749 from hollietealok/master
...
Doc: Resizing Boot2Docker Volume with VirtualBox
2014-08-28 16:08:29 -07:00
Hollie Teal
0f8d461ed7
Final tweaks.
...
Signed-off-by: Hollie Teal <hollie@docker.com >
2014-08-28 13:51:38 -07:00
Peter Salvatore
bfa3d5fa72
Be more explicit about volume removal
...
Signed-off-by: Peter Salvatore <peter@psftw.com >
2014-08-28 16:44:41 -04:00
Hollie Teal
ce73a3bcf7
Added changes brought up in PR discussion.
...
Signed-off-by: Hollie Teal <hollie@docker.com >
2014-08-28 11:04:53 -07:00
Alexandr Morozov
bc41261de0
Merge pull request #7782 from somaopensource/graph_remove_fixme
...
graph: remove obsolete comments
2014-08-28 20:03:16 +04:00
Daehyeok.Mun
59d58352df
graph: remove obsolete comments
...
Graph.Get function already returns nil when the image doesn't exist so
following comment is obsolete.
FIXME: return nil when the image doesn't exist, instead of an error
Signed-off-by: Daehyeok.Mun <daehyeok@gmail.com >
2014-08-29 00:22:26 +09:00
unclejack
3256050ed4
deny net host + dns and links with container net
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-08-28 16:58:54 +03:00
unclejack
d244e8c379
Merge pull request #7774 from somaopensource/graph_fixme
...
graph: change argument order of Register function
2014-08-28 16:36:23 +03:00
Daehyeok.Mun
35df24c8e6
graph: change argument order of Register function
...
This commit is patch for following comment
FIXME: pass img as first argument
Signed-off-by: Daehyeok.Mun <daehyeok@gmail.com >
2014-08-28 20:06:07 +09:00
unclejack
22b585e0fc
Merge pull request #7294 from erikh/fix_multiple_attach_test
...
Fix multiple attach test.
2014-08-28 13:38:28 +03:00
Victor Vieux
d9f8d3ea9f
Merge pull request #7461 from erikh/rewrite_dockerfile_parser
...
Cleanup: Refactor Dockerfile parser
2014-08-27 23:22:47 -07:00
Victor Vieux
a26fc6cae8
Merge pull request #7772 from LK4D4/log_dones
...
Add logDone logs where it's missing
2014-08-27 22:46:54 -07:00
Alexandr Morozov
3c984a6d15
Add logDone logs where it's missing
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-28 09:25:57 +04:00
Michael Crosby
334dca15b0
Merge pull request #7647 from ewindisch/erw-tarsum-maintainer
...
Add Eric Windisch to MAINTAINER for tarsum
2014-08-27 20:00:19 -07:00
Michael Crosby
2a5e29adc6
Merge pull request #7677 from erikh/update_hosts_linked_containers
...
Update /etc/hosts when linked container is restarted
2014-08-27 19:54:09 -07:00
Michael Crosby
77eefbc688
Merge pull request #7672 from cpuguy83/cleanup_volumes_from
...
Cleanup: applyVolumesFrom
2014-08-27 19:43:16 -07:00
Michael Crosby
345e3811fe
Merge pull request #7767 from vieux/move_some_tests
...
Move some tests
2014-08-27 19:28:31 -07:00
Erik Hollensbe
2ef1dec7e8
builder: Refactors according to @tiborvass's comments
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
305f735080
builder: several fixups from comments
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
a1522ec01c
builder: move the evaluator package code directly into builder
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
cb51681a6d
builder: Fix handling of ENV references that reference themselves, plus tests.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
1ae4c00a19
builder: fix references to jobs in daemon, make builder a first class
...
package referring to evaluator
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
3dfe5ddfb9
builder: Remove spurious .gitignores
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
248f4c4f75
builder/parser: Rewrite Parse() to use := instead of var
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
135f54ccbf
builder: Remove blankNode(), use &Node{} instead.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
21b15ac920
builder: handle certain classes of JSON errors gracefully
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
4122a981ae
builder: negative test support, fix for shykes's broken dockerfile
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
3f5f6b038f
builder: comments / documentation
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
d6c0bbc3cb
builder: add command handling to evaluator.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
bb36902db6
builder: rewrote NewBuildFile according to tibor's comments
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:29 -07:00
Erik Hollensbe
22c46af4b3
builder: parser and beginnings of the evaluator
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:29 -07:00
Fred Lifton
1c3b732f8a
Adding release notes to docs home
...
This is a temporary solution until we have a dedicated release notes page with automated content.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-08-27 18:34:19 -07:00
Erik Hollensbe
f6a2fc4c33
Update networking doc with clarified text regarding links usage
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:23:41 -07:00
Erik Hollensbe
9f09ef18a4
pkg/networkfs/etchosts: tests for Update method
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:23:41 -07:00
Erik Hollensbe
925a3254e7
pkg/graphdb: tests for Parents and Children
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:23:41 -07:00
Victor Vieux
450740c891
Update /etc/hosts when linked container is restarted
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-08-27 18:23:41 -07:00
Victor Vieux
2b538bd555
remove auth_test.go
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-08-28 00:28:54 +00:00
Victor Vieux
5b27fbc0e2
move TestEntrypoint & TestBindMounts
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-08-28 00:25:10 +00:00
Victor Vieux
96e1c99fb4
Merge pull request #7708 from SvenDowideit/programatic-usage-options
...
add the [OPTIONS] string automatically if there are flags defined
2014-08-27 16:40:17 -07:00
Victor Vieux
eb9379c5d0
move TestKillDifferentUser
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-08-27 23:34:37 +00:00
Sven Dowideit
7c27c7a096
Merge pull request #7766 from fredlf/update_b2d_upgrading
...
Updating B2D upgrade instructions for 1.2.0.
2014-08-27 15:53:48 -07:00
SvenDowideit
8c6c4a12b7
add the [OPTIONS] string automatically if there are flags defined
...
Signed-off-by: SvenDowideit <SvenDowideit@home.org.au >
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-08-28 08:50:50 +10:00
Victor Vieux
0cb672e6a9
Merge pull request #7762 from LK4D4/skip_delete_no_chain_#6904
...
Skip "no chain" error on deleting chain in Unmap
2014-08-27 14:43:57 -07:00
Fred Lifton
3304d4e984
Updating B2D upgrade instructions for 1.2.0.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-08-27 14:16:29 -07:00
Michael Crosby
e0db426ff6
Merge pull request #7764 from vieux/revert
...
Revert "--help option and help command should print to stdout not stderr"
2014-08-27 12:02:02 -07:00
Victor Vieux
2e489073d9
Revert "--help option and help command should print to stdout not stderr"
...
This reverts commit 61b129d818vieux@docker.com >
2014-08-27 18:59:13 +00:00
Hollie Teal
77ca0ae9de
Added Fred's suggestions.
...
Signed-off-by: Hollie Teal <hollie@docker.com >
2014-08-27 11:49:26 -07:00
Michael Crosby
835800fcd5
Merge pull request #7686 from guywithnose/trancateNames
...
Truncate the names list on ps
2014-08-27 11:46:28 -07:00
Robert Bittle
d2ffcd986f
Truncate the names list on ps
...
Signed-off-by: Robert Bittle <guywithnose@gmail.com >
2014-08-27 14:24:49 -04:00
Victor Vieux
76fd51a478
Merge pull request #6052 from rhatdan/help
...
--help option and help command should print to stdout not stderr
2014-08-27 11:17:16 -07:00
James Turnbull
7458a82e0b
Added Syntax highlighting file for the KDE Kate Editor
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-08-27 11:16:51 -07:00
Eric Windisch
0bd1c05e5c
Restrict repository names from matching hexadecimal strings
...
To avoid conflicting with layer IDs, repository names must
not be tagged with names that collide with hexadecimal strings.
Signed-off-by: Eric Windisch <eric@windisch.us >
2014-08-27 13:46:10 -04:00
Alexandr Morozov
bd049b3800
Skip "no chain" error on deleting chain in Unmap
...
Fixes #6904
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-27 20:24:27 +04:00
Michael Crosby
1385b2d293
Merge pull request #7740 from LK4D4/registry_style
...
Style fixes for registry/registry.go
2014-08-26 18:02:11 -07:00
Brian Goff
7495fbc0e3
Cleanup: applyVolumesFrom
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-08-26 20:52:58 -04:00
Dawn Chen
9cd77818bb
Bump containervm version to the latest one: 20140826
2014-08-26 16:59:21 -07:00
Hollie Teal
161cc21f24
Final changes.
...
Signed-off-by: Hollie Teal <hollie@docker.com >
2014-08-26 14:01:10 -07:00
James Turnbull
4fe6115fb1
Merge pull request #7741 from LK4D4/bump_docs_to_1.15
...
Bump docs and api to 1.15
2014-08-26 13:44:05 -07:00
James Turnbull
5b6c25f751
Merge pull request #7735 from SvenDowideit/lxcconf-api-docs
...
Lxcconf api docs
2014-08-26 13:43:48 -07:00
Michael Crosby
b458dd1dfb
Merge pull request #7745 from LK4D4/fix_docker_host_panic
...
Fix panic for DOCKER_HOST without ://
2014-08-26 11:23:30 -07:00
Tibor Vass
c4a190db0c
Merge pull request #7744 from LK4D4/fix_race_cleanup_start_#6904
...
Fix race condition between cleanup and Start
2014-08-26 14:17:11 -04:00
Michael Crosby
55f7dd8198
Merge pull request #7642 from LK4D4/style_fixes
...
Style fixes for daemon package
2014-08-26 10:59:05 -07:00
Michael Crosby
89f64712fa
Merge pull request #7702 from LK4D4/fix_panic_on_bad_device_#7701
...
Handle error from GetDevice early
2014-08-26 10:53:40 -07:00
Alexandr Morozov
12ff89a390
Fix race condition between cleanup and Start
...
There was problem when Start might be before cleanup
Fixes #6904
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-26 20:57:12 +04:00
Alexandr Morozov
660cc4a267
Fix panic for DOCKER_HOST without ://
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-26 20:32:10 +04:00
Tibor Vass
63ed18ad11
Merge pull request #7615 from crosbymichael/fix-utils-panic
...
Fix panic in validate context for build
2014-08-26 10:30:42 -04:00
Alexandr Morozov
e261618b24
Bump docs and api to 1.15
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-26 13:08:50 +04:00
Alexandr Morozov
45a2923874
Style fixes for registry/registry.go
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-26 12:28:40 +04:00
Alexandr Morozov
698392cb51
Remove redundant elses
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-26 09:28:54 +04:00
Alexandr Morozov
1ba15b8aca
Use ++ instead of += 1
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-26 09:27:07 +04:00
SvenDowideit
b0edced87f
Fix the other API docs to use an array of key/values
...
as per #7706
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-08-26 11:36:25 +10:00
getvictor
216ab880f9
Updating LxcConf to match Docker command line
...
I've changed LxcConf on a previous API document. Not sure why it keeps getting changed back. I'm seeing Docker 1.2.0 command-line calls are still using the array of key/values.
Docker-DCO-1.1-Signed-off-by: getvictor <victor@victoreda.com > (github: SvenDowideit)
2014-08-26 11:36:25 +10:00
Sven Dowideit
a05d8d4f4f
Merge pull request #7733 from Djelibeybi/oraclelinux-docs
...
Oracle Linux docs
2014-08-25 18:14:36 -07:00
Avi Miller
fcad8ee83a
Add Oracle Linux specific documentation for installation of Docker from Oracle Linux repositories on Oracle Linux 6 and 7.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com >
2014-08-26 11:10:09 +10:00
Sven Dowideit
849086d3d9
Merge pull request #7732 from SvenDowideit/ubuntu-backported-kernel
...
Ubuntu backported kernel
2014-08-25 17:16:34 -07:00
SvenDowideit
93d574298d
small word change
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-08-26 10:15:12 +10:00
Hollie Teal
1d1bb2ae45
Image additions and copy changes.
...
Signed-off-by: Hollie Teal <hollie@docker.com >
2014-08-25 16:50:55 -07:00
Sven Dowideit
97c7b0115b
Merge pull request #7603 from kuon/centos7
...
Added manual installation instruction for Centos7 and note about firewalld.
2014-08-25 16:49:09 -07:00
Michael Crosby
b0abd6de63
Merge pull request #7574 from crosbymichael/update-restart-docs
...
Update flag usages and docs for max restart count
2014-08-25 16:26:06 -07:00
Michael Crosby
2bdfbab23d
Merge pull request #7622 from rajdeepd/master
...
Added Test case for Engine shutdown
2014-08-25 15:57:11 -07:00
Michael Crosby
228eda4fd5
Merge pull request #7629 from LK4D4/fix_follow_hang_on_stop
...
Fix logs -f hanging on stopped containers
2014-08-25 15:24:20 -07:00
Michael Crosby
7556a42453
Merge pull request #7716 from coolljt0725/master
...
Fix the bug of docker import command when import a image with a tag use format 'URL|- [REPOSITORY[:TAG]]'
2014-08-25 15:11:50 -07:00
Lei Jitang
7e72ed70f9
add docker import test with a tag. Fixes #7714
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2014-08-26 15:51:22 +08:00
Lei Jitang
79cf839527
Fix the bug of docker import command when import a image with a tag use format 'URL|- [REPOSITORY[:TAG]]'.Fixes #7714
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2014-08-26 15:51:22 +08:00
Michael Crosby
cd776cdd77
Fix panic in validate context for build
...
Fixes #7611
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-25 14:25:31 -07:00
Tibor Vass
34438efffe
Merge pull request #7659 from somaopensource/soma
...
daemon: rename from "delete" job to "rm"
2014-08-25 15:54:14 -04:00
Michael Crosby
321df7fd61
Merge pull request #7649 from tianon/vendor-optional-go
...
Optionalize the "hg clone" of Go, since it takes forever
2014-08-25 12:00:23 -07:00
Victor Vieux
d1544a0930
Merge pull request #7683 from LK4D4/fix_build_hang_pipe_#7680
...
Skip permissions check on named pipes
2014-08-25 12:00:11 -07:00
Alexandr Morozov
07f2e79486
Skip permissions check on named pipes
...
Fixes #7680
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-25 22:59:53 +04:00
Victor Vieux
e1defe71c3
Merge pull request #7691 from carmstrong/patch-1
...
Fix typo for --restart deprecation
2014-08-25 11:13:27 -07:00
Michael Crosby
2c9789bbf7
Merge pull request #7725 from erikh/fix_registry_test
...
fix return values in registry mock service
2014-08-25 10:56:00 -07:00
Erik Hollensbe
e81b686924
fix return values in registry mock service
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-25 10:29:38 -07:00
James Turnbull
bef33cf88a
Merge pull request #7700 from jamtur01/relnotes
...
Removed deprecated release notes
2014-08-25 07:13:11 -07:00
Nicolas Goy
d4a53a7bce
Added manual installation instruction for Centos7.
...
Added a note about firewalld.
Signed-off-by: Nicolas Goy <kuon@goyman.com >
2014-08-25 04:00:11 +02:00
Alexandr Morozov
17b95ecb08
Handle error from GetDevice early
...
Also more verbose error.
Fixes panic from #7701
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-24 14:09:30 +04:00
James Turnbull
df38eb4d43
Removed deprecated release notes
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-08-23 20:01:41 -04:00
Hollie Teal
e4ff140fdd
Additional formatting and markdown changes to B2D volume resize doc
...
Signed-off-by: Hollie Teal <hollie@docker.com >
2014-08-22 18:19:58 -07:00
Hollie Teal
db3db49e9c
Initial commit: Increase Boot2Docker Volume + images
...
Signed-off-by: Hollie Teal <hollie@docker.com >
2014-08-22 17:06:28 -07:00
Chris Armstrong
ef9a5926e9
Fix typo for --restart deprecation
...
Signed-off-by: Chris Armstrong <chris@opdemand.com >
2014-08-22 12:56:43 -07:00
James Turnbull
6bc773b2c1
Merge pull request #7684 from averagehuman/patch-1
...
Update usingdocker.md
2014-08-22 13:16:33 -04:00
averagehuman
fe845c4da8
Update usingdocker.md
...
Minor rewording and removal of unnecessary apostrophe.
2014-08-22 17:48:26 +01:00
Tianon Gravi
651f521e17
Merge pull request #7632 from erikh/fix_check_config
...
fix check-config.sh to check for CGROUP_PERF
2014-08-22 11:42:08 -05:00
Victor Vieux
094cd7040b
Merge pull request #7638 from vivekdasgupta/minor-fixes
...
Fix data space reporting from Kb/Mb to KB/MB
2014-08-22 11:40:49 -05:00
Victor Vieux
bd7c7febb9
Merge pull request #7668 from docker/merge_release_v1.2.0
...
Merge release v1.2.0
2014-08-22 11:18:48 -05:00
Erik Hollensbe
01094c1568
Fix multiple attach test.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-22 03:58:05 -07:00
Victor Vieux
61b309f0d2
Change version to 1.2.0-dev
2014-08-21 15:55:00 -04:00
Victor Vieux
380aef2dc1
Merge remote-tracking branch 'origin/release'
2014-08-21 15:54:02 -04:00
Dan Walsh
61b129d818
--help option and help command should print to stdout not stderr
...
--help and help are successful commands so output should not go to error.
QE teams have requested this change, also users doing docker help | less
or docker run --help | less would expect this to work.
Usage statement should only be printed when the user asks for it.
Errors should print error message and then suggest the docker COMMAND --help
command to see usage information.
The current behaviour causes the user to have to search for the error message
and sometimes scrolls right off the screen. For example a error on a
"docker run" command is very difficult to diagnose.
Finally erros should always exit with a non 0 exit code, if the user
makes a CLI error.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-08-21 15:35:20 -04:00
Victor Vieux
7649264eb8
Merge pull request #7644 from vieux/bump_v1.2.0
...
Bump v1.2.0
2014-08-21 14:32:00 -05:00
Hollie Teal
c87d9a1de6
Clean up typos in hub_registry_spec.md
...
Couple of instances of incorrect articles (e.g. "an Docker Hub").
2014-08-21 11:04:25 -07:00
Vivek Dasgupta
a327d9b91e
Fix data space reporting from Kb/Mb to KB/MB
...
Docker-DCO-1.1-Signed-off-by: Vivek Dasgupta <vdasgupt@redhat.com > (github: vivekdasgupta)
2014-08-21 21:03:44 +05:30
limsy
239e932485
daemon: rename from "delete" job to "rm"
...
This commit fixes following FIXMEs:
// FIXME: rename "delete" to "rm" for consistency with the CLI command
// FIXME: rename ContainerDestroy to ContainerRm for consistency with the CLI command
Signed-off-by: lim seong yeol <seongyeol37@gmail.com >
2014-08-21 19:58:26 +09:00
dragon788
27f44b9bb1
Add link to Ubuntu notes about LTSEnablementStack
...
When running Ubuntu with a graphical environment, the kernel version MUST match the Xorg version. Only installing the suggested packages above breaks Unity for anything other than 2D mode (in VMware and probably native).
Signed-off-by: Ethan Spoelstra <ewspoelstra@computerphreaks.com >
2014-08-20 22:23:34 -05:00
Victor Vieux
fa7b24f2c3
Bump version to v1.2.0
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-08-20 21:11:18 +00:00
Victor Vieux
380129d0d7
Merge remote-tracking branch 'origin/master' into bump_v1.2.0
...
Conflicts:
VERSION
daemon/container.go
daemon/daemon.go
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-08-20 20:19:03 +00:00
Tianon Gravi
78c6882567
Optionalize the "hg clone" of Go, since it takes forever (now, to update our Go version too, we need to explicitly "./hack/vendor.sh --go")
...
Signed-off-by: Andrew Page <admwiggin@gmail.com >
2014-08-20 14:17:11 -06:00
Victor Vieux
b1d20c483a
Merge pull request #7648 from crosbymichael/update-libcontainer-aug5
...
Update libcontainer to db65c35051d05f3fb218a0e84a1
2014-08-20 15:15:23 -05:00
James Turnbull
997336fd95
Merge pull request #7634 from krrg/patch-1
...
Update openSUSE installation instructions
2014-08-20 14:46:41 -04:00
Michael Crosby
624b944896
Update libcontainer to db65c35051d05f3fb218a0e84a1
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-20 11:19:55 -07:00
Eric Windisch
cd71f92a7f
Add Eric Windisch to MAINTAINER for tarsum
...
This code is vital to the security of the project and it is important
we assure it is well-maintained and guarded.
I am vested in assuring this code maintains security and
provides as much compatibility as possible between releases.
Signed-off-by: Eric Windisch <eric@windisch.us >
2014-08-20 11:19:46 -07:00
Joffrey F
2eb26991f4
Merge pull request #7495 from sontags/enable_search_on_private_reg
...
Enable `docker search` on private docker registry.
2014-08-20 18:10:29 +02:00
Alexandr Morozov
f04ef96e07
Test for following logs for stopped container
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-20 20:02:56 +04:00
Victor Vieux
94fbcea7a3
Merge pull request #5129 from vieux/host_resolv
...
allow /etc/hosts /etc/resolv.conf and /etc/hostname to be changed
2014-08-20 11:02:36 -05:00
Erik Hollensbe
ce3c1f376c
fix check-config.sh to check for CGROUP_PERF
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-20 13:37:39 +00:00
James Turnbull
494bea9fba
Merge pull request #7633 from fredlf/root_builder_warning
...
Added warning re: using root for dockerfile root. Fixes #7612
2014-08-20 08:02:38 -04:00
James Turnbull
0d26b7cc6d
Merge pull request #7635 from bfirsh/docs-https-newsletter-url
...
Use HTTPS for newsletter signup form
2014-08-20 08:01:27 -04:00
James Turnbull
9faf0254ef
Merge pull request #7640 from xiaods/develop
...
Cleanup: correct cli --volumes-from description
2014-08-20 08:01:05 -04:00
Deshi Xiao
4d0b88c52f
Cleanup: correct cli --volumes-from description
...
issue #7580 volumes-from comma separated list mentioned this case.
Options like --volumes-from=[] indicate they can be specified multiple times:
docker run -it --rm --volumes-from TEST_DATA --volumes-from TEST_DATA2 ubuntu bash
Signed-off-by: Deshi Xiao <dxiao@redhat.com >
2014-08-20 16:31:04 +08:00
Fred Lifton
98dd982586
Fixed a typo and added a bit based on Sven's feedback
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-08-19 17:22:11 -07:00
Ben Firshman
8c7915fcde
Use HTTPS for newsletter signup form
...
This is causing an insecure HTTPS error in Chrome 37.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-08-19 15:39:37 -07:00
krrg
05a09675c3
Update openSUSE installation instructions
...
Out of box, the 'sudo' command on openSUSE does not work similarly to other distros. In this case, the path to usermod should be explicitly given, since /usr/sbin, where usermod is located, is not on the sudoing user's PATH. The other sudo commands here should be fine.
2014-08-19 16:03:51 -06:00
Fred Lifton
b63c10558e
Added warning re: using root for dockerfile root. Fixes #7612
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-08-19 13:39:50 -07:00
Victor Vieux
d4c2d0c57f
Merge pull request #7608 from LK4D4/remove_internet_dep
...
Remove internet dependency from TestBuildCacheADD
2014-08-19 14:13:52 -05:00
Alexandr Morozov
badf8247af
Fix logs -f hanging on stopped containers
...
Fixes #7020
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-19 22:23:02 +04:00
Vincent Batts
487af281bf
Merge pull request #7602 from unclejack/tarsum_garbage_reduction
...
pkg/tarsum: avoid buf2 allocation in Read
2014-08-19 13:50:15 -04:00
Michael Crosby
7db55a1807
Merge pull request #7613 from VojtechVitek/godoc_travis
...
Add GoDoc and Travis build link/images to README
2014-08-19 12:21:05 -05:00
Fred Lifton
abc1346777
Merge pull request #7604 from SvenDowideit/docs-update
...
update the cli / man page docs based on what is in master right now
2014-08-19 10:12:50 -07:00
Tibor Vass
39bcc3a3e5
Merge pull request #7628 from crosbymichael/fix-search-test
...
Fix search test for busybox image
2014-08-19 12:11:29 -05:00
Victor Vieux
26feb09fac
add small doc
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-08-19 17:06:17 +00:00
Victor Vieux
fc39f9c78d
add tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-08-19 17:06:17 +00:00
Victor Vieux
f3b2c93b9f
allow /etc/hosts /etc/resolv.conf and /etc/hostname to be changed
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-08-19 17:06:17 +00:00
Michael Crosby
dad2fcb199
Fix search test for busybox image
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-19 09:52:46 -07:00
Rajdeep Dua
0800f8cc19
Added Test case for Engine shutdown
...
Docker-DCO-1.1-Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com > (github: rajdeepd)
2014-08-19 04:59:13 -07:00
Sven Dowideit
366fe67946
Merge pull request #7610 from remram44/patch-1
...
Fixes "note" blockquote too long [doc, minor]
2014-08-19 09:11:15 +10:00
Vojtech Vitek (V-Teq)
7cb6871355
Add GoDoc and Travis build link/images to README
...
Signed-off-by: Vojtech Vitek (V-Teq) <vvitek@redhat.com >
2014-08-19 01:08:47 +02:00
Remi Rampin
99082de9ad
Fixes "note" blockquote too long [doc, minor]
...
A "note" block includes too much text, so if you skip over it the next paragraph makes zero sense.
2014-08-18 15:31:37 -04:00
Michael Crosby
37db53bf7a
Merge pull request #7597 from crosbymichael/update-libcontainer-aug4
...
Update libcontainer to 29363e2d2d7b8f62a5f353be333
2014-08-18 12:24:17 -05:00
Alexandr Morozov
075e1bc1c3
Remove internet dependency from TestBuildCacheADD
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-18 14:13:43 +04:00
SvenDowideit
018e75a6e4
update the cli / man page docs based on what is in master right now
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-08-18 09:31:58 +10:00
unclejack
55533693be
pkg/tarsum: avoid buf2 allocation in Read
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-08-17 14:45:11 +03:00
Daniel Menet
c1ee94a343
resolved merge conflict
...
Signed-off-by: Daniel Menet <membership@sontags.ch >
2014-08-16 14:29:15 +02:00
Daniel Menet
676308b853
Expand hostname before passing it to NewRegistry()
...
Signed-off-by: Daniel Menet <membership@sontags.ch >
2014-08-16 14:25:46 +02:00
Daniel Menet
3231033a80
Enable docker search on private docker registry.
...
The cli interface works similar to other registry related commands:
docker search foo
... searches for foo on the official hub
docker search localhost:5000/foo
... does the same for the private reg at localhost:5000
Signed-off-by: Daniel Menet <membership@sontags.ch >
2014-08-16 14:24:32 +02:00
Michael Crosby
a67d06fd43
Update libcontainer to 29363e2d2d7b8f62a5f353be333
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-15 15:41:05 -07:00
Victor Vieux
7afb98ad5d
Merge pull request #7594 from vieux/remove_empty_folder
...
remove empty builder folder
2014-08-15 10:57:14 -07:00
Victor Vieux
57564d91a4
remove empty builder folder
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-08-15 17:52:44 +00:00
Victor Vieux
101c749b65
Merge pull request #7589 from shykes/cleanup-img-depth
...
Cleanup: move image depth checks in image/
2014-08-15 10:47:36 -07:00
Tianon Gravi
a20f4ce291
Merge pull request #7593 from tianon/remove-crashtest
...
Remove crashTest.go since the use case is covered by docker-stress
2014-08-15 10:43:45 -07:00
Tianon Gravi
3a70ca3c67
Remove crashTest.go since the use case is covered by docker-stress
...
Signed-off-by: Andrew Page <admwiggin@gmail.com >
2014-08-15 11:28:58 -06:00
Fred Lifton
d1fc32e265
Merge pull request #7581 from samuel-phan/patch-1
...
Update docker-attach.1.md
2014-08-14 18:36:23 -07:00
Fred Lifton
31bd4a19c9
Merge pull request #7562 from jperrin/master
...
Updated CentOS documentation to reflect CentOS 7 install.
2014-08-14 18:32:05 -07:00
Fred Lifton
4bcc7e283f
Merge pull request #7546 from hollietealok/master
...
Added fredlf's suggested changes.
2014-08-14 18:27:50 -07:00
Solomon Hykes
2a39635d30
Cleanup: move image depth checks in image/
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-15 00:43:12 +00:00
Victor Vieux
5a1e4a1092
Merge pull request #7582 from LK4D4/fix_races
...
Fix some race conditions
2014-08-14 14:35:04 -07:00
Alexandr Morozov
0d4d7e4a28
Cleanup: Make channels unbuffered
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-14 21:51:25 +04:00
Alexandr Morozov
f1975cbc7c
Fix race on state serialization
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-14 21:51:15 +04:00
Alexandr Morozov
93d6adf8a1
Fix race between container cleanup and inspect/ps
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-14 21:51:06 +04:00
Alexandr Morozov
1480168e9f
Fix race condition in sending started signal from monitor
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-14 21:50:56 +04:00
James Turnbull
17112704b9
Merge pull request #7126 from ostezer/update-certificates
...
Docs: articles/certificates.md rewrite.
2014-08-14 08:52:08 -04:00
Samuel PHAN
5073554ca6
Update docker-attach.1.md
2014-08-14 14:20:38 +02:00
Victor Vieux
a7d116f1b0
Merge pull request #7573 from vieux/remove_double_newline
...
remove double newline
2014-08-13 23:24:30 -07:00
Andy Rothfusz
31a9c97d7d
Merge pull request #7544 from metalivedev/fixmailmap
...
Fix my email entry. FIxing email entry.
2014-08-13 20:05:56 -07:00
Sven Dowideit
f945edb3e0
Merge pull request #7532 from ChristopherBiscardi/shiftWindow
...
Remove Old shiftWindow()
2014-08-14 12:48:19 +10:00
Victor Vieux
a0392324f1
another commit to do like @crosbymichael
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-08-14 01:36:26 +00:00
Michael Crosby
5ad4879d2a
Update flag usages and docs for max restart count
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-13 18:24:33 -07:00
Victor Vieux
fcf37be2b1
remove double newline
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-08-14 01:08:27 +00:00
Jim Perrin
d939fe758a
Updated CentOS documentation to reflect CentOS 7 install.
...
Added reference to CentOS Dockerfiles on github.
Signed-off-by: Jim Perrin <jperrin@centos.org > (github: jperrin)
2014-08-13 19:06:53 -05:00
Michael Crosby
b95f6c183b
Merge pull request #7414 from crosbymichael/auto-restart
...
Auto restart containers based on restart policy
2014-08-13 16:17:51 -07:00
Michael Crosby
25c519e829
Deprecate --restart on the daemon
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-13 16:08:50 -07:00
Michael Crosby
73ced63680
Update based on comments from the code review
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-13 15:58:55 -07:00
Michael Crosby
2ec1b697c1
Rebased changes to return on first start's error
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-13 15:58:55 -07:00
Michael Crosby
ebf5d4657d
Reguardless of success reset time increment
...
Reset the time increment if the container's execution time is greater
than 10s or else as a container runs and is restarted the time will grow
overtime.
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-13 15:58:54 -07:00
Michael Crosby
972c894931
Improve wait during restart
...
We need to do this so that when a user asks docker to stop the container
and it is currently in the restart loop we don't want to have to wait
for the duration of the restart time increment before ack. the stop.
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-13 15:58:54 -07:00
Michael Crosby
c4a00d549d
Honor the restarting state in Stop
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-13 15:58:54 -07:00
Michael Crosby
a2afb2b1e3
Add Restarting state when docker is handling the restart of containers
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-13 15:58:54 -07:00
Michael Crosby
be22d7ac2d
Add additional comments for vague lines
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-13 15:58:54 -07:00
Michael Crosby
6ae05936e1
Move container start event into monitor
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-13 15:58:54 -07:00
Michael Crosby
b7550cd456
Fix rebase around log event
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-13 15:58:54 -07:00
Michael Crosby
feda8fbb21
Restart conatiner with on-failure policy if exit code != 0
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-13 15:58:54 -07:00
Michael Crosby
41870a42be
Only restart containers on daemon load with policy of always
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-13 15:58:54 -07:00
Michael Crosby
617edd89f4
Update docs based on feedback from review for --restart
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-13 15:57:37 -07:00
Michael Crosby
860c13b788
Add documentation and update restart rules.
...
Implement time backed backoff for restarting and fix failure count when
the maximum is 0
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-13 15:57:37 -07:00
Michael Crosby
2b0776c883
Refactor container monitor into type
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-13 15:56:53 -07:00
Michael Crosby
d9753ba20d
Add typed RestartPolicy
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-13 15:56:34 -07:00
Michael Crosby
e0a076d486
Cleanup restart logic in monitor
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-13 15:56:34 -07:00
Michael Crosby
bd8c9dc239
Restart containers based on restart policy
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-13 15:56:34 -07:00
Tibor Vass
0d70706b4b
Merge pull request #7569 from erikh/pkg_log
...
Cleanup: Extract log utils into pkg/log
2014-08-13 18:43:08 -04:00
Victor Vieux
6b363b81de
Merge pull request #7572 from shykes/workaround-api-shutdown
...
Workaround to avoid 5 second delay on graceful daemon restart
2014-08-13 15:41:33 -07:00
Erik Hollensbe
ac63d925d2
move utils.Fataler to pkg/log.Fataler
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-13 15:32:41 -07:00
Josiah Kiehl
a02f67be5b
Extract log utils into pkg/log
...
Docker-DCO-1.1-Signed-off-by: Josiah Kiehl <josiah@capoferro.net > (github: capoferro)
2014-08-13 15:18:15 -07:00
Victor Vieux
13eb477b62
Merge pull request #7506 from shykes/cleanup-daemonconfig
...
Cleanup: refactor parsing and handling of Daemon config
2014-08-13 15:07:13 -07:00
Solomon Hykes
6aecdb4f8e
Workaround to avoid 5 second delay on graceful daemon restart
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-13 21:40:25 +00:00
Michael Crosby
fd1b563b4f
Merge pull request #7548 from crosbymichael/proxy-exec
...
Move userland proxies out of daemon process
2014-08-13 14:03:40 -07:00
Solomon Hykes
2837a36bd7
Merge pull request #7570 from erikh/remove_fixme
...
Remove FIXME file
2014-08-13 13:55:20 -07:00
Olivier Gambier
49c43004a7
Merge pull request #7194 from vbatts/vbatts-registry_re-org
...
registry: cleanup and rename Registry -> Session
2014-08-13 13:37:56 -07:00
Tibor Vass
0c6b137f06
Merge pull request #7484 from cpuguy83/cleanup_volume_init
...
Cleanup: initializeVolume
2014-08-13 16:18:02 -04:00
Brian Goff
e350df5b2c
Cleanup: initializeVolume
...
- Use a common struct for Volumes
- Split out some functionality in intializeVolume into separate functions
- Removes some duplicate code
- In general much easier to grok the code now
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-08-13 15:55:59 -04:00
Erik Hollensbe
7bfc78b038
Remove FIXME file
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-13 12:49:12 -07:00
Solomon Hykes
a30fd7a962
Fix inconsistency in IP address parsing errors
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-13 19:25:51 +00:00
Solomon Hykes
1d10c55aec
Move remote API config out of daemon/
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-13 19:25:51 +00:00
Solomon Hykes
1eba59eb24
Check for conflicting daemon config options in NewDaemon
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-13 19:25:51 +00:00
Solomon Hykes
ca11b77471
opts.IPVal returns an error on incorrect input
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-13 19:25:51 +00:00
Solomon Hykes
353b7c8ec7
Parse daemon configuration in daemon.Config.InstallFlags instead of main
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-13 19:25:51 +00:00
Solomon Hykes
6200002669
Helpers to parse lists, IPs, hosts, dns searches from the command line
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-13 19:25:47 +00:00
Michael Crosby
33fa175abf
Merge pull request #7568 from crosbymichael/replace-7240
...
Exit after receiving SIGTERM
2014-08-13 12:23:34 -07:00
Michael Crosby
cdf8a55670
Exit after receiving SIGTERM
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-13 12:18:23 -07:00
Solomon Hykes
6d59a56675
opts.IpOpt: a helper to parse IP addressed from the command line
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-13 19:09:51 +00:00
Solomon Hykes
a4befff533
Move daemonconfig into daemon
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-13 19:09:51 +00:00
Michael Crosby
b4e2f5ed96
Move userland proxies out of daemon's process
...
This PR moves the userland proxies for TCP and UDP traffic out of the
main docker daemon's process ( from goroutines per proxy ) to be a
separate reexec of the docker binary. This reduces the cpu and memory
needed by the daemon and if the proxy processes crash for some reason
the daemon is unaffected. This also displays in the standard process
tree so that a user can clearly see if there is a userland proxy that is
bound to a certain ip and port.
```bash
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
5d349506feb6 busybox:buildroot-2014.02 "sh" 13 minutes ago Up 1 seconds 0.0.0.0:49153->81/tcp, 0.0.0.0:49154->90/tcp hungry_pike
root@1cbfdcedc5a7:/go/src/github.com/docker/docker# ps aux
USER PID %CPU %MEM VSZ RSS TTY STAT START TIME COMMAND
root 1 0.0 0.1 18168 3100 ? Ss 21:09 0:00 bash
root 8328 0.7 0.6 329072 13420 ? Sl 22:03 0:00 docker -d -s vfs
root 8373 1.0 0.5 196500 10548 ? Sl 22:03 0:00 userland-proxy -proto tcp -host-ip 0.0.0.0 -host-port 49153 -container-ip 10.0.0.2 -container-port 81
root 8382 1.0 0.5 270232 10576 ? Sl 22:03 0:00 userland-proxy -proto tcp -host-ip 0.0.0.0 -host-port 49154 -container-ip 10.0.0.2 -container-port 90
root 8385 1.2 0.0 3168 184 pts/0 Ss+ 22:03 0:00 sh
root 8408 0.0 0.1 15568 2112 ? R+ 22:03 0:00 ps aux
```
This also helps us to cleanly cleanup the proxy processes by stopping
these commands instead of trying to terminate a goroutine.
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-13 11:54:47 -07:00
Victor Vieux
c9c271858a
Merge pull request #6162 from vbatts/vbatts-ps_filter
...
docker ps: introducing filters
2014-08-13 11:44:48 -07:00
unclejack
c071cd7c7c
Merge pull request #7553 from LK4D4/update_to_1.3.1
...
bump Go to 1.3.1
2014-08-13 21:42:32 +03:00
Michael Crosby
283ee10886
Add Self func to reexec pkg to return the current binary path
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-13 11:14:33 -07:00
Michael Crosby
1c5a4e0900
Merge pull request #7559 from LK4D4/fix_udp_proxy_deadlock
...
Fix deadlock on failed dial in UDP userland proxy
2014-08-13 11:11:09 -07:00
Michael Crosby
ad7279e480
Merge pull request #7555 from LK4D4/fix_vet_warnings
...
Fix go vet warnings
2014-08-13 10:40:38 -07:00
Michael Crosby
3cc79e7818
Merge pull request #7556 from shykes/cristian-integration-maintainer
...
Add Cristian to integration/MAINTAINERS
2014-08-13 10:39:50 -07:00
Michael Crosby
c9e359cf97
Merge pull request #7497 from shykes/cleanup-server
...
Remove deprecated server package
2014-08-13 10:37:37 -07:00
James Turnbull
8c38a3d732
Merge pull request #7552 from michaelthies/patch-1
...
Update postgresql_service.md
2014-08-13 09:40:51 -04:00
Vincent Batts
752dd707ac
registry.Registry -> registry.Session
...
renaming this struct to more clearly be session, as that is what it
handles.
Splitting out files for easier readability.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2014-08-13 09:27:43 -04:00
Alexandr Morozov
6cbb8e070d
Fix deadlock on failed dial in UDP userland proxy
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-13 17:18:37 +04:00
Vincent Batts
84146719d8
docker ps: introducing filters
...
* starting with filtering for exit codes. `docker ps -a --filter 'exited=1'`
* API doc for filter parameter
* formatting filters for help usage
* tweaks for review
This requires https://github.com/dotcloud/docker/pull/4430
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-08-13 09:12:33 -04:00
Tianon Gravi
57f6b3e1ec
Merge pull request #7545 from tianon/mkimage-lucid-fix
...
Fix contrib/mkimage/debootstrap for Lucid
2014-08-13 06:46:51 -06:00
Solomon Hykes
7d1b2ebde8
Add Cristian to hack/MAINTAINERS
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-13 08:13:51 +00:00
Solomon Hykes
da63a93e89
Add Cristian to integration/MAINTAINERS
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-13 07:50:40 +00:00
Alexandr Morozov
391c35c822
Fix go vet warnings
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-13 11:37:30 +04:00
Solomon Hykes
63503cafe4
Remove deprecated server/ package
...
Victory!
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-13 06:56:45 +00:00
Alexandr Morozov
c6595b3ee8
bump Go to 1.3.1
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-13 10:49:03 +04:00
Michael Thies
99423e7e1e
Update postgresql_service.md
...
fix typo
2014-08-12 23:30:04 -05:00
Solomon Hykes
491deae9b8
Move "build" to daemon/build.go
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-13 03:12:33 +00:00
Michael Crosby
64579f51fc
Merge pull request #7301 from vieux/fix_goroutines_leak_exit_code
...
fix goroutines leak and exit code
2014-08-12 17:37:24 -07:00
Victor Vieux
b06311a72e
fix goroutines leak and exit code
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-08-13 00:03:56 +00:00
Tibor Vass
136631df46
Merge pull request #7549 from vieux/fix_leftover
...
fix #7374 leftover
2014-08-12 19:51:57 -04:00
Victor Vieux
bcfd6a653b
fix #7374 leftover
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-08-12 23:37:33 +00:00
Andy Rothfusz
10ec205b77
Updated AUTHORS file
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
2014-08-12 16:19:10 -07:00
James Turnbull
3de3719290
Merge pull request #7359 from timthelion/patch-10
...
Add process for PR acceptance, review, rejection
2014-08-12 19:17:10 -04:00
Hollie Teal
e608312677
Removed merge conflict artifacts.
...
Signed-off-by: Hollie Teal <hollie@docker.com >
2014-08-12 15:30:21 -07:00
Hollie Teal
af5ced62ca
Added fredlf's suggested changes.
...
Signed-off-by: Hollie Teal <hollie@docker.com >
2014-08-12 15:21:55 -07:00
Tianon Gravi
631fadc0b9
Fix contrib/mkimage/debootstrap for Lucid
...
Later versions of `apt` are smart enough to just create this directory if it's missing, but Lucid balks (just like `gnupg` and `gpgv` aren't in the Required set so don't come in a minbase -- good ol' Lucid).
Signed-off-by: Andrew Page <admwiggin@gmail.com >
2014-08-12 15:37:42 -06:00
Victor Vieux
91a2f22aca
Merge pull request #7538 from LK4D4/move_some_integration_to_cli
...
Move some integration to cli
2014-08-12 14:17:08 -07:00
Timothy Hobbs
e4a09cd79d
Add process for PR acceptance, review, rejection
...
This is an extremely tentative PR. However, I feel that the suggestions are generally good.
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: timthelion)
2014-08-12 20:29:45 +00:00
Andy Rothfusz
8830653977
Fix my email entry so that my current email is first and the old commit email second.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
2014-08-12 13:24:42 -07:00
Tibor Vass
18a0eba72d
Merge pull request #7466 from tiborvass/irc-meetings
...
Add irc-meetings section in CONTRIBUTING
2014-08-12 13:36:57 -04:00
Tibor Vass
c58c70b8bd
Add irc-meetings section in CONTRIBUTING
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-08-12 13:35:14 -04:00
Victor Vieux
0771eb32dc
Merge pull request #7528 from lalyos/fix_version_number_comparison
...
Fix version number comparison
2014-08-12 10:16:55 -07:00
James Turnbull
d42326d927
Merge pull request #7531 from ChristopherBiscardi/priv-repos
...
Private Repos Copy Change
2014-08-12 09:50:21 -04:00
James Turnbull
96b52545ab
Merge pull request #7533 from cirocosta/patch-1
...
Updates docs regarding linux mint troubleshot
2014-08-12 08:21:30 -04:00
O.S. Tezer
7df5493071
Docs: articles/certificates.md rewrite.
...
This commit contains a re-structured re-write of the original
certificated.md file, containing the amendments proposed with
PR #7120 (commit ID bd28595e31https://github.com/dotcloud/docker/pull/7120
2014-07-30: Update/rebase/squash based on the comments from @jamtur01 and @fredlf.
2014-08-12: Update/rebase/squash based on the comments from @fredlf (of 2014-08-12).
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-08-12 14:49:08 +03:00
Alexandr Morozov
c19e0fe7e2
Move TestRunExit to integration-cli
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-12 13:40:14 +04:00
Alexandr Morozov
a44f065f17
Move TestRunWorkdirExistsAndIsFile to integration-cli
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-12 12:22:25 +04:00
Ciro S. Costa
fcddecc828
Updates docs regarding linux mint troubleshot
...
Signed-off-by: Ciro S. Costa <ciro.costa@usp.br >
2014-08-12 02:56:57 -03:00
Victor Vieux
01995ebebb
Merge pull request #7490 from crosbymichael/reexec
...
Use argv0 as reexec implementation for dockerinit
2014-08-11 18:43:34 -07:00
Michael Crosby
1a249a5feb
Panic if trying to register an func with the same name
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-11 18:13:27 -07:00
Sven Dowideit
2c882a482e
Merge pull request #7398 from SvenDowideit/add-more-details-to-https-docs
...
tell the user what to expect, including that it is a verbose process.
2014-08-12 10:35:28 +10:00
Sven Dowideit
b94f2c4c6d
tell the user what to expect, including that it is a verbode process.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-08-12 10:32:38 +10:00
ChristoperBiscardi
1e2ce72ffe
Remove Old shiftWindow()
...
closes #7493
Docker-DCO-1.1-Signed-off-by: Christopher Biscardi <biscarch@sketcht.com > (github: ChristopherBiscardi)
2014-08-11 17:12:34 -07:00
ChristoperBiscardi
df9650eebb
Private Repos Copy Change
...
Docker-DCO-1.1-Signed-off-by: Christopher Biscardi <biscarch@sketcht.com > (github: ChristopherBiscardi)
2014-08-11 16:37:58 -07:00
lalyos
58ef92f89e
Fix equal short-long version number comparison
...
Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com >
2014-08-11 23:40:35 +02:00
lalyos
8a4d2d6f7f
Add test case for identical short and long version numbers
...
Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com >
2014-08-11 23:36:09 +02:00
Fred Lifton
8595a4ff7a
Merge pull request #7516 from thaJeztah/faqs-explain-debian-noninteractive
...
Add "DEBIAN_FRONTEND" to FAQ
2014-08-11 14:19:06 -07:00
Sebastiaan van Stijn
2e5d35c1f1
Add "DEBIAN_FRONTEND" to FAQ
...
Added some explanation on using ‘DEBIAN_FRONTEND’ to the FAQs. As
discussed here;
https://github.com/docker/docker/pull/7035#issuecomment-50967867
Docker-DCO-1.1-Signed-off-by: Sebastiaan van Stijn <github@gone.nl > (github: thaJeztah)
2014-08-11 23:12:47 +02:00
Michael Crosby
57e0cbb991
Merge pull request #7507 from shykes/cleanup-tiny
...
Cleanup: tiny little things
2014-08-11 12:41:17 -07:00
Michael Crosby
9694209241
Fix hack in old integration test for new init
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-11 11:47:22 -07:00
Michael Crosby
29af9c14e4
Remove unsued sysinit package
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-11 11:47:21 -07:00
Michael Crosby
7321067176
Use argv0 as reexec implementation for dockerinit
...
This changes the way the exec drivers work by not specifing a -driver
flag on reexec. For each of the exec drivers they register their own
functions that will be matched aginst the argv 0 on exec and called if
they match.
This also allows any functionality to be added to docker so that the
binary can be reexec'd and any type of function can be called. I moved
the flag parsing on docker exec to the specific initializers so that the
implementations do not bleed into one another. This also allows for
more flexability within reexec initializers to specify their own flags
and options.
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-11 11:47:21 -07:00
Tibor Vass
e033425f0b
Merge pull request #7502 from LK4D4/catch_error_console
...
Catch error on console creation
2014-08-11 12:13:53 -04:00
Tibor Vass
5ffbc8dc82
Merge pull request #7509 from LK4D4/fix_http_handler_error_log
...
Fix log message on http handler error
2014-08-11 12:12:33 -04:00
Tibor Vass
e94d772910
Merge pull request #7499 from LK4D4/fix_events_error
...
Fix error message on logging events
2014-08-11 12:10:30 -04:00
Tibor Vass
a9ff2fdfac
Merge pull request #7520 from LK4D4/more_events_test
...
More events test
2014-08-11 12:09:11 -04:00
unclejack
f4f1e4db70
Merge pull request #6301 from rail44/feature-load-only-not-exist-image
...
Use only unavailable image when load from Tarball
2014-08-11 11:28:52 +03:00
Alexandr Morozov
44842ea3d8
Test on untag and delete events
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-11 11:39:47 +04:00
Alexandr Morozov
17ab516fde
Test on container events
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-11 10:42:55 +04:00
Solomon Hykes
b74e507245
Merge pull request #7496 from shykes/cleanup-push-pull
...
Cleanup: move "pull" and "push" to graph/pull.go and graph/push.go
2014-08-10 23:29:28 -07:00
James Turnbull
9fa4bea03b
Merge pull request #7489 from duglin/7281
...
fix for issue 7281
2014-08-10 13:27:21 -04:00
James Turnbull
dfd6fcb548
Merge pull request #7498 from ostezer/fix-builds-errors
...
Docs: Fix builds.md line-length + minor typo issues
2014-08-10 13:26:16 -04:00
James Turnbull
7b13212076
Merge pull request #7501 from wyc/patch-1
...
Update gentoolinux.md
2014-08-10 13:20:14 -04:00
James Turnbull
aa3bc6559b
Merge pull request #7514 from phemmer/cli_cmd_prefix_fix
...
fix command output examples in cli documentation
2014-08-10 13:18:50 -04:00
Patrick Hemmer
d613f11217
fix command output examples in cli documentation
...
f87a97fpatrick.hemmer@gmail.com > (github: phemmer)
2014-08-10 12:47:46 -04:00
Daniel Menet
ea59aa8cb5
Expand hostname before passing it to NewRegistry()
...
Signed-off-by: Daniel Menet <membership@sontags.ch >
2014-08-10 11:48:34 +02:00
Alexandr Morozov
e9aa6489a6
Fix log message on http handler error
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-10 13:30:22 +04:00
Solomon Hykes
a110ce2f28
Rename a method for clarity
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-10 04:33:19 +00:00
Solomon Hykes
5e9b3727b8
Move declaration of DockerCli to top of file for readability
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-10 04:31:59 +00:00
Alexandr Morozov
93f6cf0351
Catch error on console creation
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-09 22:10:44 +04:00
wyc
6ba1949e6a
Update gentoolinux.md
2014-08-09 14:00:29 -04:00
LK4D4
7afc49b40b
Fix error message on logging events
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-09 18:45:38 +04:00
Doug Davis
55dc4f2b94
fix for issue 7281
...
add missing comma per O.S. Tezer's commment
Signed-off-by: Doug Davis <dug@us.ibm.com >
2014-08-09 08:11:59 -04:00
O.S. Tezer
8b3f2381d0
Docs: Fix builds.md line-length + minor typo issues
...
This PR proposes to fix some already existing (i.e., older)
line-length & line-alignment issues and the ones recently
included/merged with the PR #7406
(https://github.com/docker/docker/pull/7406 ).
It also proposes to fix a couple minor typography mistakes
(i.e., spelling of GitHub and Service Hooks (headers))
This PR does *not* propose any content changes.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-08-09 14:55:47 +03:00
Daniel Menet
cc3e94b9ba
Enable docker search on private docker registry.
...
The cli interface works similar to other registry related commands:
docker search foo
... searches for foo on the official hub
docker search localhost:5000/foo
... does the same for the private reg at localhost:5000
Signed-off-by: Daniel Menet <membership@sontags.ch >
2014-08-09 09:16:54 +02:00
Michael Crosby
2c90fde982
Merge pull request #7449 from shykes/cleanup-shutdown
...
Cleanup: refactor shutdown and signal handling facility
2014-08-08 19:39:51 -07:00
Tianon Gravi
93da07a8dc
Merge pull request #7492 from crosbymichael/update-libcontainer-aug3
...
Update libcontainer to f2e78425c377acc7a67a35c3148
2014-08-08 17:44:13 -06:00
Michael Crosby
983b4fc3bf
Merge pull request #7475 from erikh/fix_hostname_parsing
...
fix parsing of hostnames when we actually want IP addresses.
2014-08-08 16:40:50 -07:00
Michael Crosby
c74e8b544d
Update libcontainer to f2e78425c377acc7a67a35c3148
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-08 16:12:35 -07:00
Erik Hollensbe
99a864431d
First stab at nat tests.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-08 15:01:12 -07:00
Erik Hollensbe
3c49cb17fb
fix parsing of hostnames when we actually want IP addresses.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-08 15:01:10 -07:00
Hollie Teal
2dc21af70b
Merge pull request #7406 from hollietealok/docs_add
...
Added "Github Submodules" section to Automated Builds doc.
2014-08-08 09:40:42 -07:00
James Turnbull
fb650d1e6d
Merge pull request #7465 from flavio/update-opensuse-doc
...
Updated openSUSE's installation instructions
2014-08-08 11:28:27 -04:00
Tibor Vass
7dbab337dd
Merge pull request #7479 from shykes/cleanup-server-info
...
Cleanup: move "info" to daemon/info.go
2014-08-08 09:34:14 -04:00
Satoshi Amemiya
a34dd21611
Use only unavailable image when load from Tarball
...
Docker-DCO-1.1-Signed-off-by: Satoshi Amemiya <satoshi_amemiya@voyagegroup.com > (github: rail44)
2014-08-08 20:30:38 +09:00
Flavio Castelli
90e97960fa
Updated openSUSE's installation instructions
...
Cover network configuration and reference the official openSUSE image
inside of the examples.
Docker-DCO-1.1-Signed-off-by: Flavio Castelli <fcastelli@suse.com > (github: flavio)
2014-08-08 12:36:20 +02:00
Solomon Hykes
6856a6b110
Move "pull" and "push" to graph/pull.go and graph/push.go
...
This is part of the ongoing effort to remove the deprecated server/
package, and generally cleanup and simplify the codebase.
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-08 07:25:09 +00:00
James Turnbull
33d6b20c13
Merge pull request #7278 from Toebez/patch-1
...
Update nodejs_web_app.md
2014-08-07 23:16:37 -04:00
Solomon Hykes
94715e8e64
Move "info" to daemon/info.go
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-08 03:01:55 +00:00
Sven Dowideit
0ca010695c
Merge pull request #7460 from suzaku/fix_docs
...
Make it clear that JSON array format should be used if CMD is used as default arguments
2014-08-08 12:10:01 +10:00
Solomon Hykes
09ad385f64
Merge pull request #7458 from jamtur01/cg
...
Update CONTRIBUTING.md
2014-08-07 18:45:51 -07:00
Tianon Gravi
2767509894
Merge pull request #7476 from tianon/sysvinit-status-of-proc
...
Fix several minor issues with Debian sysvinit script
2014-08-07 19:30:42 -06:00
Michael Crosby
414ccee23a
Merge pull request #7374 from cpuguy83/revert_rm_f_deprecation
...
Revert --stop/--kill and use SIGKILL instead
2014-08-07 16:47:25 -07:00
Michael Crosby
5d9cfde0df
Merge pull request #7453 from shykes/new-subsystem-maintainers
...
Add maintainers to daemon/ and graph/
2014-08-07 16:43:41 -07:00
Tianon Gravi
478fdaf933
Fix several minor issues with Debian sysvinit script
...
- add `set -e` to make failing commands bail the script
- remove trailing `exit 0` which is just extraneous anyhow
- adjust `status_of_proc` options to pass in `$DOCKER_DESC` so we get consistently styled messages like `Docker is running` or `Docker is not running` or `could not access PID file for Docker`
Signed-off-by: Andrew Page <admwiggin@gmail.com >
2014-08-07 16:45:22 -06:00
Tibor Vass
860ab469cc
Merge pull request #7473 from tianon/pwaller-authors
...
Update .mailmap with a few more addresses
2014-08-07 18:26:49 -04:00
unclejack
b36f630817
Merge pull request #7304 from unclejack/refactor_build_tests
...
integration cli: minor refactor of the build tests
2014-08-08 01:24:51 +03:00
Brian Goff
95f86da641
Revert rm -f deprecation use SIGKILL instead
...
`rm -f` was originally deprecated in favor of `rm --stop/--kill` since `rm
-f` was sending SIGTERM and potentially very slow.
Instead this will bring back `rm -f` but use SIGKILL isntead
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-08-07 18:20:43 -04:00
Michael Crosby
01022a305d
Merge pull request #7405 from LK4D4/indicate_run_volume_test_pass
...
Print about "copy volume content" test passing
2014-08-07 15:09:41 -07:00
Michael Crosby
bc9f5cdeb5
Merge pull request #7329 from erikh/move_broadcastwriter
...
Cleanup: utils/broadcastwriter -> pkg/broadcastwriter
2014-08-07 14:51:42 -07:00
Michael Crosby
e907df8d93
Merge pull request #7474 from crosbymichael/testing-import
...
Only import "testing" in test packages
2014-08-07 14:48:00 -07:00
Michael Crosby
b386bce1f1
Graphtest is ok to compile normally
...
The graphtest package is only imported in the test files of other
packages therefore we do not leak testing flags.
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-07 14:33:09 -07:00
Tianon Gravi
7a34f13433
Regenerate AUTHORS one more time
...
Signed-off-by: Andrew Page <admwiggin@gmail.com >
2014-08-07 15:32:11 -06:00
Peter Waller
f8f36ff320
Add a few canonicalized author names
...
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net > (github: pwaller)
2014-08-07 15:32:11 -06:00
Peter Waller
d687c5b339
Change Peter Waller's canonical e-mail address
...
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net > (github: pwaller)
2014-08-07 15:32:11 -06:00
Peter Waller
7d78dc33b1
Run hack/generate-authors.sh
...
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net > (github: pwaller)
2014-08-07 15:32:11 -06:00
Peter Bourgon
b87daf6d69
Only import "testing" from *_test.go
...
This prevents the testing package flags from leaking into the flagsets
of binaries that import docker. I left integration-cli alone.
Docker-DCO-1.1-Signed-off-by: Peter Bourgon <peter@bourgon.org > (github: peterbourgon)
2014-08-07 14:25:21 -07:00
Tibor Vass
ab3e34e187
Merge pull request #7389 from tianon/replace-amd64-build-tags-with-cgo-as-appropriate
...
Replace amd64 build tags with cgo as appropriate
2014-08-07 16:24:19 -04:00
Tianon Gravi
45a239c168
Merge pull request #7413 from cpuguy83/7319_use_blackfriday_not_pandoc_for_manfile_gen
...
Use pure go markdown processor to generate man files
2014-08-07 14:23:49 -06:00
Michael Crosby
140e6abb17
Merge pull request #7443 from ewindisch/name-id-lookup-reversal
...
Container name lookups to prefer IDs over names
2014-08-07 11:14:47 -07:00
Tianon Gravi
abbfc7e828
Merge pull request #7423 from tianon/nuclear-_-weapons--we-got-the-bomb
...
Add contrib/nuke-graph-directory.sh script to clean out old /var/lib/docker directories much more easily
2014-08-07 12:11:50 -06:00
Brian Goff
dc296903f0
Merge pull request #7446 from cpuguy83/cleanup_extract_bindmount_spec_parsing
...
Cleanup: extract bindmount spec parsing
2014-08-07 11:48:07 -04:00
Brian Goff
3f136dc0e0
Use pure go markdown processor to generate man files
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-08-07 07:06:39 -04:00
satoru
6e0f072e36
Make it clear that JSON array format should be used if CMD is used as default arguments
...
Signed-off-by: Xuecong Liao <satorulogic@gmail.com >
2014-08-07 15:06:09 +08:00
James Turnbull
8891bb52de
Update CONTRIBUTING.md
...
Added link to community guidelines
2014-08-07 02:23:00 -04:00
Solomon Hykes
7e12911f62
Merge pull request #7452 from shykes/7370-on-7427
...
Cleanup: move image management and logging out of deprecated Server
2014-08-06 18:47:45 -07:00
Erik Hollensbe
bd373712d0
port usage of jsonlog to the new daemon files which were refactored
...
recently.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-06 16:45:04 -07:00
Erik Hollensbe
5cdb9c8aca
utils.Debugf -> log.Printf, move jsonlog to own package.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-06 16:39:01 -07:00
Erik Hollensbe
5ab09f2f71
utils/broadcastwriter -> pkg/broadcastwriter
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-06 16:37:01 -07:00
Tianon Gravi
89ec17d113
Replace "amd64" build tags with "cgo" as appropriate, and remove where unnecessary
...
Signed-off-by: Andrew Page <admwiggin@gmail.com >
2014-08-06 17:20:21 -06:00
Michael Crosby
bc684fae64
Merge pull request #7430 from tamsky/docfixes
...
style, grammar, spelling fixes.
2014-08-06 16:11:52 -07:00
Michael Crosby
e86d87e1ce
Merge pull request #7431 from tamsky/fixes-7105
...
add warning re: changing value of `dm.basesize`.
2014-08-06 15:22:42 -07:00
Tianon Gravi
8733cd7c0b
Merge pull request #7428 from crosbymichael/update-libcontainer-aug2
...
Update libcontainer to 5589d4d879f1d7e31967a927d3e
2014-08-06 15:41:35 -06:00
Brian Goff
f34679d0a9
Cleanup: extract bindmount spec parsing
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-08-06 17:22:40 -04:00
unclejack
c9ca37dfe9
Merge pull request #7448 from tiborvass/fix-tmpdir-integration-tests
...
Fix tmpdir integration tests
2014-08-06 23:54:09 +03:00
Michael Crosby
90da088491
Merge pull request #27 from tianon/update-libcontainer
...
Update hack/vendor.sh to use libcontainer's update-vendor.sh script as the source of truth for libcontainer deps and not include them in Docker's repo twice
2014-08-06 13:35:46 -07:00
Tibor Vass
872db07119
Fix integration tests by adding DOCKER_TMPDIR env in the test init function
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-08-06 15:55:50 -04:00
Tianon Gravi
fba37a038d
Update vendor with the updated canonical deps from libcontainer
...
Signed-off-by: Andrew Page <admwiggin@gmail.com >
2014-08-06 13:19:41 -06:00
Tianon Gravi
5101173e1f
Update hack/vendor.sh to use libcontainer's update-vendor.sh script as the source of truth for libcontainer deps and not include them in Docker's repo twice
...
Signed-off-by: Andrew Page <admwiggin@gmail.com >
2014-08-06 13:18:24 -06:00
Tibor Vass
5e20b0027c
Fix TestBuildForbiddenContextPath after TMPDIR change
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-08-06 14:24:00 -04:00
Solomon Hykes
eb79dc14fe
Engine.Shutdown only waits 5 seconds for active jobs to complete
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-06 17:56:12 +00:00
Solomon Hykes
92105ea0fa
Remove unused field from engine.Job
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-06 17:56:12 +00:00
Solomon Hykes
20b0841c1b
Remove last trace of Daemon->Server dependency
...
This removes a shim `daemon.Server` interface which was used to start
separating Daemon from Server *gradually*, without getting cyclic
dependency errors.
Now that the last Daemon->Server dependency has been removed, we can
finally remove the shim. Yay!
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-06 17:56:12 +00:00
Solomon Hykes
61eab75939
Extra testing for engine.Shutdown
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-06 17:56:12 +00:00
Solomon Hykes
78f0a914ee
Replace Server.IsRunning with Engine.IsShutdown
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-06 17:56:11 +00:00
Solomon Hykes
b4efcd53e0
Remove unnecessary job "initserverpidfile"
...
That job was a hacky solution to a real race condition. This removes the
hack without re-introducing the race.
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-06 17:56:11 +00:00
Solomon Hykes
c9f3fd3fc7
Cleanup: refactor shutdown and signal handling facility
...
This disentangles the following functions, which were previously all mixed together:
* 1) Waiting for jobs to terminate when shutting down
* 2) Handling signals in the Docker daemon
* 3) Per-subsystem cleanup handlers
* 4) pidfile management
Responsibilities are dispatched as follows:
* Signal traps are set in `main`, and trigger `engine.Shutdown`
* `engine.Shutdown` coordinates cleanup by waiting for jobs to complete, and calling shutdown handlers
* To perform cleanup at shutdown, each subsystem registers handlers with `engine.OnShutdown`
* `daemon` is one subsystem, so it registers cleanup via `engine.OnShutdown`.
* `daemon` owns the pidfile, which is used to lock access to `/var/lib/docker`. Part of its cleanup is to remove the pidfile.
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-06 17:56:11 +00:00
Solomon Hykes
d55e3fea72
Move signal handling code to pkg/signal.Trap
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-06 17:56:11 +00:00
Solomon Hykes
d745067487
Subsystems can register cleanup handlers with Engine.OnShutdown
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-06 17:56:11 +00:00
unclejack
66c8f87e89
Merge pull request #6456 from rhatdan/tmpdir
...
Docker should use /var/lib/docker/tmp for large temporary files.
2014-08-06 20:31:46 +03:00
Eric Windisch
231e07ded4
Container name lookups to prefer IDs over names
...
Lookups of container names should prefer the ID over
names assigned to containers by users.
Signed-off-by: Eric Windisch <eric@windisch.us >
2014-08-06 13:09:11 -04:00
Solomon Hykes
5240e5f713
Add maintainers to daemon/ and graph/
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-06 10:29:15 +00:00
Solomon Hykes
1c11d7f93e
Rename "log_event" to "log"
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-06 10:08:23 +00:00
Alexandr Morozov
8d056423f8
Separate events subsystem
...
* Events subsystem merged from `server/events.go` and
`utils/jsonmessagepublisher.go` and moved to `events/events.go`
* Only public interface for this subsystem is engine jobs
* There is two new engine jobs - `log_event` and `subscribers_count`
* There is auxiliary function `container.LogEvent` for logging events for
containers
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
[solomon@docker.com: resolve merge conflicts]
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 10:08:19 +00:00
Tibor Vass
af0781974d
Check error returned by eng.Register() in TagStore.Install()
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-08-06 17:19:01 -04:00
Tibor Vass
69f9d488dc
Move some integration tests to integration-cli
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-08-06 17:18:51 -04:00
Solomon Hykes
d787937957
Move "image_tag" and "tag" to graph/tag.go
...
Note: these 2 jobs should be merged into one. This was noted in a FIXME.
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-06 17:18:51 -04:00
Solomon Hykes
7a5e3df162
Move "image_delete" to daemon/image_delete.go
...
Note: this cannot yet be moved to graph/ because of a lingering
dependency on daemon. This has been noted in a FIXME.
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-06 17:18:50 -04:00
Solomon Hykes
fa27580cff
Move "import" to graph/import.go
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-06 17:18:50 -04:00
Solomon Hykes
f2029f7be1
Move "load" to graph/load.go
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-06 17:18:50 -04:00
Solomon Hykes
77781440f1
Move "viz" to graph/viz.go
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-06 17:18:50 -04:00
Solomon Hykes
51dd68d659
Move "images" to graph/list.go
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-06 17:18:50 -04:00
Solomon Hykes
55235e121e
Move "image_history" to graph/history.go
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-06 17:18:50 -04:00
Solomon Hykes
6e28d11d1f
Move "image_export" to graph/export.go
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-08-06 17:18:50 -04:00
Marc Tamsky
bd30746e07
add warning re: changing value of dm.basesize.
...
Signed-off-by: Marc Tamsky <mtamsky@gmail.com > (github: tamsky)
2014-08-05 19:28:07 -07:00
Hollie Teal
4d0527856c
Made requested changes (capitalization)
2014-08-05 19:06:52 -07:00
Michael Crosby
6215422286
Update libcontainer to 5589d4d879f1d7e31967a927d3e
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-05 18:13:43 -07:00
Marc Tamsky
07099b6256
style, grammar, spelling fixes.
...
Signed-off-by: Marc Tamsky <mtamsky@gmail.com > (github: tamsky)
2014-08-05 18:11:32 -07:00
Solomon Hykes
042b642d40
Merge pull request #7186 from jamtur01/community
...
Added proposed Docker Community Guidelines
2014-08-05 15:44:11 -07:00
Michael Crosby
0ea5160d2a
Merge pull request #7412 from bfirsh/rename-docker-config
...
Rename DOCKER_CONFIG envvar to DOCKER_CERT_PATH
2014-08-05 14:52:28 -07:00
Dan Walsh
b4813f2841
Docker should use /var/lib/container/tmp for large temporary files.
...
/tmp is often a tmpfs file system and large temporary files could cause
docker commands to fail. Also using /tmp potentially allows users on the
system to get access to content, or even attack the content. Moving the tmpdir to
/var/lib/container/tmp will protect the data.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Conflicts:
docker/docker.go
2014-08-05 16:43:42 -04:00
Michael Crosby
8f4b477c32
Merge pull request #6909 from LK4D4/prune_cmd_on_entrypoint_setting_#5147
...
Cleanup cmd on entrypoint setting
2014-08-05 11:50:18 -07:00
Tianon Gravi
047ce47d92
Add contrib/nuke-graph-directory.sh script to clean out old /var/lib/docker directories much more easily
...
Signed-off-by: Andrew Page <admwiggin@gmail.com >
2014-08-05 12:36:39 -06:00
James Turnbull
e47415d5f5
Merge pull request #7349 from knan-linpro/master
...
networking.md: Networking between containers works without ip_forward
2014-08-04 23:51:22 -04:00
Ben Firshman
a49de2c467
Rename DOCKER_CONFIG envvar to DOCKER_CERT_PATH
...
DOCKER_CONFIG was introduced in #6984 .
We may use "config" for other purposes (e.g. #7232 ). Until we
have made a design decision around how configuration files will
work, DOCKER_CERT_PATH is a much safer name to rely on for future
compatibility.
Docker-DCO-1.1-Signed-off-by: Ben Firshman <ben@firshman.co.uk > (github: bfirsh)
2014-08-04 17:36:53 -07:00
Michael Crosby
3c1212ca30
Merge pull request #7377 from tianon/daemon-build-tag
...
Add a "daemon" build tag and toggle it with the already-existing "DOCKER_CLIENTONLY" build variable
2014-08-04 17:32:03 -07:00
Tianon Gravi
6b94f2d9be
Merge pull request #7310 from stevecrozz/maintainers-grammar-update
...
Correct grammar in MAINTAINERS.md
2014-08-04 17:57:08 -06:00
Tianon Gravi
ba663eac3a
Adjust build tags to be client-only in "make cross" too
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-08-04 15:05:12 -06:00
Tianon Gravi
1b95590d06
Add a "daemon" build tag and toggle it with the already-existing "DOCKER_CLIENTONLY" build variable
...
This works mostly by refactoring our "main" package to be careful about what it imports based on the daemon build tag. :)
Also, I've updated Travis to test "client-only" compilation after it tests the daemon version.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-08-04 15:05:12 -06:00
Stephen Crosby
74212a1565
Correct grammer in MAINTAINERS.md
...
Signed-off-by: Stephen Crosby <stevecrozz@gmail.com >
2014-08-04 13:37:01 -07:00
Tibor Vass
0af135e906
Merge pull request #7388 from tianon/remove-pkg-system
...
Purge the bits of pkg/system that moved to libcontainer/system
2014-08-04 15:49:13 -04:00
Michael Crosby
07fce305f7
Merge pull request #7407 from crosbymichael/update-libcontainer-aug1
...
Update libcontainer to version 68ea1234a0b046803aacb2562df0da1
2014-08-04 12:37:13 -07:00
Michael Crosby
cd6b903825
Ensure thread is locked in sysinit for docker
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-04 12:34:27 -07:00
Michael Crosby
22f373aeda
Update libcontainer to 68ea1234a0b046803aacb2562df
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-04 12:34:11 -07:00
Hollie Teal
bafad8cdc4
Added "Github Submodules" section to Automated Builds doc.
...
Signed-off-by: Hollie Teal <hollie.teal@docker.com >
2014-08-04 11:12:01 -07:00
LK4D4
825ca10dfd
Print about "copy volume content" test passing
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-08-04 21:27:28 +04:00
Alexandr Morozov
aa2d6dbc0c
Inherit Cmd only if no --entrypoint specified on run
...
Fixes #5147
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-08-04 21:17:37 +04:00
LK4D4
1b6546b840
Cleanup Cmd on ENTRYPOINT instruction
...
Fixes #5147
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-08-04 20:48:36 +04:00
LK4D4
7dba5024e8
Remove redundant checks in runconfig.Merge
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-08-04 20:48:09 +04:00
James Turnbull
d48492a12e
Merge pull request #7391 from LK4D4/fix_relative_workdir_example
...
Fix example of relative WORKDIR
2014-08-03 10:14:33 -04:00
Sven Dowideit
41a553ca35
Merge pull request #7363 from lcoote/master
...
#1852 Remote API documentation incorrect regarding private registries
2014-08-03 21:21:43 +10:00
LK4D4
5514afcd88
Fix example of relative WORKDIR
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-08-03 12:28:25 +04:00
Tianon Gravi
60341f80d7
Purge the bits of pkg/system that moved to libcontainer/system
...
Signed-off-by: Andrew Page <admwiggin@gmail.com >
2014-08-02 01:35:04 -06:00
Michael Crosby
bec676e2de
Merge pull request #7380 from tiborvass/merge-7368
...
Accept vanilla Linux Foundation signoffs (Closes 7368)
2014-08-01 16:33:13 -07:00
Tibor Vass
6b04d597ee
Update CONTRIBUTING.md and test new DCO signature in this commit
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-08-01 19:30:58 -04:00
Tibor Vass
4909a70204
Accept vanilla Linux Foundation signoffs
...
This allows signing off commits with `git commit -s`
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Cleaned up DCO regex
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-08-01 19:30:34 -04:00
Victor Vieux
e9b4cafd8d
Merge pull request #7385 from crosbymichael/return-content-type-error
...
Return error for bad content-type
2014-08-01 16:30:18 -07:00
Michael Crosby
8266c381d6
Check content type along with content length
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-08-01 15:59:19 -07:00
Lachlan Coote
a5c5dc121c
#1852 Remote API documentation incorrect regarding private registries
...
Issues addressed:
- Remote API doco refers to "registry" parameter which is not supported
- Neglects to mention "tag" parameter which is supported
- Offers no guidance on pushing to private registries
Changes made:
- As directed in review comments, `registry` removed from all api versions (1.0-1.14)
- Have added documentation for `tag` parameter and guidance on private registries for versions 1.10-1.14 (I have only validated this on .10)
Docker-DCO-1.1-Signed-off-by: Lachlan Coote <lachlan.t.coote@gmail.com > (github: lcoote)
2014-08-01 15:58:01 -07:00
Michael Crosby
78ac75fe00
Return error for bad content-type
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-08-01 15:26:30 -07:00
Tibor Vass
ca602cd1e5
Merge pull request #7367 from ichik1/btrfs-is-not-experimental
...
Btrfs graph driver is not experimental
2014-08-01 16:49:05 -04:00
Michael Crosby
69aa07af1e
Merge pull request #7378 from rajdeepd/master
...
Added test cases for no port, -ve port passed to nat.ParsePortSpecs
2014-08-01 13:45:17 -07:00
Victor Vieux
867ffca84f
Merge pull request #7379 from tiborvass/merge-7366
...
Cleanup: merge container-related jobs into daemon/ (Closes 7366)
2014-08-01 13:43:47 -07:00
Solomon Hykes
f46de04af6
Cleanup daemon/Daemon.Install for readability
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-08-01 14:25:02 -04:00
Solomon Hykes
d037007658
Move "containers" to daemon/list.go
...
This is part of an effort to break apart the deprecated server/ package
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-08-01 14:24:58 -04:00
Solomon Hykes
aa49632fef
Move "top" to daemon/top.go
...
This is part of an effort to break apart the deprecated server/ package
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-08-01 14:24:52 -04:00
Solomon Hykes
49e61f62ce
Move "changes" to daemon/changes.go
...
This is part of an effort to break apart the deprecated server/ package
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Fix issues with renaming changes to container_changes
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-08-01 14:24:46 -04:00
Solomon Hykes
06229a4b76
Move "copy" to daemon/copy.go
...
This is part of an effort to break apart the deprecated server/ package
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-08-01 14:24:41 -04:00
Solomon Hykes
cc39d579f5
Move "delete" to daemon/delete.go
...
This is part of an effort to break apart the deprecated server/ package
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Fix issues with renaming container_delete to delete
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-08-01 14:24:28 -04:00
Solomon Hykes
066330fc96
Move "logs" to daemon/logs.go
...
This is part of an effort to break apart the deprecated server/ package
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-08-01 14:17:29 -04:00
Solomon Hykes
fdad41f5b9
Move "commit" to daemon/commit.go
...
This is part of an effort to break apart the deprecated server/ package
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-08-01 14:17:24 -04:00
Solomon Hykes
e0fd96f850
Move "resize" to daemon/resize.go
...
This is part of an effort to break apart the deprecated server/ package
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-08-01 14:17:20 -04:00
Solomon Hykes
c4ce396f46
Move "wait" to daemon/wait.go
...
This is part of an effort to break apart the deprecated server/ package
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-08-01 14:17:16 -04:00
Solomon Hykes
bd54a73c42
Move "restart" to daemon/restart.go
...
This is part of an effort to break apart the deprecated server/ package
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-08-01 14:17:11 -04:00
Solomon Hykes
4180b87514
Move "start" to daemon/start.go
...
This is part of an effort to break apart the deprecated server/ package
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-08-01 14:17:04 -04:00
Solomon Hykes
03c07617cc
Move "stop" to daemon/stop.go
...
This is part of an effort to break apart the deprecated server/ package
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-08-01 14:16:59 -04:00
Solomon Hykes
80f3272ee9
Move "create" to daemon/create.go
...
This is part of an effort to break apart the deprecated server/ package
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-08-01 14:16:50 -04:00
Solomon Hykes
8031c23b0f
Move "export" to daemon/export.go
...
This is part of an effort to break apart the deprecated server/ package
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-08-01 14:16:41 -04:00
Solomon Hykes
8652830661
Move "kill" to daemon/kill.go
...
This is part of an effort to break apart the deprecated server/ package
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-08-01 14:16:05 -04:00
Rajdeep Dua
4cb2cfed9f
Added test cases for no port passed to nat.ParsePortSpecs and negative port number passed
...
Docker-DCO-1.1-Signed-off-by: Rajdeep due <dua_rajdeep@yahoo.com > (github: rajdeepd)
2014-08-01 23:41:34 +05:30
Michael Crosby
5d2a62d8de
Merge pull request #7295 from vishh/rbind
...
Make lxc driver rbind all user specified mounts.
2014-08-01 10:25:45 -07:00
Erik Inge Bolsø
e6a084f4f8
networking.md: Networking between containers works without ip_forward
...
Docker-DCO-1.1-Signed-off-by: Erik Inge Bolsø <knan@redpill-linpro.com > (github: knan-linpro)
2014-08-01 10:41:16 +02:00
Ken ICHIKAWA
58588009c0
Btrfs graph driver is not experimental
...
Btrfs graph driver is not experimental now according to #4838 and CHANGELOG.md is saying "btrfs is no longer considered experimental.".
Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com > (github: ichik1)
2014-08-01 14:37:38 +09:00
Sven Dowideit
503d124677
Merge pull request #7035 from tianon/standardize-apt-get-install
...
Standardize "apt-get install" usage across the repo
2014-08-01 11:43:37 +10:00
Michael Crosby
3490042836
Merge pull request #7362 from crosbymichael/fix-get-image-json
...
Fix get image json
2014-07-31 18:23:33 -07:00
Michael Crosby
63a4ba229c
Update package for repo and tag parser
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-07-31 18:19:30 -07:00
Fabio Falci
103ae23504
Fix getImagesJSON output for api less than 1.7
...
Tag can be a number, like centos:6.4, and so must be handled like a
string otherwise will lose quotation marks when converting to json
and the client (API < 1.7) will try to convert to int, failing
because the type is string. Additionally using ParseRepositoryTag to
parse repository names to split the tag because an URL can have : and
so more than one occurrence of : can be found on repository names.
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: fabiofalci)
2014-07-31 18:15:16 -07:00
Sven Dowideit
0fc304ce32
Merge pull request #7361 from SvenDowideit/merge-edit_dockerlinks
...
First pass at replacing parent-child metaphor to describe docker links.
2014-08-01 11:12:05 +10:00
Fred Lifton
631ea726e4
First pass at replacing parent-child metaphor to describe docker links.
...
Addresses issue #7141
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
a little git by
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: SvenDowideit)
2014-08-01 11:09:00 +10:00
Michael Crosby
5395cecc48
Merge pull request #7354 from timthelion/patch-8
...
Remove the restriction on multi-user PRs
2014-07-31 16:19:10 -07:00
Victor Vieux
90dadea84d
Merge pull request #7344 from shykes/cleanup-server-attach
...
Move container-related jobs out of deprecated server/ package
2014-07-31 15:56:48 -07:00
Michael Crosby
b1496effe3
Merge pull request #7312 from tianon/update-libcontainer
...
Bump libcontainer dep
2014-07-31 15:20:07 -07:00
Michael Crosby
c5cdbc376f
Merge pull request #7357 from crosbymichael/docker-ignore
...
Fix .dockerignore when ignoring unreadable dirs
2014-07-31 15:19:50 -07:00
Michael Crosby
8891e912b4
Return error for utils.Matches in archive
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-07-31 15:11:15 -07:00
Bruno Renié
27cca4c70c
Fix .dockerignore when ignoring unreadable dirs
...
The initial `ValidateContextDirectory` implementation fails loudly when a file
lacks read permissions in the current context. However that situation is valid
if the file is included in the `.dockerignore` patterns.
Docker-DCO-1.1-Signed-off-by: Bruno Renié <brutasse@gmail.com > (github: brutasse)
2014-07-31 15:10:56 -07:00
Timothy Hobbs
4c282b979b
Remove the restriction on multi-user PRs
...
This came up in #docker-dev today. We're not sure exactly why the original restriction was put it place. It is not well obeyed. Please comment if you know the origin of the restriction.
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: timthelion)
2014-07-31 22:05:29 +00:00
Solomon Hykes
ceffc9ea1d
Merge pull request #7152 from SvenDowideit/get-help-maintaining-softlayer-docs
...
MAINTAINERS: Get an extra pair of eyes on the Softlayer installation docs
2014-07-31 14:43:43 -07:00
Fred Lifton
eccc44fad6
Merge pull request #7327 from ostezer/fix-articles-https
...
Docs: articles/https minor amendments and update
2014-07-31 14:33:56 -07:00
James Turnbull
f77ae9b4f3
Merge pull request #7346 from proppy/patch-9
...
docs/google: bump container-vm image version
2014-07-31 17:22:01 -04:00
Tibor Vass
531f5907d6
Merge pull request #7324 from erikh/move_tarsum
...
Move tarsum to pkg/
2014-07-31 16:56:24 -04:00
Solomon Hykes
1f2d75774a
Merge pull request #7091 from erikh/rfe
...
Update CONTRIBUTING.md with links to sections and `Proposal:` process.
2014-07-31 12:28:05 -07:00
Michael Crosby
54b287bbc8
Merge pull request #7343 from shykes/cleanup-main
...
Cleanup main function
2014-07-31 12:26:09 -07:00
Aaron Huslage
32fdcaa419
Merge pull request #7193 from hollietealok/doc_remove
...
Removed docker_io_oauth_api.md: Docker is not currently accepting regist...
2014-07-31 15:19:58 -04:00
Erik Hollensbe
52db7b8cb7
Update CONTRIBUTING.md with links to sections and RFE process.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-07-31 12:18:31 -07:00
Tianon Gravi
8ea7242250
Update TestEnvironment to explicitly set "HOME" to be empty so it gets autofilled
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-31 12:46:41 -06:00
Tianon Gravi
f34d0e55f3
Remove pkg/user now that it's embedded in libcontainer
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-31 12:46:39 -06:00
Tianon Gravi
57b9467f45
Add support for autodetected HOME from USER (if HOME is unset)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-31 12:46:36 -06:00
Tianon Gravi
f4db3985d9
Bump libcontainer dep
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-31 12:46:35 -06:00
James Turnbull
b5ef212ec1
Merge pull request #7337 from rogaha/add_ga_universal_analytics_support
...
Added GA universal analytics support
2014-07-31 09:00:08 -04:00
Jan Toebes
bfacdfdccf
Update nodejs_web_app.md
...
Updated to documentation to use the centos6 image instead of the unofficial tutum image of centos6.4
2014-07-31 08:54:22 +02:00
Johan Euphrosine
294f33b37a
docs/google: bump container-vm image version
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-07-30 22:50:05 -07:00
Tibor Vass
bbca4867f8
Merge pull request #7338 from tianon/moar-dotcloud
...
Fix more instances of "dotcloud/docker" in hack/
2014-07-30 23:51:23 -04:00
Sven Dowideit
970ebaa887
Merge pull request #7328 from cpuguy83/fix_search_image_oldindex
...
Replace old index image with hub
2014-07-31 12:06:30 +10:00
Michael Crosby
65d316e50d
Merge pull request #7340 from crosbymichael/tags-unit
...
Fix graph tags test on freebsd
2014-07-30 18:18:14 -07:00
Michael Crosby
6bc483fa59
Remove perm change in archive
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-07-30 18:06:48 -07:00
Kato Kazuyoshi
5ebe86ccf9
Fix graph/tags_unit_test.go on FreeBSD
...
- Directories should have u+x (0600 -> 0700)
- Don't chown files to root because we don't have to
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-07-30 18:06:19 -07:00
Michael Crosby
2970ba4877
Merge pull request #7325 from tiborvass/case-insensitive-attach
...
Make --attach case-insensitive
2014-07-30 17:10:16 -07:00
Tianon Gravi
3a14eb066c
Fix more instances of "dotcloud/docker" in hack/ (and add a DOCKER_PKG environment variable to simplify references to our "package path" in our bundlescripts)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-30 17:02:04 -06:00
Roberto Gandolfo Hashioka
e13b1fc05f
Added GA universal analytics support
...
Docker-DCO-1.1-Signed-off-by: Roberto Hashioka <roberto.hashioka@docker.com > (github: rogaha)
2014-07-30 15:32:14 -07:00
unclejack
19c8e74fd3
Merge pull request #7100 from discordianfish/fix-port-allocation
...
Fix masked err in portmapper
2014-07-30 23:51:21 +03:00
unclejack
3100afa0e1
Merge pull request #7298 from erikh/fix_cli_restart_test
...
fix docker integration-cli restart test race
2014-07-30 23:29:39 +03:00
Tibor Vass
a713413293
Make --attach case-insensitive
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-07-30 15:36:16 -04:00
Victor Vieux
8162c6eedd
Merge pull request #7317 from erikh/server_split
...
Partition server/ by image, init, events, container, and "everything left"
2014-07-30 12:28:37 -07:00
Tibor Vass
a0338ff04b
Merge pull request #7331 from erikh/simplify_checksum
...
Simplify utils.CheckSum.Read to use TeeReader instead
2014-07-30 15:14:41 -04:00
Erik Hollensbe
74fdadc86c
Partition server/ by image, init, events, container, and "everything left"
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-07-30 11:50:33 -07:00
Erik Hollensbe
ef6b78f7db
Remove CheckSum from utils; replace with a TeeReader
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-07-30 11:23:43 -07:00
unclejack
c3045f563d
Merge pull request #6962 from erikh/3349-cleanup-docker-socket
...
Clean up the docker socket on termination of the daemon.
2014-07-30 18:43:01 +03:00
Erik Hollensbe
ff02bea883
utils.Debugf -> fmt.Printf
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-07-30 08:42:53 -07:00
Brian Goff
ba57d3d9e6
Replace old index image with hub
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-07-30 11:15:18 -04:00
O.S. Tezer
711fb3e19d
Docs: articles/https minor amendments and update
...
This commit proposes some minor amendments and updates
for the articles/https.md document to fix certain errors, inc.:
- Marking commands / flags as code (e.g. `tlsverify`) [done before rebase]
- Capitalising the word Docker
- Normalizing headers to match the rest of the docs;
- Expanding the page description to match the page title and the content;
- Capitalizing HTTPS etc.;
- Some spelling error fixes;
- Line-length adjustments to make it easier to read the raw file.
It does not propose any fundemental changes to the structure of the document.
Certain changes were based before another update on this doc.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-07-30 18:09:58 +03:00
unclejack
c18b38f912
Merge pull request #7215 from tiborvass/add-os-to-docker-info
...
Add OS to docker info
2014-07-30 18:02:45 +03:00
Tibor Vass
b0fb0055d2
Add OS to docker info
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-07-30 10:37:52 -04:00
Solomon Hykes
63bd4ad9d6
Move "unpause" to daemon/pause.go
...
This is part of an effort to break apart the deprecated server/ package
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-07-30 14:01:43 +00:00
Solomon Hykes
42a77de3d3
Move "pause" to daemon/pause.go
...
This is part of an effort to break apart the deprecated server/ package
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-07-30 14:01:40 +00:00
Erik Hollensbe
4184cccb0f
move testdata to tarsum package.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-07-30 06:52:24 -07:00
Erik Hollensbe
1219e458d1
utils/tarsum* -> pkg/tarsum
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-07-30 06:42:12 -07:00
Timothy
fae72c83be
Apply @jamtur01's copy edit's to certificates.md
...
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz > (github: timthelion)
2014-07-30 16:23:56 +03:00
Solomon Hykes
0af7b5f83d
New job "log": logs a new event
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-07-30 11:20:33 +00:00
Solomon Hykes
c2496d97cc
Move Server.ContainerAttach to Daemon.ContainerAttach
...
This is part of an effort to break apart the legacy server package. Help wanted!
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-07-30 11:20:31 +00:00
Solomon Hykes
4949e070fb
Move kernel version/capabilities detection to NewDaemon
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-07-30 09:26:51 +00:00
Solomon Hykes
e92a9e0b53
Move canonical root path detection to NewDaemon
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-07-30 09:26:51 +00:00
Solomon Hykes
a7d8c732b1
Move TMPDIR symlink cleanup to NewDaemon
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-07-30 09:26:51 +00:00
Solomon Hykes
419b9fe164
Check for OS and root privileges in NewDaemon
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-07-30 09:26:51 +00:00
Vishnu Kannan
3e1c1567ea
Add a cli integration test for recursive bind mounting.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
2014-07-30 02:23:24 +00:00
Vishnu Kannan
d82bb603af
Make lxc driver rbind all user specified mounts.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
2014-07-30 02:23:24 +00:00
hollietealok
2b9d8248d6
Removed OAuth doc from mkdocs.yml
...
Docker-DCO-1.1-Signed-off-by: hollietealok <hollie@docker.com > (github: hollietealok)
2014-07-29 13:56:19 -07:00
Tibor Vass
403df1765a
Merge pull request #7286 from erikh/parsers
...
Move parsing functions to parsers/ and the specific kernel handling...
2014-07-29 16:11:31 -04:00
Erik Hollensbe
4398108433
Move parsing functions to pkg/parsers and the specific kernel handling
...
functions to pkg/parsers/kernel, and parsing filters to
pkg/parsers/filter. Adjust imports and package references.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-07-29 13:09:10 -07:00
Tianon Gravi
335e82f3f7
Merge pull request #7311 from tianon/travis-old-go
...
Add Go 1.2 to Travis so we make sure we keep retrocompat for a little while
2014-07-29 13:48:24 -06:00
Tibor Vass
1063b438eb
Merge pull request #7292 from erikh/buildfile_move
...
server/buildfile.go -> builder/builder.go
2014-07-29 15:38:42 -04:00
Victor Vieux
3bae02cbe3
Merge pull request #7272 from unclejack/create_httputils_pkg
...
move resumablerequestreader to pkg/httputils
2014-07-29 12:18:10 -07:00
Tianon Gravi
38bce17904
Add Go 1.2 to Travis so we make sure we keep retrocompat for a little while
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-29 13:07:59 -06:00
Erik Hollensbe
3a177ccd3a
server/buildfile.go -> builder/builder.go; add maintainers file
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-07-29 11:35:02 -07:00
James Turnbull
475131cd4a
Merge pull request #6877 from underscorephil/patch-1
...
Update softlayer.md
2014-07-29 13:20:55 -04:00
James Turnbull
4749b884fe
Merge pull request #7256 from jstoja/docs-api-insert-image
...
Fixing docs - Insert api call
2014-07-29 13:19:22 -04:00
James Turnbull
900d54b48b
Merge pull request #7269 from r0n22/patch-1
...
Update HTTP Proxy Section
2014-07-29 13:15:27 -04:00
unclejack
c0517857f6
move resumablerequestreader to pkg
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-07-29 16:30:45 +03:00
unclejack
372f9bb58b
integcli: use dockerCmdInDir in build tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-07-29 16:01:56 +03:00
unclejack
f60c8e9e61
integcli: add some more docker utils
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-07-29 15:56:41 +03:00
Sven Dowideit
3369b4f6f0
Merge pull request #7280 from knappe/patch-1
...
Correct Typo In Documentation
2014-07-29 19:15:48 +10:00
Erik Hollensbe
5931669343
fix docker integration-cli restart test race
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-07-28 23:46:14 -07:00
Tianon Gravi
fc637b5275
Standardize "apt-get install" usage across the repo
...
I might have missed some, but I think this is most of the offenders.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-28 17:41:59 -06:00
Victor Vieux
ac3eecf3db
Merge pull request #7062 from crosbymichael/fix-lxc-caps
...
Fix cap drop issues with lxc
2014-07-28 16:19:08 -07:00
knappe
331200cbaa
Correct Typo In Documentation
2014-07-28 14:39:17 -06:00
Victor Vieux
a0dad3dfb2
Merge pull request #7274 from vbatts/vbatts-gh7136
...
progress bar: don't strings.Repeat a negative number
2014-07-28 11:50:16 -07:00
Victor Vieux
f906f31877
Merge pull request #7210 from fcarriedo/refactor-common-code
...
pkg/units: Refactor common code
2014-07-28 11:45:46 -07:00
Vincent Batts
704b97d1c4
jsonmessage: added test and cleaned up others
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-07-28 14:43:28 -04:00
Jan Toebes
2519872d77
Update nodejs_web_app.md
...
The image centos:centos6.4 doesn't exist. Instead you have to choose between the official centos6 or centos7. Both images does not work together with de yum npm install. When choosing an centos6.5 from another distributor (tutum) it works.
2014-07-28 20:43:24 +02:00
Tianon Gravi
5ef1126669
Merge pull request #6943 from tiborvass/parallel_compile_test
...
Parallel compile test binaries
2014-07-28 12:32:56 -06:00
Michael Crosby
d09e682c46
Merge pull request #6520 from unclejack/bump_go_to_1.3
...
bump Go to 1.3
2014-07-28 11:06:43 -07:00
Tianon Gravi
380153f0d7
Merge pull request #7257 from seblu/master
...
Improve systemd units
2014-07-28 11:51:19 -06:00
Vincent Batts
77237be0e2
progress bar: don't strings.Repeat a negative number
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-07-28 12:01:43 -04:00
Tibor Vass
030676444a
Merge pull request #7140 from proppy/more-addtar-tests
...
integration-cli: add more tests for BuildAddTar
2014-07-28 11:58:29 -04:00
Tibor Vass
da40d9b7a5
Merge pull request #7209 from LK4D4/test_build_from_git
...
Test on building from GIT url
2014-07-28 11:15:50 -04:00
unclejack
7978b32127
Merge pull request #7097 from LK4D4/fix_eof_dockerignore_#7093
...
Skip whole dir dockerignoring with warning
2014-07-28 17:34:44 +03:00
r0n22
2095e22121
Update HTTP Proxy Section
...
Docker.service file location was missing the /usr dir.
2014-07-28 09:39:55 -04:00
Sébastien Luttringer
533916fa6b
Systemd service should not restart on failure
...
This should not be done by default but used by adminsys with a drop-in.d file,
for buggy daemons which crash without known fixes.
Docker-DCO-1.1-Signed-off-by: Sébastien Luttringer <seblu@seblu.net > (github: seblu)
2014-07-28 11:50:24 +02:00
Sébastien Luttringer
0f26195a8d
Systemd .service should install .socket
...
And remove the WantedBy directive.
See: https://bugs.archlinux.org/task/41338
Docker-DCO-1.1-Signed-off-by: Sébastien Luttringer <seblu@seblu.net > (github: seblu)
2014-07-28 00:18:14 +02:00
Sébastien Luttringer
fe68df36fc
Fix ordering in systemd service file
...
See: https://bugs.archlinux.org/task/41338
Docker-DCO-1.1-Signed-off-by: Sébastien Luttringer <seblu@seblu.net > (github: seblu)
2014-07-28 00:17:40 +02:00
Francisco Carriedo
81c7d28b84
pkg/units: Updated tests with unit constants
...
Also, now that I was at it, gave them a small refactor.
Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com > (github: fcarriedo)
2014-07-26 20:00:18 -07:00
Francisco Carriedo
c7a2e86b51
pkg/units: Unit constants directly int64
...
int64 seems sufficient
Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com > (github: fcarriedo)
2014-07-26 20:00:08 -07:00
unclejack
d0a0e91f1f
bump Go to 1.3
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-07-26 21:33:31 +03:00
Tibor Vass
4cfe806db2
Kill all concurrent jobs on error
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-07-26 13:45:35 -04:00
Tianon Gravi
0a7cd70924
Fix precompiled unit tests needing their "testdata" contents
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-26 11:46:52 -04:00
Tibor Vass
81e78db507
remove temporary line in Dockerfile that prevented cache miss
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-07-26 11:46:52 -04:00
Tianon Gravi
a6085fd430
Add a bunch more tweaks to the parallel test compilation
...
- put all the precompiled test binaries in $DEST so they show up in bundles and can be re-run individually afterwards
- support cases where parallel is not installed (when using dyntest-unit, for example, this is much more common, since it's designed to be run outside the Dockerfile)
- use "mktemp -d" instead of "/tmp" directly for our temporary parallel HOME
- update the default PARALLEL_JOBS to be the value of "nproc" instead of 0, since "0 means as many as possible" (see https://www.gnu.org/software/parallel/man.html#jobs_n )
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-26 11:46:36 -04:00
Tibor Vass
3a1385702c
benign whitespace change
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-07-26 11:46:36 -04:00
Tibor Vass
158e3068bd
compile unit tests in parallel with GNU parallel
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-07-26 11:46:36 -04:00
Julien Bordellier
2d84b877bd
Adding the query parameters to insert api call for all <= 1.10 and
...
removing the insert documentation for > 1.10 since it has been removed
in 1.11. This commit fixes #7183
Docker-DCO-1.1-Signed-off-by: Julien Bordellier <me@julienbordellier.com > (github: jstoja)
2014-07-26 13:03:04 +02:00
Erik Hollensbe
96f1a99034
Clean up the docker socket on termination of the daemon.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-07-25 17:45:49 -07:00
Victor Vieux
487a417d9f
Merge pull request #7251 from tiborvass/fix-test-import-display
...
Fix test import display
2014-07-25 17:34:09 -07:00
James Turnbull
1d21f75fa4
Merge pull request #7238 from dericcrago/patch-1
...
apache2 was looking for two other directories
2014-07-25 19:38:47 -04:00
Tibor Vass
caa5769928
Fix io.Reader ambiguity on EOF in progressreader
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-07-25 19:26:27 -04:00
Sven Dowideit
dacf909870
Merge pull request #7244 from anweiss/7243-dscarticle
...
Updated DSC article to reflect changes in config
2014-07-26 08:43:22 +10:00
Tibor Vass
d082381a93
address a few nits
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-07-25 18:29:47 -04:00
Michael Crosby
ec5b97ce9b
Merge pull request #7166 from unclejack/maintainer_archive
...
archive: add unclejack to MAINTAINERS
2014-07-25 13:44:49 -07:00
Andrew Weiss
7a5db6df99
updated article to reflect changes in config; fixed hyperlinks #7243
...
Docker-DCO-1.1-Signed-off-by: Andrew Weiss <andrew.weiss@outlook.com > (github: anweiss)
2014-07-25 15:49:33 -04:00
unclejack
7dde97640f
Merge pull request #7231 from vieux/allow_stack_trace
...
allow sigquit to display stacktrace in debug mode
2014-07-25 21:34:25 +03:00
Tianon Gravi
7756bcc7ab
Merge pull request #7227 from tianon/generate-authors
...
Add new script to generate AUTHORS and regenerate AUTHORS (fixing a few new dups too)
2014-07-25 12:31:47 -06:00
James Turnbull
c028bb239f
Merge pull request #7234 from michielbdejong/patch-1
...
Typo in dockervolumes.md line 141?
2014-07-25 13:14:50 -04:00
fcarriedo
2fb63aba0b
pkg/units: including suggestions and enhancements
...
Docker-DCO-1.1-Signed-off-by: fcarriedo <fcarriedo@gmail.com > (github: fcarriedo)
2014-07-25 09:33:04 -07:00
Johannes 'fish' Ziemke
32bc865879
Make sure err never gets masked
...
Defining err as named return parameter will make sure the variable gets
assigned before returning and thus avoid masking
Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org > (github: discordianfish)
2014-07-25 17:00:41 +02:00
Deric Crago
3fb913ab77
apache2 was looking for two other directories
...
/var/lock/apache2
/var/run/apache2
2014-07-25 10:14:52 -04:00
Michiel@unhosted
9503afbc91
Typo in dockervolumes.md line 141?
2014-07-25 09:06:38 +02:00
Sven Dowideit
ff28b0b919
Merge pull request #7185 from thaJeztah/patch-1
...
Fix incorrect path in ENTRYPOINT example
2014-07-25 17:06:29 +10:00
Victor Vieux
5b293f1596
allow sigquit to display stacktrace in debug mode
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-25 01:08:04 +00:00
Victor Vieux
228c6a374b
Merge pull request #7225 from vieux/update_path
...
update go import path and libcontainer
2014-07-24 17:22:21 -07:00
unclejack
4fbc47e801
archive: add unclejack to MAINTAINERS
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-07-25 02:07:40 +03:00
Tianon Gravi
771ed23915
Add new script to generate AUTHORS and regenerate AUTHORS (fixing a few new dups too)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-24 16:49:39 -06:00
Victor Vieux
1082246262
revert AUTHORS changes
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-24 22:30:05 +00:00
Victor Vieux
5a0ef08c94
gofmt -s -w
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-24 22:25:29 +00:00
Victor Vieux
b3ee9ac74e
update go import path and libcontainer
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-24 22:19:50 +00:00
fcarriedo
c765134ac9
pkg/units: Updated Compile() to MustCompile()
...
We were doing exactly what `regexp.MustCompile()` already does.
Docker-DCO-1.1-Signed-off-by: fcarriedo <fcarriedo@gmail.com > (github: fcarriedo)
2014-07-24 13:19:20 -07:00
Victor Vieux
2481e08e41
Merge pull request #7212 from mheon/kill_zero
...
Properly handle 0 being passed as a signal number
2014-07-24 11:42:16 -07:00
hollietealok
97283fa985
Merge remote-tracking branch 'upstream/master' into doc_remove
...
Docker-DCO-1.1-Signed-off-by: hollietealok <hollie@docker.com > (github: hollietealok)
2014-07-24 11:28:19 -07:00
James Turnbull
7365225957
Added proposed Docker Community Guidelines
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-07-24 11:04:58 -07:00
Michael Crosby
2ed10eae5b
Merge pull request #7179 from LK4D4/add_cap_audit_write_#6345
...
Add AUDIT_WRITE cap
2014-07-24 10:02:44 -07:00
Matthew Heon
be326b0ece
Properly handle 0 being passed as a signal
...
Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com > (github: mheon)
2014-07-24 11:06:20 -04:00
James Turnbull
0758acfb03
Merge pull request #7199 from ipbabble/mp-changes
...
Fixed some typos for '--' Vs '-' in docker-run-1.md
2014-07-24 06:51:56 -07:00
Sebastiaan van Stijn
2819d9b406
Fix incorrect path in ENTRYPOINT example
...
The ENTRYPOINT example uses "/usr/bin/ls" as path, but `ls` is located at `/bin/ls`.
Docker-DCO-1.1-Signed-off-by: Sebastiaan van Stijn <github@gone.nl > (github: thaJeztah)
2014-07-24 14:48:23 +02:00
Alexandr Morozov
5b0d4cf296
Test on building from GIT url
...
Also I added fake git server to utils
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-07-24 11:19:16 +04:00
Francisco Carriedo
386d300a6e
pkg/units: Refactored common code to single func
...
Both functions perform the same logic and they just vary on the base
multiplication units. We can refactor the common code into a single
place.
Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com > (github: fcarriedo)
2014-07-24 00:03:59 -07:00
Francisco Carriedo
e4ab996b9d
pkg/units: Moved 'units' out of function
...
No need to initialize every time the function executes since it works as
a catalog.
Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com > (github: fcarriedo)
2014-07-24 00:03:59 -07:00
Francisco Carriedo
d512294382
pkg/units: Compacted var declaration and initialization
...
No need to have two lines. The type is even explicit when type casting
to `float64(size)`
Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com > (github: fcarriedo)
2014-07-24 00:03:40 -07:00
Francisco Carriedo
a4d57d8a85
pkg/units: Refactor regexp.Compile to init()
...
No need to recompile a fixed regular expression each time the function
executes. Abstracting it to the `init()` method.
Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com > (github: fcarriedo)
2014-07-23 23:45:03 -07:00
Francisco Carriedo
0fd37bd7ac
pkg/units: Standardized supported sizes
...
May make sense that both `FromHumanSize()` and `RAMInBytes()` support
the same units. Added 'PB' to the RAMInBytes regex.
Also updated tests.
Note: int64 is overflowed on quantities >= EB
Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com > (github: fcarriedo)
2014-07-23 23:37:06 -07:00
Tianon Gravi
9380e8cbe7
Merge pull request #7148 from tianon/buildtags-docs
...
Reorganize and clarify the DOCKER_BUILDTAGS docs
2014-07-23 22:27:07 -06:00
Francisco Carriedo
03697f0a93
pkg/units: Using 'case' instead of trickled ifs
...
Seems the perfect case for 'case' ;).
Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com > (github: fcarriedo)
2014-07-23 20:38:36 -07:00
Sven Dowideit
bb6217c055
Merge pull request #7181 from timruffles/patch-3
...
[DOCS] replace foo/bar with concrete names
2014-07-24 12:26:10 +10:00
Victor Vieux
6b65e8817c
Merge pull request #7108 from unclejack/archive_speedup
...
speed up archive
2014-07-23 16:54:35 -07:00
William Henry
1403372963
Typo changes to docker-run-1.md - changing '-' to '--' where approp.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
2014-07-23 16:49:07 -04:00
Vincent Batts
683038bf57
Merge pull request #6727 from unclejack/improve_bytes_range
...
Improve layer downloading
2014-07-23 15:31:25 -04:00
hollietealok
9fbae59244
Removed docker_io_oauth_api.md: Docker is not currently accepting registrations for third party auth while it's determined how this will be done, if at all, in the future.
...
Docker-DCO-1.1-Signed-off-by: hollietealok <hollie@docker.com > (github: hollietealok)
2014-07-23 11:55:56 -07:00
Michael Crosby
92cba0845c
Merge pull request #7170 from unclejack/fix_testinspectlinksstopped
...
integcli: fix TestInspectLinksStopped with Go1.3
2014-07-23 11:19:11 -07:00
Michael Crosby
c71edef8d5
Merge pull request #7190 from vieux/merge_release_v1.1.2
...
Change version to 1.1.2-dev
2014-07-23 11:16:18 -07:00
Victor Vieux
56bb7ce780
Change version to 1.1.2-dev
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-23 18:09:02 +00:00
Michael Crosby
604a975303
Merge pull request #7164 from fcarriedo/not-error-as-var-name
...
pkg/units: Better to not use `error` as var name
2014-07-23 11:04:03 -07:00
Victor Vieux
1df87acb33
Merge pull request #7172 from vieux/bump_v1.1.2
...
Bump v1.1.2
2014-07-23 11:02:29 -07:00
James Turnbull
b9024174be
Merge pull request #7180 from rhuss/patch-1
...
Fixed parent-child relationship description
2014-07-23 10:17:19 -07:00
Fred Lifton
be3aa1eba0
Merge pull request #7176 from SvenDowideit/auto-update-master-cli-docs
...
user facing documentation changes in master atm
2014-07-23 10:15:02 -07:00
Tim Ruffles
455e837e20
[DOCS] replace foo/bar with concrete names
...
namespaces are not well documented, and I had to jump around to other docs. replacing `foo/bar` hopefully makes what's going on here a bit more obvious.
Docker-DCO-1.1-Signed-off-by: Tim Ruffles <timruffles@gmail.com > (github: timruffles)
2014-07-23 15:21:16 +01:00
Roland Huß
0a4b39b6a4
Fixed parent-child relationship description
...
"db" is the parent image, and "web" links to it as the child image. There was a typo in the document which reversed the relation.
2014-07-23 10:23:14 +02:00
Alexandr Morozov
29ecc95c31
Add AUDIT_WRITE cap
...
Fixes #6345
Thanks @larsks for outstanding investigation
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-07-23 09:57:41 +04:00
SvenDowideit
5743cc3423
user facing documentation changes in master atm
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-07-23 12:40:10 +10:00
Victor Vieux
d84a070e47
Bump version to v1.1.2
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-23 00:29:56 +00:00
Michael Crosby
4e12484ea1
Copy values out of hostConfig
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: vieux)
2014-07-23 00:20:11 +00:00
Michael Crosby
2c185e25c2
Always mark as stopped for non running containers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: vieux)
2014-07-23 00:20:04 +00:00
Tianon Gravi
21341e9e13
Add a conditional to contrib/init/sysvinit-debian/docker for Dash vs Bash support
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com > (github: vieux)
2014-07-23 00:19:24 +00:00
Alexandr Morozov
699bc47137
Set state running before dumping to disk
...
Fixes #4766
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Conflicts:
daemon/container.go
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: vieux)
2014-07-23 00:18:41 +00:00
Michael Crosby
885cda1ae2
Merge pull request #7167 from unclejack/maintainer_truncindex
...
pkg/truncindex: add unclejack to MAINTAINERS
2014-07-22 17:10:38 -07:00
Victor Vieux
9e1a9a7d98
Merge pull request #7163 from crosbymichael/fix-port-mapping-on-restart
...
Always mark as stopped for non running containers
2014-07-22 16:55:46 -07:00
Sven Dowideit
2f23e204d9
Merge pull request #7151 from SvenDowideit/add-version-selection-ux
...
Add version selection ux to the Documentation.
2014-07-23 09:21:55 +10:00
Francisco Carriedo
ea7b8ea03f
pkg/units: Better to not use error as var name
...
Better to not use `error` as var name (might eclipse the error type) for
clarity and to prevent subtle bugs.
Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com > (github: fcarriedo)
2014-07-22 15:39:59 -07:00
unclejack
d0cbc54f23
integcli: fix TestInspectLinksStopped with Go1.3
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-07-23 01:15:29 +03:00
Tianon Gravi
a491d204a0
Merge pull request #7157 from tianon/check-config-apparmor_parser
...
Add "apparmor_parser" warning to check-config.sh
2014-07-22 15:38:08 -06:00
Victor Vieux
314bf61889
Merge pull request #7165 from fcarriedo/remove-named-returns
...
pkg/units: Remove unused named returns
2014-07-22 14:37:49 -07:00
Sven Dowideit
0d118ffbf8
Merge pull request #7169 from fredlf/update_osx-install
...
Initial revisions to b2d doc, new screenshots.
2014-07-23 07:34:06 +10:00
Fred Lifton
4002b4623c
Initial revisions to b2d doc, new screenshots.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Final revisions to B2D doc.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-07-22 13:14:42 -07:00
unclejack
7407664c66
pkg/truncindex: add unclejack to MAINTAINERS
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-07-22 23:08:28 +03:00
Francisco Carriedo
588090c49b
pkg/units: Remove unused named returns
...
Remove named returns since not used in function body. Might prevent
potential subtle bugs.
Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com > (github: fcarriedo)
2014-07-22 12:16:50 -07:00
Victor Vieux
c838a4be29
Merge pull request #7162 from nathanleclaire/tar-with-options-err-check
...
Add missing error check
2014-07-22 11:37:21 -07:00
Victor Vieux
ceddf4c0e8
Merge pull request #7160 from fcarriedo/7159-test-coverage
...
pkg/units: Increased test coverage
2014-07-22 11:27:46 -07:00
Nathan LeClaire
a1c5f268e5
Add missing error check
...
Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathan.leclaire@docker.com > (github: nathanleclaire)
2014-07-22 10:41:58 -07:00
Francisco Carriedo
c47ab1425f
pkg/units: Increased test coverage. Closes #7159 .
...
Increased coverage:
* Added test cases to size_test.go
* Added coverage for duration.go
Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com > (github: fcarriedo)
2014-07-22 09:56:58 -07:00
Tianon Gravi
75ba7a9b32
Add "apparmor_parser" warning to check-config.sh
...
If AppArmor is enabled on the current system, but "apparmor_parser" isn't installed, it causes all kinds of issues.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-22 10:34:28 -06:00
Phil
f1e072c8d5
Updating to reflect changes in the SoftLayer portal and product naming conventions.
...
Docker-DCO-1.1-Signed-off-by: Phil Jackson <underscorephil@gmail.com > (github: underscorephil)
2014-07-22 10:39:40 -05:00
SvenDowideit
29f1ed833c
Get an extra pair of eyes on the Softlayer installation docs
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-07-22 20:25:21 +10:00
SvenDowideit
4d109f6158
avoid publishing to the root unless specified, so old version releases only goto their own dir
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-07-22 19:05:18 +10:00
SvenDowideit
3472c006c4
Add more details so I have more of an over-view of what I need to
...
automate
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-07-22 18:04:48 +10:00
SvenDowideit
3853a9c612
the build cache is too agressive, and I am regularly getting builds using an old version - forcing the issue
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-07-22 17:21:03 +10:00
Michael Crosby
ddb2086ca9
Copy values out of hostConfig
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-07-22 00:16:26 -07:00
Tianon Gravi
1b31a80eb7
Reorganize and clarify the DOCKER_BUILDTAGS docs
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-21 22:00:26 -06:00
Michael Crosby
a091d949ac
Always mark as stopped for non running containers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-07-21 19:59:44 -07:00
Sven Dowideit
9dc82e6102
Merge pull request #7134 from MidnightDesign/patch-1
...
Fix a typo in the tutorial
2014-07-22 12:00:06 +10:00
Sven Dowideit
1cc55fda3d
Merge pull request #7112 from proppy/patch-8
...
docs/installation/google: update gcloud options
2014-07-22 11:22:08 +10:00
Sven Dowideit
324010ad66
Merge pull request #7030 from runvnc/patch-1
...
Better example for data container
2014-07-22 10:49:27 +10:00
Sven Dowideit
8f75de2d4e
Merge pull request #6569 from bcexelbi/rhel-install-update
...
Updated Red Hat Enterprise Linux installation instructions for version 7
2014-07-22 10:30:18 +10:00
Victor Vieux
1473374a2a
Merge pull request #7078 from unclejack/fix_archive_tar_pax_headers
...
archive/tar: update to fix writing of PAX headers
2014-07-21 17:26:41 -07:00
Michael Crosby
b7ff33f73c
Merge pull request #7146 from dmp42/master
...
Joining registry maintainers
2014-07-21 17:02:52 -07:00
Olivier Gambier
ebc05cbbea
Joining registry maintainers
...
Docker-DCO-1.1-Signed-off-by: Olivier Gambier <olivier@docker.com > (github: dmp42)
2014-07-22 01:50:32 +02:00
Johan Euphrosine
5d8e80ba8d
integration-cli/TestBuildAddTar: embed Dockerfile
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-07-21 15:02:31 -07:00
Victor Vieux
d0e2d9ec39
Merge pull request #6976 from vbatts/vbatts-early_daemon_pidfile
...
docker daemon: initialize the daemon pidfile early
2014-07-21 14:26:14 -07:00
Fred Lifton
61b675d3bb
Merge pull request #7104 from mheon/sigproxy_docs
...
Update docs on --sig-proxy
2014-07-21 13:42:41 -07:00
unclejack
76429cc11f
archive: add a benchmark for TarUntar
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-07-21 23:20:32 +03:00
unclejack
a377844998
archive: add buffers to operations with tarballs
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-07-21 23:20:21 +03:00
Johan Euphrosine
24c00c8508
integration-cli/TestBuildAddTar: generate context from test
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-07-21 13:03:00 -07:00
Aaron Huslage
d8a76a02dc
Merge pull request #6996 from soulshake/patch-1
...
Update https.md
2014-07-21 12:22:59 -07:00
soulshake
319a8a241e
Resolve merge conflict, attempt 3
...
Docker-DCO-1.1-Signed-off-by: AJ Bowen <aj@gandi.net > (github: soulshake)
2014-07-21 12:18:59 -07:00
Vincent Batts
b752e7402a
Merge pull request #7050 from Aigeruth/fix/push_image_layer_registry_content_type
...
Add Content-Type header in PushImageLayerRegistry
2014-07-21 15:07:01 -04:00
Michael Crosby
86f20e561f
Merge pull request #7061 from muchweb/rms
...
Can't believe you forgot RMS
2014-07-21 12:02:45 -07:00
Johan Euphrosine
30519330c7
integration-cli: add more tests for BuildAddTar
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-07-21 11:56:49 -07:00
Michael Crosby
6dd8eb9520
Merge pull request #7090 from philips/add-philips-to-systemd-maintainers
...
contrib/init/systemd: add philips as MAINTAINER
2014-07-21 11:41:38 -07:00
Michael Crosby
e4c79736bf
Merge pull request #7122 from LK4D4/move_some_run_tests_to_cli
...
Move some run tests to cli
2014-07-21 11:25:36 -07:00
Johan Euphrosine
e1bb99d925
docs/installation/google: update gcloud options
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-07-21 10:55:12 -07:00
Tianon Gravi
ed92c3f964
Merge pull request #7124 from tianon/travis-compile
...
Adjust Travis to also compile, to test that compilation still succeeds
2014-07-21 11:38:15 -06:00
Michael Crosby
12ee68aabe
Merge pull request #7116 from timthelion/relativevolumeerror
...
Give context for the error that occures when you try to bind mount a vol...
2014-07-21 10:22:35 -07:00
unclejack
c47ebe7a35
get layer: remove HEAD req & pass down response
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-07-21 20:21:18 +03:00
unclejack
f033ce3ee9
resumablerequestreader: allow initial response
...
Make it possible to inspect an initial response and pass it to
ResumableRequestReader. This makes it possible to inspect an initial
response and passing it to ResumableRequestReader to avoid making an
extra request.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-07-21 19:54:25 +03:00
Rudolph Gottesheim
9ff7bbe0ac
Fix a typo in the tutorial
2014-07-21 10:34:54 +02:00
Sven Dowideit
8365abb200
Merge pull request #7131 from msabramo/patch-1
...
Fix minor grammar issues in dockervolumes.md
2014-07-21 16:09:41 +10:00
SvenDowideit
5cd0f0824d
dynamically load a /versions.html_fragment file so that all old versions get the complete dropdown list of versions to select
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-07-21 15:51:14 +10:00
SvenDowideit
c550ad5900
The UX spec
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-07-21 12:39:48 +10:00
SvenDowideit
8a4b79ca50
initial work to make a mockup
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-07-21 12:39:48 +10:00
Marc Abramowitz
4ac6375790
Fix minor grammar issues in dockervolumes.md
2014-07-20 17:05:37 -07:00
Sven Dowideit
e60543400d
Merge pull request #7117 from hipertracker/patch-1
...
Update dockerlinks.md
2014-07-21 09:43:23 +10:00
Tianon Gravi
3cff015169
Adjust Travis to also compile, to test that compilation still succeeds
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-19 12:12:27 -06:00
James Turnbull
f39e0567b6
Merge pull request #7114 from bfirsh/remove-blank-use-doc
...
Remove blank "use" documentation
2014-07-19 03:09:47 -07:00
LK4D4
e88487b321
Move TestCopyVolumeContent to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-07-19 12:42:27 +04:00
LK4D4
9a7c5be7d1
Move TestCopyVolumeUidGid to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-07-19 12:42:27 +04:00
Tibor Vass
ac6ec9df1d
Merge pull request #6913 from unclejack/map_randomization_fixes
...
integcli: fix failures caused by tiny map randomization
2014-07-19 00:27:37 -05:00
Jaroslaw Zabiello
a781de0c10
Update dockerlinks.md
...
Added missing command for logging into web container.
2014-07-19 05:38:11 +01:00
Timothy
7aed2130f9
Give context for the error that occures when you try to bind mount a volume with a relative path
...
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz > (github: timthelion)
2014-07-19 04:12:16 +00:00
Ben Firshman
b82778b293
Remove blank "use" documentation
...
Introduced in dotcloud/docker#3070
Docker-DCO-1.1-Signed-off-by: Ben Firshman <ben@firshman.co.uk > (github: bfirsh)
2014-07-18 18:45:20 -07:00
Victor Vieux
ccbaf4bc6e
Merge pull request #7109 from crosbymichael/update-libcontainer-july4
...
Update libcontainer to cf45d141db69ce11dcccac178e5
2014-07-18 18:40:34 -07:00
Solomon Hykes
93a7c84b6f
Merge pull request #7043 from ipbabble/404NotFound
2014-07-18 18:39:42 -07:00
Solomon Hykes
c7bc929e01
Merge pull request #3070 from alexlarsson/certificates
2014-07-18 18:27:00 -07:00
Sven Dowideit
82675ee359
Merge pull request #7107 from bkochendorfer/patch-1
...
Update runmetrics.md
2014-07-19 00:13:06 +00:00
Michael Crosby
1b9b11db4f
Update libcontainer to cf45d141db69ce11dcccac178e5
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-07-18 15:31:25 -07:00
Tianon Gravi
7ee8fd5ecf
Merge pull request #6933 from ztombol/feat-mkimage-arch-expect
...
Fix expect script in mkimage-arch
2014-07-18 15:47:18 -06:00
Victor Vieux
e52382292f
Merge pull request #7098 from fabiofalci/move_ps_tests_to_cli
...
Move `docker ps` test to integration cli
2014-07-18 14:29:40 -07:00
Brett Kochendorfer
95caf8c485
Update runmetrics.md
2014-07-18 16:16:19 -05:00
Victor Vieux
9b3c0e65da
Merge pull request #7106 from vieux/logout
...
Add logout command
2014-07-18 14:13:59 -07:00
Tianon Gravi
9870a2bcae
Merge pull request #7077 from tianon/fix-ubuntu-systemd
...
Fix hack/make/ubuntu to install both docker.service and docker.socket
2014-07-18 14:13:04 -06:00
unclejack
1646e5d69a
Merge pull request #7069 from crosbymichael/update-libcontainer-july3
...
Update libcontainer to be85764f109c3f0f62cd2a5c8be
2014-07-18 22:34:22 +03:00
Victor Vieux
615f211084
Merge pull request #7079 from LK4D4/state_tests
...
Tests on container state changing
2014-07-18 11:21:23 -07:00
Victor Vieux
56a39ca5d3
update style
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-18 17:52:24 +00:00
Alexandr Morozov
4162309d11
Tests on container state changing
...
It could catch error that was fixed in #6954
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-07-18 21:51:55 +04:00
Daniel, Dao Quang Minh
4b5b3b4321
fix doc references
...
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com > (github: dqminh)
2014-07-18 17:45:25 +00:00
Daniel, Dao Quang Minh
06bc4e0752
Add logout command
...
"docker logout [SERVER]" will remove the registry server' credentials from
.dockercfg file. If a server is not specified, it will log user out of the
default docker registry server
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com > (github: dqminh)
2014-07-18 17:42:49 +00:00
Jason Livesay
8273cb4b9b
Improve data volume container example.
...
Docker-DCO-1.1-Signed-off-by: Jason Livesay <ithkuil@gmail.com > (github: runvnc)
2014-07-18 10:22:15 -07:00
Fred Lifton
36608696e1
Merge pull request #6984 from jameskyle/6937-allow-setting-of-docker-config-directory
...
Closes 6937. Allows setting of docker config dir.
2014-07-18 09:51:50 -07:00
Matthew Heon
31351d08a3
Update docs on --sig-proxy to indicate that SIGKILL and SIGSTOP cannot be proxied
...
Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com > (github: mheon)
2014-07-18 12:32:04 -04:00
Fabio Falci
261dc5e2f6
Move docker ps test to integration cli
...
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: fabiofalci)
2014-07-18 09:43:40 +01:00
Brian (bex) Exelbierd
204e080932
Updated Red Hat Enterprise Linux installation instructions for version 7
...
Docker-DCO-1.1-Signed-off-by: Brian Exelbierd <bex@pobox.com > (github: bcexelbi)
2014-07-18 08:08:27 +02:00
Alexandr Morozov
7d97a5f476
Skip whole dir dockerignoring with warning
...
Fixes #7093
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-07-18 09:35:54 +04:00
Sven Dowideit
c11660169a
Merge pull request #7094 from fredlf/update_docker-hub
...
New screenshots and a few small edits.
2014-07-18 02:36:33 +00:00
Victor Vieux
5948b105e7
Merge pull request #7083 from mheon/6983_bugfix
...
Fix Panic with -t and -a stderr
2014-07-17 18:41:24 -07:00
Sven Dowideit
7a5ddd5df8
Merge pull request #7082 from bdevloed/patch-1
...
Update usingdocker.md
2014-07-18 01:26:15 +00:00
Sven Dowideit
9f036fc6ee
Merge pull request #7068 from fredlf/add_image-tag
...
Added info re: image[:tag] to make docs consistent.
2014-07-18 00:03:57 +00:00
Fred Lifton
c92e13f678
New screenshots and a few small edits.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-07-17 16:41:50 -07:00
unclejack
68bb56a4a5
integcli: fix map randomization failures
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-07-17 23:11:45 +03:00
unclejack
e5e8669c72
integcli: add JSON utils for testing
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-07-17 23:11:40 +03:00
Brandon Philips
8130768014
contrib/init/systemd: add philips as MAINTAINER
...
As requested after #7021 add me as a maintainer alongside the sword
toting @lsm5.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-07-17 11:57:16 -07:00
Tibor Vass
ae37f2b88f
Merge pull request #7072 from SvenDowideit/remove-infrastructure-dir
...
this info is out of date and forgotten
2014-07-17 14:39:14 -04:00
Fred Lifton
ca015b8885
Merge pull request #7027 from SvenDowideit/use-a-hello-world-micro-image
...
Tianon made a micro-image (sub one meg?) that we can use as a very fast ...
2014-07-17 11:31:54 -07:00
Tianon Gravi
ee7313472c
Merge pull request #7088 from vincentbernat/fix/zsh-completion-update
...
Update zsh completion for docker command with upstream (felixr/docker-zsh-completion) latest
2014-07-17 12:05:23 -06:00
Vincent Bernat
67e3f7482f
zsh: update zsh completion for docker command
...
zsh completion is updated with the content of
felixr/docker-zsh-completion.
Docker-DCO-1.1-Signed-off-by: Vincent Bernat <vincent@bernat.im > (github: vincentbernat)
2014-07-17 19:50:50 +02:00
Matthew Heon
1476f295ac
Bugfix: only use io.Copy in hijack if attaching both stdout and stderr
...
Add regression tests to ensure issue is fixed.
Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com > (github: mheon)
2014-07-17 13:47:33 -04:00
unclejack
dca52c47a4
Merge pull request #7055 from coheyxyz/break-loop
...
Break loop correctly
2014-07-17 18:20:12 +03:00
bdevloed
f9b3147e2c
Update usingdocker.md
...
Change --help example command to match output in docs
2014-07-17 14:44:18 +02:00
Kohei Tsuruta
ffe885ec0e
Change switch to if so that the break statements correctly breaks loop
...
Docker-DCO-1.1-Signed-off-by: Kohei Tsuruta <coheyxyz@gmail.com > (github: coheyxyz)
2014-07-17 20:27:29 +09:00
James Turnbull
4ae27be2cd
Merge pull request #7049 from albers/default-option
...
removed default --rm option from example build command
2014-07-17 04:52:16 -04:00
unclejack
f565862abc
archive/tar: update to fix writing of PAX headers
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-07-17 08:54:26 +03:00
Tianon Gravi
ff08357c9b
Fix hack/make/ubuntu to install both docker.service and docker.socket
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-16 23:03:32 -06:00
Tianon Gravi
07f9d48696
Merge pull request #7021 from lsm5/systemd-maintainer
...
Add systemd MAINTAINERS file and update docker.service to always use socket activation
2014-07-16 23:01:37 -06:00
SvenDowideit
ade6d780d6
this info is out of date and forgotten
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-07-17 12:04:52 +10:00
Sven Dowideit
6ae07e2410
Tianon made a micro-image (sub one meg?) that we can use as a very fast to download 'yes, your docker can download and run an image' test
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-07-17 11:54:35 +10:00
Michael Crosby
7a8ea91392
Fix cross compile non cgo and linux systems
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-07-16 16:57:49 -07:00
Michael Crosby
0d67b420b5
Make tty term exec driver specific
...
lxc is special in that we cannot create the master outside of the
container without opening the slave because we have nothing to provide to the
cmd. We have to open both then do the crazy setup on command right now instead of
passing the console path to lxc and telling it to open up that console. we save a couple of
openfiles in the native driver because we can do this.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-07-16 16:57:49 -07:00
Michael Crosby
1501c342d8
Don't create pty slave in the daemon for native driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-07-16 16:57:19 -07:00
Michael Crosby
9fc6058aa1
Update libcontainer to be85764f109c3f0f62cd2a5c8be
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-07-16 16:57:19 -07:00
Fred Lifton
41d6ab6318
Added info re: image[:tag] to make docs consistent. Fixed a markdown issue.
...
Closes issue #6833
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-07-16 16:39:44 -07:00
Victor Vieux
6cd1061a5b
Merge pull request #7066 from unclejack/disallow_links_with_nethost
...
don't allow links to be used with --net=host
2014-07-16 16:21:13 -07:00
Victor Vieux
6d238c6fba
Merge pull request #6797 from zhgwenming/master
...
make /.dockerinit bind mount driver specific
2014-07-16 16:01:43 -07:00
s-ko
b0e9d370c2
Removed :neckbeard: RMS test case
...
Docker-DCO-1.1-Signed-off-by: Aleksandrs Fadins <aleks@s-ko.net > (github: muchweb)
2014-07-16 23:22:21 +01:00
Tianon Gravi
f84bcc6bd0
Merge pull request #7064 from tianon/debootstrap-gzipindexes
...
Add "Acquire::GzipIndexes" to contrib/mkimage/debootstrap
2014-07-16 15:50:54 -06:00
s-ko
352909dd54
Added :neckbeard: RMS the founder of 🐃 GNU and 🆓 as in :free:dom software
...
Docker-DCO-1.1-Signed-off-by: Aleksandrs Fadins <aleks@s-ko.net > (github: muchweb)
2014-07-16 22:45:08 +01:00
unclejack
be8cea9856
don't allow links to be used with --net=host
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-07-17 00:32:24 +03:00
Tianon Gravi
2e61e8267e
Add "Acquire::GzipIndexes" to contrib/mkimage/debootstrap
...
This results in a dramatic improvement in the size of individual "apt-get update" layers (on a clean wheezy base, from "29.88 MB" down to "8.273 MB").
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-16 14:58:02 -06:00
Michael Crosby
50b580cfec
Use : to split caps in sysinit flags
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-07-16 13:40:10 -07:00
Victor Vieux
dae6af1d1c
Merge pull request #7060 from crosbymichael/case-insensitive-caps
...
Allow case insensitive caps for add and drop
2014-07-16 12:34:59 -07:00
Michael Crosby
47917135da
Fix cap drop issues with lxc
...
This uses "," instead of spaces so that the flags are parsed correctly
and also does not do a strings.Split on an empty string because
strings.Split will return a slice with one element, and empty string
causing parsing to fail when it validates that the cap exists.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-07-16 12:14:26 -07:00
Michael Crosby
7c19499c63
Allow case insensitive caps for add and drop
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-07-16 11:47:55 -07:00
Victor Vieux
905ae7bb28
Merge pull request #7045 from SvenDowideit/pr_out_re_write_to_put_the_emphasis_on_the_format
...
re-write to put the emphasis on the format
2014-07-16 11:47:05 -07:00
Michael Crosby
5702029a0f
Merge pull request #6954 from LK4D4/fix_container_run_after_restart_#4766
...
Set state running before dumping to disk
2014-07-16 11:35:14 -07:00
Michael Crosby
1583e7af41
Merge pull request #6991 from bobrik/empty-dockerignore
...
Skipping empty lines in .dockerignore
2014-07-16 10:46:38 -07:00
Gabor Nagy
f861bfd9ff
Add Content-Type header in PushImageLayerRegistry
...
Docker-DCO-1.1-Signed-off-by: Gabor Nagy <mail@aigeruth.hu > (github: Aigeruth)
2014-07-16 12:23:25 +02:00
Harald Albers
c5f55a233d
removed default --rm option from example build command
...
this line gave the false impression that containers are not removed
unless you specify the --rm argument.
2014-07-16 11:18:08 +02:00
Sven Dowideit
3b3f0fa085
Merge pull request #6601 from SvenDowideit/6510-docker-pause-docs
...
6510 docker pause docs
2014-07-16 03:30:49 +00:00
Sven Dowideit
8175c666a3
Merge pull request #7046 from SvenDowideit/pr_out_update_debian_md
...
Update debian.md
2014-07-16 01:47:25 +00:00
SvenDowideit
fa5bce2859
the package now adds the bash_completion too
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-07-16 11:46:18 +10:00
Sven Dowideit
4eaacb6b88
Merge pull request #7044 from proppy/patch-7
...
docs/google: bump container-vm image version
2014-07-16 01:07:23 +00:00
SvenDowideit
ed8b017ee0
re-write to put the emphasis on the format
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-07-16 11:02:44 +10:00
Johan Euphrosine
c6197058a8
docs/google: bump container-vm image version
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-07-15 17:41:59 -07:00
William Henry
b45e8fa945
Change HTTP code: 404 to a more user friendly Image Not found msg
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
2014-07-15 18:17:41 -06:00
SvenDowideit
58955a30ff
re-jig the info into all the places
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-07-16 09:42:46 +10:00
Brian Goff
3957d72f9c
Add cgroups freezer info
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: SvenDowideit)
2014-07-16 09:42:46 +10:00
Sven Dowideit
5b8a6eb05f
Add cli.md documentation for docker-pause and docker-unpause
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-07-16 09:42:46 +10:00
Victor Vieux
01d1615001
missing doc for 6896
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-15 23:32:12 +00:00
Sven Dowideit
d736754a47
Merge pull request #7039 from jamtur01/apidoc
...
Removed legacy api.md file
2014-07-15 23:12:22 +00:00
James Kyle
c0471ee35a
Closes 6937. Allows setting of docker config dir.
...
Can now dynamically set the docker config directory through an
environment variable.
export DOCKER_CONFIG=/path/to/docker_config/
Default behavior remains the same, e.g. ~/.docker
Documentation for change added to the https.md docs.
Docker-DCO-1.1-Signed-off-by: James A. Kyle <james@jameskyle.org > (github: jameskyle)
2014-07-15 15:47:00 -07:00
Fred Lifton
9c8b59c1b0
Merge pull request #6892 from mpapo/docs-docker-aufs-limitation
...
Add small note about AUFS layer limitation
2014-07-15 15:03:46 -07:00
Sven Dowideit
5bdf2cf459
Merge pull request #7037 from henning/patch-3
...
Adjust Link description to match target
2014-07-15 21:55:06 +00:00
Sven Dowideit
b6e1cfc075
Merge pull request #6855 from SvenDowideit/update-osx-installer-image-to-show-final-page
...
The installer completed page now contains information on next steps, so ...
2014-07-15 21:17:29 +00:00
James Turnbull
4fc8edd0df
Removed legacy api.md file
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-07-15 16:40:43 -04:00
Henning Sprang
fb51a330bb
Adjust Link description to match target
...
The target document headline is "Managing data in containers" and so should the link be named.
2014-07-15 22:24:08 +02:00
Michaël Pailloncy
2a230729da
Update small note about layer limitation
...
Docker-DCO-1.1-Signed-off-by: Michaël Pailloncy <mpapo.dev@gmail.com > (github: mpapo)
2014-07-15 21:58:01 +02:00
Michaël Pailloncy
d91d381856
Add small note about AUFS layer limitation
...
Docker-DCO-1.1-Signed-off-by: Michaël Pailloncy <mpapo.dev@gmail.com > (github: mpapo)
2014-07-15 21:58:01 +02:00
James Turnbull
37309f37fa
Merge pull request #7029 from albers/patch-2
...
no need to create a link to the docker binary
2014-07-15 13:47:39 -04:00
Harald Albers
88c6017644
no need to create a link to the docker binary
2014-07-15 14:18:28 +02:00
Albert Zhang
b3b6e05f26
since moved the ./dockerinit mount into lxc driver, fix the lxc testcase accordingly
...
Docker-DCO-1.1-Signed-off-by: Albert Zhang <zhgwenming@gmail.com > (github: zhgwenming)
2014-07-15 07:56:19 -04:00
Tianon Gravi
47de2e3269
Merge pull request #6755 from tianon/bash-completion-for-link-and-bind
...
Update bash completion for "docker run --link" and "docker run -v" to complete on running containers and the local filesystem respectively
2014-07-15 00:15:13 -06:00
Sven Dowideit
f976014410
The installer completed page now contains information on next steps, so is more useful than the intro
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-07-15 13:50:12 +10:00
Solomon Hykes
781a47e3f3
Merge pull request #6885 from tianon/standard-curl-sSL
2014-07-14 18:39:31 -07:00
Lokesh Mandvekar
0bde827c3f
systemd unitfile requires docker.socket
...
modified: contrib/init/systemd/docker.service
Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org > (github: lsm5)
2014-07-14 18:08:38 -05:00
Lokesh Mandvekar
076ac1d7d2
use systemd socket-activation by default
...
modified: contrib/init/systemd/docker.service
renamed: contrib/init/systemd/socket-activation/docker.socket -> contrib/init/systemd/docker.socket
deleted: contrib/init/systemd/socket-activation/docker.service
Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org > (github: lsm5)
2014-07-14 17:41:07 -05:00
Lokesh Mandvekar
5105981431
add systemd MAINTAINERS file
...
new file: contrib/init/systemd/MAINTAINERS
Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org > (github: lsm5)
2014-07-14 17:38:23 -05:00
Fred Lifton
9d6f295d5d
Merge pull request #6994 from Aigeruth/fix/docs/registry_api
...
Fix MarkDown in Docker Registry API docs
2014-07-14 15:15:29 -07:00
Michael Crosby
12d58a2688
Merge pull request #7019 from crosbymichael/update-libcontainer-july2
...
Update libcontainer to version fb67bb80b4205bece36ff7096ee7
2014-07-14 14:51:00 -07:00
Tianon Gravi
f77cde6a93
Merge pull request #7018 from tianon/dash
...
Add a conditional to contrib/init/sysvinit-debian/docker for Dash vs Bash support
2014-07-14 14:05:04 -06:00
Michael Crosby
f00e643576
Update native driver for libcontainer changes
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-07-14 12:49:50 -07:00
Michael Crosby
3b4a1c54d8
Update libcontainer dep to fb67bb80b4205bece36ff70
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-07-14 12:30:19 -07:00
Tianon Gravi
4f0fbb885e
Add a conditional to contrib/init/sysvinit-debian/docker for Dash vs Bash support
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-14 12:34:04 -06:00
Michael Crosby
7ebd49c49a
Merge pull request #6968 from vieux/cap_add_drop
...
Add support for --cap-add and --cap-drop
2014-07-14 10:42:29 -07:00
Michael Crosby
b39fb160c6
Merge pull request #6970 from vieux/add_FSETID
...
add FSETID back to the caps whitelist
2014-07-14 10:37:04 -07:00
Tibor Vass
dfbb291c40
Merge pull request #7016 from LK4D4/fix_some_cleanups_in_archive
...
Some resource clean ups in archive
2014-07-14 13:26:47 -04:00
Alexandr Morozov
97a3807901
Set state running before dumping to disk
...
Fixes #4766
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-07-14 21:16:27 +04:00
Victor Vieux
804f028862
Merge pull request #7014 from proppy/patch-6
...
api/server/MAINTAINERS: comment proppy (vacation)
2014-07-14 10:15:53 -07:00
Johan Euphrosine
32740543da
api/server/MAINTAINERS: comment proppy (vacation)
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-07-14 10:13:46 -07:00
LK4D4
66ccd55ed4
Some resource clean ups in archive
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-07-14 21:11:48 +04:00
Solomon Hykes
8a4f1ad837
Merge pull request #7012 from shykes/tibor-maintainer
...
Add Tibor Vass as maintainer
2014-07-14 09:25:05 -07:00
Sven Dowideit
b93787e6e0
Merge pull request #6967 from fredlf/copyedit-builds
...
Added bitbucket hook info and warning re: validating accounts.
2014-07-14 03:35:37 +00:00
Gabor Nagy
b1677f9d09
Fix MarkDown in Docker Registry API docs
...
Docker-DCO-1.1-Signed-off-by: Gabor Nagy <mail@aigeruth.hu > (github: Aigeruth)
2014-07-13 11:15:52 +02:00
James Turnbull
e20a95f24c
Merge pull request #6989 from jamtur01/builder
...
General cleanup of the builder.md file
2014-07-12 22:22:55 -04:00
James Turnbull
07d93c6e34
General cleanup of the builder.md file
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-07-12 11:30:51 -04:00
James Turnbull
b5a69da5b6
Merge pull request #6990 from folieadrien/missing-rm-api-docs
...
add missing api docs for #6863
2014-07-12 11:21:54 -04:00
James Turnbull
214ab777f4
Merge pull request #6988 from jamtur01/entry
...
Rewrote the ENTRYPOINT section in builder
2014-07-12 11:21:36 -04:00
Vincent Batts
848e837698
docker daemon: initialize the daemon pidfile early
...
fixes https://github.com/dotcloud/docker/issues/6973
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-07-12 08:25:05 -04:00
Ian Babrou
1a1ee73e38
Skipping empty lines in .dockerignore
...
Docker-DCO-1.1-Signed-off-by: Ian Babrou <ibobrik@gmail.com > (github: bobrik)
2014-07-12 13:38:33 +04:00
Adrien Folie
88326e9b91
add missing docs for rm
...
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com > (github: folieadrien)
2014-07-12 06:33:43 +02:00
James Turnbull
b2ba1a9ce5
Rewrote the ENTRYPOINT section in builder
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-07-11 22:12:59 -04:00
Victor Vieux
6bb27f18d1
update api doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-12 01:03:12 +00:00
Victor Vieux
e7d9854414
add doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-11 23:43:21 +00:00
Victor Vieux
c04230c42b
add check for invalid caps
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-11 23:43:21 +00:00
Victor Vieux
064b5f870d
support add and drop in both order
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-11 23:43:21 +00:00
Victor Vieux
222a6f4401
add basic support for 'all'
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-11 23:43:21 +00:00
Victor Vieux
f3ff323fb3
small refactoring
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-11 23:43:21 +00:00
Victor Vieux
8344b6d736
fix job and add tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-11 23:43:21 +00:00
Victor Vieux
21059af3ac
Basic --cap-add and --cap-drop support for lxc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-11 23:43:21 +00:00
Victor Vieux
94e6dc9781
Basic --cap-add and --cap-drop support for native
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-11 23:43:21 +00:00
Victor Vieux
319f551614
Merge pull request #6987 from vieux/fix_6863
...
Stop & Kill options for containers removal
2014-07-11 16:22:01 -07:00
Victor Vieux
fe5ab5b058
proper rebase
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-11 23:27:23 +00:00
Adrien Folie
5ba11e6890
update CLI & api docs
...
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com > (github: folieadrien)
2014-07-11 23:26:08 +00:00
Adrien Folie
d689a5e1e2
Add tests for rm with stop and kill options
...
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com > (github: folieadrien)
2014-07-11 23:26:08 +00:00
Adrien Folie
7810070630
Stop/Kill options for containers removal
...
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com > (github: folieadrien)
2014-07-11 23:26:08 +00:00
unclejack
d53db040c8
Merge pull request #6896 from vieux/add_parsing_deamon_side
...
Add repo/tag parsing on the daemon for pull and import
2014-07-12 01:44:32 +03:00
Victor Vieux
00c1668011
Merge pull request #6985 from vieux/fix_api_1.14
...
bump api to 1.14 & update docs
2014-07-11 15:35:25 -07:00
Victor Vieux
cdfdbe9bc6
proper rebase
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-11 22:39:43 +00:00
Michael Crosby
c3f247860a
Merge pull request #6979 from LK4D4/fix_race_inspect_start
...
Use container.Lock in public ToDisk method
2014-07-11 13:44:01 -07:00
LK4D4
eae5cf1e20
Use container.Lock in public ToDisk method
...
Here was possible race with inspect where we changing HostConfig.Links
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-07-11 23:31:03 +04:00
Fred Lifton
358758e99f
Edits based on feedback from docs team.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-07-11 11:42:29 -07:00
James Turnbull
2944d8ca3e
Merge pull request #6890 from huslage/tls-doc-fixes2
...
Clarification of TLS Docs
2014-07-11 14:36:24 -04:00
Aaron Huslage
c3d91263a8
Clarified TLS Docs
...
Made a "Secure by default" section, create 2048-bit keys, various cleanups.
Docker-DCO-1.1-Signed-off-by: Aaron Huslage <huslage@gmail.com > (github: huslage)
2014-07-11 14:35:01 -04:00
Solomon Hykes
1a99f36580
Add Tibor Vass as maintainer
...
* hack/
* archive/
* integration/
* server/buildfile.go
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-07-11 12:28:11 +00:00
James Turnbull
7c4f7780a1
Merge pull request #6209 from zdover23/03_Jun_2014
...
BZ#1104401 - correcting flags in docker-commit
2014-07-11 08:03:36 -04:00
Victor Vieux
9216ced003
Merge pull request #6961 from crosbymichael/devices-flag
...
Add --device flag to allow additional host devices in container
2014-07-10 17:44:44 -07:00
Victor Vieux
e8762bfe39
add FSETID back to the caps whitelist
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-11 00:30:56 +00:00
Fred Lifton
e80d075633
Added bitbucket hook info and warning re: validating accounts.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-07-10 16:51:16 -07:00
Timothy
e855c4b921
Add --device flag to allow additional host devices in container
...
We add a --device flag which can be used like:
docker run --device /dev/sda:/dev/xvda:rwm ubuntu /bin/bash
To allow the container to have read write permissions to access the host's /dev/sda via a node named /dev/xvda in the container.
Note: Much of this code was written by Dinesh Subhraveti dineshs@altiscale.com (github: dineshs-altiscale) and so he deserves a ton of credit.
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz > (github: timthelion)
2014-07-10 10:35:53 -07:00
unclejack
840ed5ace2
Merge pull request #6939 from snitm/thinp-blocksize-fix
...
devmapper: revert the default dm-thin-pool blocksize back to 64K
2014-07-10 19:57:07 +03:00
unclejack
0c67dcb0df
Merge pull request #6920 from vieux/pr_6408
...
Add support for IPv6 addresses in --dns parameters.
2014-07-10 19:16:23 +03:00
Tibor Vass
85761b7fdb
Merge pull request #6941 from tiborvass/use-copy-in-docker-dockerfile
...
Replace ADD with COPY in Dockerfile
2014-07-10 10:46:13 -04:00
Sven Dowideit
d9265007a0
Merge pull request #6854 from tomfotherby/patch-1
...
Add documention on how to Mount a Host File as a Data Volume
2014-07-10 10:29:15 +00:00
Sven Dowideit
98e099e3a0
Merge pull request #6945 from fredlf/copyedit-builds
...
New screenshots and revisions to builds.md
2014-07-10 09:06:58 +00:00
Sven Dowideit
1c50f3797c
Merge pull request #6948 from squarejaw/master
...
Fix typos
2014-07-10 09:05:48 +00:00
Tianon Gravi
439d7ea701
Merge pull request #6922 from tianon/bash-complete-build-directories
...
Update bash completion to only complete on directories as the argument to "docker build"
2014-07-10 00:26:14 -06:00
Bryan Bess
1df4049e17
Fix typos
...
Docker-DCO-1.1-Signed-off-by: Bryan Bess <squarejaw@bsbess.com > (github: squarejaw)
2014-07-09 23:14:06 -05:00
Adrien Folie
680e27d6ec
bump api to 1.14 & update docs
...
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com > (github: folieadrien)
2014-07-10 03:24:01 +02:00
Fred Lifton
9319b7aef1
Merge pull request #6942 from jamtur01/addcopy
...
Replaced selected docs references to ADD with COPY
2014-07-09 17:48:31 -07:00
Zoltan Tombol
e72f8161b9
Fix expect script in mkimage-arch
...
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com > (github: ztombol)
2014-07-10 02:09:50 +02:00
Zoltan Tombol
de5f3020d9
Revert "removed expect from mkimage-arch since it was not working"
...
This reverts commit 962e1186f9zoltan.tombol@gmail.com > (github: ztombol)
2014-07-10 01:58:15 +02:00
Fred Lifton
ce9d48e896
New screenshots and revisions to builds.md
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-07-09 16:43:39 -07:00
Victor Vieux
b68111713d
update for consistency
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-09 21:48:02 +00:00
Victor Vieux
0abdea9094
add check on docker run
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-09 21:48:02 +00:00
Jan Pazdziora
899e9e7416
Add support for IPv6 addresses in --dns parameters.
...
Docker-DCO-1.1-Signed-off-by: Jan Pazdziora <jpazdziora@redhat.com > (github: adelton)
2014-07-09 21:48:02 +00:00
Victor Vieux
519319b989
Merge pull request #6931 from tiborvass/merge-5723
...
Updated docker logs timestamp to RFC3339 (carrying #5723 )
2014-07-09 14:23:23 -07:00
James Turnbull
a1ddf57216
Replaced selected docs references to ADD with COPY
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-07-09 17:13:26 -04:00
Tibor Vass
457166295c
Replace ADD with COPY in Dockerfile
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-07-09 17:05:51 -04:00
Mike Snitzer
d715803d45
devmapper: revert the default dm-thin-pool blocksize back to 64K
...
Commit 09ee269dsnitzer@redhat.com > (github: snitm)
2014-07-09 16:47:30 -04:00
Victor Vieux
31f0cc04ec
Merge pull request #6936 from vieux/merge_release_v1.1.1
...
Merge release v1.1.1
2014-07-09 13:31:11 -07:00
Victor Vieux
b95fbe2d3f
Change version to 1.1.1-dev
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-09 19:24:11 +00:00
Victor Vieux
3afb89da48
Merge remote-tracking branch 'origin/release'
...
Conflicts:
VERSION
integration-cli/docker_cli_build_test.go
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-09 19:23:53 +00:00
Victor Vieux
ecd20a96df
Merge pull request #6915 from vieux/bump_v1.1.1
...
Bump v1.1.1
2014-07-09 12:16:22 -07:00
James Turnbull
aa0eca03e6
Updated docker logs timestamp to RFC3339
...
Currently the docker logs timestamp flag generates log entries like:
$ sudo docker logs -ft daemon_dave
[May 10 13:06:17.934] hello world
It uses Go's StampMilli timestamp to generate the timestamp. The entry
is also wrapped in [ ].
This is non-standard operational timestamp and one that will require
custom parsing.
The new timestamp is RFC3999Nano and generates entries like:
2014-05-10T17:42:14.999999999Z07:00 hello world
These are readily parsed by tools like ELK.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-07-09 11:59:06 -04:00
Tibor Vass
aec8d90462
Merge pull request #6926 from LK4D4/log_for_tar_test
...
Simple additions to TestBuildAddTar
2014-07-09 11:40:55 -04:00
Tianon Gravi
65a5dde38b
Merge pull request #6916 from vieux/update_release_checklist_hotfix
...
Add hotfix help to the release checklist
2014-07-09 07:50:38 -06:00
Alexandr Morozov
fc2631b499
Simple additions to TestBuildAddTar
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-07-09 13:41:57 +04:00
Solomon Hykes
2d34a08c48
Merge pull request #6570 from cpuguy83/add_cpuguy83_as_volumes_maintainer
...
Add cpuguy83 as volumes maintainer
2014-07-09 02:12:14 -07:00
Victor Vieux
463435827b
Merge pull request #9 from tianon/vieux-hotfix-minor-nits
...
Update RELEASE-CHECKLIST with a few minor nits (periods, whitespace)
2014-07-09 00:57:03 -07:00
Tom Fotherby
e479cae7cf
Tiny text reformat (as per review comments)
...
Docker-DCO-1.1-Signed-off-by: Tom Fotherby <github@tomfotherby.com > (github: tomfotherby)
2014-07-09 08:21:31 +01:00
Zac Dover
a52441b114
removing an extraneous space
...
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com > (github: zdover23)
2014-07-09 14:54:49 +10:00
Tianon Gravi
9176911736
Update bash completion to only complete on directories as the argument to "docker build"
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-08 20:26:23 -06:00
Tianon Gravi
e1166861d2
Update RELEASE-CHECKLIST with a few minor nits (periods, whitespace)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-08 19:53:08 -06:00
Sven Dowideit
903c2af04e
Merge pull request #6891 from rogaha/update_footer_version
...
Update the footer version with Enterprise and Partners sections
2014-07-09 01:51:22 +00:00
Victor Vieux
dc62f3cdcc
Bump version to v1.1.1
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-09 00:59:54 +00:00
Michael Crosby
f91a97256b
Merge pull request #6773 from fabiofalci/restart_tests_to_cli
...
Move `docker restart` tests to integration cli
2014-07-08 17:44:29 -07:00
James Turnbull
037a869919
Merge pull request #6835 from OddBloke/master
...
Explain ADD invalidation more accurately
2014-07-08 20:41:59 -04:00
Fred Lifton
4898267988
Merge pull request #6567 from JasonGiedymin/add-h3
...
Add H3 menu entries for leftnav
2014-07-08 17:38:10 -07:00
Michael Crosby
ca9d57245c
Merge pull request #6921 from jamtur01/parsego
...
Fixed some more styling issues with command line flags
2014-07-08 17:34:09 -07:00
James Turnbull
2c9d055253
Merge pull request #6826 from fredlf/copyedit-builds
...
Copyedit builds
2014-07-08 20:31:04 -04:00
James Turnbull
2112c5e948
Fixed some more styling issues with command line flags
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-07-08 20:23:12 -04:00
Victor Vieux
bdf7224941
Merge pull request #6918 from vieux/rebase_events_leak
...
Rebase events leak
2014-07-08 17:18:09 -07:00
Michael Crosby
a613ac1907
Merge pull request #6270 from kung-foo/5418-underscore
...
Replace dashes in link name with underscores
2014-07-08 17:09:27 -07:00
Sam Rijs
560eb07009
avoid regression in events test
...
Docker-DCO-1.1-Signed-off-by: Samuel Reis <srijs@airpost.net > (github: srijs)
2014-07-09 00:09:03 +00:00
Sam Reis
46747963b6
Add test for event limitation
...
Docker-DCO-1.1-Signed-off-by: Samuel Reis <srijs@airpost.net > (github: srijs)
2014-07-09 00:09:03 +00:00
Sam Reis
5d4986c755
Fix server leaking events
...
Solves #6843 .
Docker-DCO-1.1-Signed-off-by: Samuel Reis <srijs@airpost.net > (github: srijs)
2014-07-09 00:08:36 +00:00
Fred Lifton
27c34f3eb9
Initial copy edits to builds.md
...
Revised to match new UI, fixed links, copy edits and improvements.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
More revisions to builds.md
Corrections to automated build process, copy edits.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Edits based on Sonat's feedback
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-07-08 17:01:41 -07:00
Michael Crosby
f021cd64ed
Merge pull request #6636 from saaadhu/master
...
Fix typo in README.md
2014-07-08 16:35:26 -07:00
Victor Vieux
751c7e0f00
add hotfix help
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-08 23:25:26 +00:00
Michael Crosby
f0aba1aad4
Merge pull request #6882 from cpuguy83/fix_gh#6856_add_pass_unpause_events
...
Add event logs for pause/unpause
2014-07-08 15:31:23 -07:00
Tibor Vass
699556e661
Tests for ADD tar
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Conflicts:
integration-cli/docker_cli_build_test.go
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: vieux)
2014-07-08 21:32:18 +00:00
Michael Crosby
94c27842d8
Revert "improve untar when using files instead of directories. Specifies behavior on non-existant targets."
...
This reverts commit 1c8d3106dfmichael@docker.com > (github: crosbymichael)
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: vieux)
2014-07-08 21:31:11 +00:00
Michael Crosby
44456ba065
Revert "allow overwrite in untar"
...
This reverts commit 5a3d774e56michael@docker.com > (github: crosbymichael)
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: vieux)
2014-07-08 21:30:52 +00:00
unclejack
50c33ee877
Merge pull request #6911 from crosbymichael/revert-archive
...
Revert archive changes around creating
2014-07-09 00:08:25 +03:00
Michael Crosby
f2a5b1fc37
Merge pull request #26 from tiborvass/fix-add-tar-test
...
Tests for ADD tar
2014-07-08 12:41:48 -07:00
Tibor Vass
cfa4999d69
Tests for ADD tar
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-07-08 15:34:04 -04:00
Brian Goff
e1ec91fc58
Add event logs for pause/unpuase
...
Fixes #6856
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-07-08 15:27:44 -04:00
Michael Crosby
4b1a464ac1
Revert "improve untar when using files instead of directories. Specifies behavior on non-existant targets."
...
This reverts commit 1c8d3106dfmichael@docker.com > (github: crosbymichael)
2014-07-08 12:26:59 -07:00
Michael Crosby
10d066c9cb
Revert "allow overwrite in untar"
...
This reverts commit 5a3d774e56michael@docker.com > (github: crosbymichael)
2014-07-08 12:23:08 -07:00
James Turnbull
446ceee51e
Merge pull request #6865 from SvenDowideit/remove-the-named-container-before-creating-a-new-one
...
Don't make the user get a container already exists error
2014-07-08 14:42:17 -04:00
Tianon Gravi
f014236791
Merge pull request #6897 from tianon/moar-squeeze-lts
...
Update contrib/mkimage/debootstrap to add "sqeeze-lts" to "oldstable" as well
2014-07-08 07:57:53 -06:00
James Turnbull
0327b0f4af
Merge pull request #6899 from sjp38/patch-1
...
understanding-docker: Use consistent term
2014-07-08 08:41:20 -04:00
Tom Fotherby
a247b63aa1
Typo fix
...
Docker-DCO-1.1-Signed-off-by: Tom Fotherby <github@tomfotherby.com > (github: tomfotherby)
2014-07-08 10:01:26 +01:00
SeongJae Park
14ffde2d8c
understanding-docker: Use consistent term
...
Term 'service' was used together with 'daemon'. It would be better to use the term 'daemon' solely because most part of documentation are using the term.
2014-07-08 14:50:57 +09:00
Solomon Hykes
55915b8e00
Merge pull request #6760 from jamtur01/contrib
...
Minor updates and fixes to the CONTRIBUTING doc
2014-07-07 18:42:29 -07:00
SvenDowideit
6a9c6d3bf1
Don't make the user get a container alreayd exists error
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-07-08 11:09:55 +10:00
Michael Crosby
42a28f79dc
Merge pull request #6849 from leeplay/patch-1
...
Update README.md
2014-07-07 16:43:57 -07:00
Sven Dowideit
fbafa8038d
Merge pull request #6858 from timthelion/patch-6
...
We haven't required lxc and aufs for years now...
2014-07-08 09:37:53 +10:00
Sven Dowideit
0284e5dfea
Merge pull request #6871 from prosto-chewey/patch-1
...
Update running_riak_service.md
2014-07-08 09:35:01 +10:00
Sven Dowideit
d20367c216
Merge pull request #6870 from andreaturli/doc/jclouds-client
...
add jclouds-docker client reference
2014-07-08 09:29:27 +10:00
Tianon Gravi
a6f1995550
Update contrib/mkimage/debootstrap to add "sqeeze-lts" to "oldstable" as well
...
Note that the archive does _not_ have a symlink from oldstable-lts to squeeze-lts, hence the change from using "${suite}" to not using it in here and just using the string "squeeze-lts" directly regardless of whether we're building a "squeeze" image or an "oldstable" image.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-07 17:14:31 -06:00
Victor Vieux
714b63d1be
Add repo/tag parsing on the daemon for pull and import
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-07 23:09:42 +00:00
Roberto Gandolfo Hashioka
fd66e77465
Update the footer version with Enterprise and Partners sections
...
Docker-DCO-1.1-Signed-off-by: Roberto Hashioka <roberto.hashioka@docker.com > (github: rogaha)
2014-07-07 16:02:15 -07:00
Tianon Gravi
77ed01c8da
Merge pull request #6886 from tianon/no-binddir-if-docker_host
...
Update Makefile to default BINDDIR to nothing if DOCKER_HOST is set
2014-07-07 17:00:03 -06:00
Victor Vieux
170609e369
Merge pull request #6720 from fabiofalci/relax_dns_search
...
Relax dns search to accept empty domain
2014-07-07 15:12:29 -07:00
Tibor Vass
52c58b9ea0
Merge pull request #6857 from vbatts/vbatts-fix_save_repositories
...
docker save: fix the 'repositories' file
2014-07-07 17:26:52 -04:00
Michael Crosby
f34510b123
Merge pull request #6813 from gsalgado/convert-testgetimagesjson
...
Convert TestGetImagesJSON into several unit tests
2014-07-07 13:40:38 -07:00
unclejack
e7db0d4f44
Merge pull request #6829 from unclejack/update_archive_tar
...
update vendored archive/tar to lower the number of memory allocations
2014-07-07 23:35:19 +03:00
Guilherme Salgado
627805f5f8
Convert TestGetImagesJSON into several unit tests
...
Docker-DCO-1.1-Signed-off-by: Guilherme Salgado <gsalgado@gmail.com > (github: gsalgado)
2014-07-07 21:55:26 +02:00
Timothy Hobbs
ea583fda97
We haven't required lxc and aufs for years now...
...
Well, maybe not years, but internet years...
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: timthelion)
2014-07-07 19:45:36 +00:00
Michael Crosby
3993f9d581
Merge pull request #6799 from LK4D4/refactor_portallocator
...
Refactoring portallocator
2014-07-07 12:39:36 -07:00
Michael Crosby
bade039bda
Merge pull request #6821 from LK4D4/broadcast_writer_refactor
...
Broadcast writer refactor
2014-07-07 12:15:47 -07:00
Vincent Batts
600f65b247
docker save: more integration tests
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-07-07 14:58:27 -04:00
Victor Vieux
578513095c
Merge pull request #6850 from leeplay/patch-2
...
Update README.md
2014-07-07 11:50:27 -07:00
Michael Crosby
35b511b6d0
Merge pull request #6702 from mrunalp/dev/helper_fns
...
Move setting hostConfig and pulling images into helper functions.
2014-07-07 11:39:27 -07:00
Michael Crosby
219a3345de
Merge pull request #6452 from mheon/selinux_btrfs_fix
...
Error if Docker daemon starts with BTRFS graph driver and SELinux enabled
2014-07-07 11:34:50 -07:00
unclejack
2e4f99d99c
Merge pull request #6645 from snitm/dmthinp-devel
...
Dmthinp devel
2014-07-07 21:20:31 +03:00
Victor Vieux
880c98d2d3
Merge pull request #6859 from LK4D4/move_buildfile_tests_to_cli
...
Moved last build tests to integration-cli
2014-07-07 10:53:26 -07:00
Michael Crosby
860c664ccb
Merge pull request #6508 from mheon/signals
...
Increase size of buffer for signal forwarding with --sig-proxy
2014-07-07 10:45:31 -07:00
Michael Crosby
bcec0f30e8
Merge pull request #6371 from jpetazzo/6370-masquerade
...
Select masquerade by outgoing interface rather than by destination subne...
2014-07-07 10:28:31 -07:00
Victor Vieux
dd89904ad3
Merge pull request #6847 from SvenDowideit/add-os-and-arch-to-docker-version
...
add client OS and arch to docker version
2014-07-07 10:15:30 -07:00
Victor Vieux
4a20c9b005
Merge pull request #6823 from folieadrien/move_integration_tests
...
Convert TestGetImagesByName into unit and integration-cli test
2014-07-07 10:13:19 -07:00
Tianon Gravi
c2653b0a9e
Update Makefile to default BINDDIR to nothing if DOCKER_HOST is set
...
If "DOCKER_HOST" is set, we can usually assume the user is connecting to a remote Docker and thus not bind mount anything by default (meaning the Makefile will more often DWIM for our users).
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-07 10:54:03 -06:00
Tianon Gravi
9f61e233c6
Standardize "curl" arguments across the repo to be or include "-sSL"
...
- https://botbot.me/freenode/docker-dev/msg/17315692/
- https://botbot.me/freenode/docker-dev/msg/17315994/
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-07 10:35:38 -06:00
Tianon Gravi
de07654c60
Merge pull request #6884 from tianon/use-docker-based-travis
...
Update Travis to use pretty Docker-based workers
2014-07-07 10:09:31 -06:00
Tianon Gravi
3e2ad6ffee
Update Travis to use pretty Docker-based workers
...
These start up much faster and the only caveat is that we can't use "sudo" (which we don't currently use anyhow).
Also, I've updated the Go version here to match what's in the Dockerfile.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-07 10:04:23 -06:00
Tianon Gravi
09927fdbae
Merge pull request #6883 from tianon/fix-dco-parsing-for-numeric
...
Fix DCO parsing for numeric github handles like cpuguy83
2014-07-07 10:02:02 -06:00
Tianon Gravi
bbbf642427
Fix DCO parsing for numeric github handles like cpuguy83
...
Turns out, "alphanumeric" actually means both "alpha" AND "numeric". Dur.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-07 09:57:50 -06:00
unclejack
e2c575c5a6
Merge pull request #6756 from kzys/lxc-linux
...
Skip lxc_template_unit_test.go on non-Linux platforms
2014-07-07 18:46:46 +03:00
Tianon Gravi
cafb1bfd76
Merge pull request #6878 from tianon/update-travis-github-username-regex
...
Update the Travis GitHub username regex to match the GitHub username requirements
2014-07-07 09:26:32 -06:00
unclejack
2ffd13bc31
Merge pull request #6573 from mheon/ps_cleanup
...
Escape control and nonprintable characters in docker ps
2014-07-07 18:23:18 +03:00
Tianon Gravi
07be572f8e
Merge pull request #6873 from tianon/6836-fix-systemd-socket-perms
...
Fix the systemd socket activation socket permissions
2014-07-07 08:56:04 -06:00
Tianon Gravi
e895817ad7
Update the Travis GitHub username regex to match the GitHub username requirements
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-07 08:36:31 -06:00
Tianon Gravi
3589f5b9c2
Fix the systemd socket activation socket permissions
...
Fixes #6836
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-07 08:09:25 -06:00
Chewey
963ee6ce79
Update running_riak_service.md
2014-07-07 17:52:18 +04:00
Andrea Turli
2f13d3a8e5
add jclouds-docker client reference
...
Docker-DCO-1.1-Signed-off-by: Andrea Turli <andrea.turli@gmail.com > (github: andreaturli)
Docker-DCO-1.1-Signed-off-by: Andrea Turli <andrea.turli@gmail.com > (github: )
2014-07-07 15:14:41 +02:00
Tom Fotherby
ebbfdf0a0f
Reformat to keep line length within 80 characters
...
Docker-DCO-1.1-Signed-off-by: Tom Fotherby <github@tomfotherby.com > (github: tomfotherby)
2014-07-07 12:01:04 +01:00
Sven Dowideit
323e6a3cf2
Merge pull request #6840 from gesellix/patch-1
...
docs: add Groovy Docker-Client link
2014-07-07 11:16:55 +10:00
Sven Dowideit
cf01997ebe
Merge pull request #6846 from irbull/master
...
Fix the parent/child relationship in the docs
2014-07-07 10:27:27 +10:00
Sven Dowideit
2f649301e5
Merge pull request #6860 from felixrabe/patch-7
...
run.md: Fix references to cli
2014-07-07 09:37:42 +10:00
Felix Rabe
95870ef334
run.md: Fix references to cli
...
There are now no other occurrences of `#cli-` in this document.
TODO: Find other places with wrong links.
2014-07-06 14:47:37 +02:00
LK4D4
1d4862b7a2
Moved last build tests to integration-cli
...
Also removed skipped tests on "viz" and "tree" because they
blocked integration/buildfile_test.go removing.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-07-06 15:36:34 +04:00
Ian Bull
29a20672c2
Fix the parent/child relationship in the docs
...
In the Docker Linking Docs, the parent child relationship
was backwards. The Web container should be able to access
the DB, not other way around. Furthermore, the output of
'docker ps' was wrong (it showed that the DB could access
the Web). This fixes both typos.
Docker-DCO-1.1-Signed-off-by: Ian Bull <irbull@gmail.com > (github: irbull)
2014-07-05 13:58:09 -07:00
Vincent Batts
ac392bc0d7
docker save: fix the 'repositories' file
...
For various use cases, the 'repositories' file does not match expected
behavior.
Like,
docker save busybox:latest | tar t
Before:
[...]
busybox:latest/
busybox:latest/VERSION
busybox:latest/json
busybox:latest/layer.tar
# note, the layer name, and lack of 'repositories' file
Now:
[...]
a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/
a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/VERSION
a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/json
a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/layer.tar
repositories
# and the repositories file is correct for the single tagged
# image.
#> {"busybox":{"latest":"a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721"}}
and
docker save a9eb17255234 | tar t
Before:
[...]
a9eb17255234/
a9eb17255234/VERSION
a9eb17255234/json
a9eb17255234/layer.tar
# Note the truncated layer name
Now:
[...]
a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/
a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/VERSION
a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/json
a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/layer.tar
# There is no 'repositories' file, because there is no named repo
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-07-05 16:52:23 -04:00
Tom Fotherby
87df57810d
Update File mount info for docker v1.1.0
...
Docker-DCO-1.1-Signed-off-by: Tom Fotherby <github@tomfotherby.com > (github: tomfotherby)
2014-07-05 03:46:41 +01:00
Tom Fotherby
cfbe062eb2
Add info to Mount a Host File as a Data Volume
...
Docker-DCO-1.1-Signed-off-by: Tom Fotherby <github@tomfotherby.com > (github: tomfotherby)
2014-07-04 18:52:10 +01:00
OddBloke
20a77aeeb8
Explain ADD invalidation more accurately
...
And also move it in to the `ADD` section, rather than being hidden in the `RUN` section.
Docker-DCO-1.1-Signed-off-by: Daniel Watkins <daniel@daniel-watkins.co.uk > (github: OddBloke)
2014-07-04 16:40:23 +01:00
Tianon Gravi
02ef9437d3
Merge pull request #6852 from Odaeus/patch-1
...
Fix "Error while reading file" in Fish completion
2014-07-04 08:11:12 -06:00
Andrew France
6ad5fe8659
Fix "Error while reading file" Fish completion
...
An unbalanced single quote caused Fish to fail to load the completion file with `source: Error while reading file “/etc/fish/completions/docker.fish”`.
Docker-DCO-1.1-Signed-off-by: Andrew France <andrew@avito.co.uk > (github: Odaeus)
2014-07-04 15:07:49 +01:00
Sven Dowideit
eceacb8334
add client OS and arch to docker version
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-07-04 21:23:36 +10:00
hyeongkyu.lee
649b50c0b7
Update README.md
...
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com > (github: leeplay)
2014-07-04 18:21:13 +09:00
hyeongkyu.lee
3f5ab612c8
Update README.md
...
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com > (github: leeplay)
2014-07-04 17:59:26 +09:00
Fabio Falci
804b00cd7d
Relax dns search to accept empty domain
...
In that case /etc/resolv.conf will be generated with no search
option. Usage: --dns-search=.
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: fabiofalci)
2014-07-04 09:33:53 +01:00
Victor Vieux
44d737707c
Merge pull request #6771 from LK4D4/fix_containers_list_race
...
Add synchronization in server.Containers
2014-07-03 17:53:50 -07:00
Tibor Vass
0cdda85df2
Merge pull request #6801 from cpuguy83/remove_dup_run_tests
...
Remove dup tests
2014-07-03 18:30:58 -04:00
Brian Goff
0a3abe33f0
Remove dup tests
...
integration/server_test.go/TestCreateNumberUsername == integration-cli/docker_cli_run_test.go/TestUserByID
integration/server_test.go/TestRmi == integration-cli/docker_cli_images_test.go/TestCLIImageTagRemove
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-07-03 17:35:03 -04:00
Fred Lifton
8f97a1778e
Merge pull request #6842 from mrorii/patch-1
...
doc fix: remove trailing *
2014-07-03 14:30:41 -07:00
Naoki Orii
6e4b37fffd
doc fix: remove trailing *
...
The trailing `*` makes it seem like there is some kind of annotation
2014-07-03 14:02:40 -07:00
Tobias Gesellchen
5c246c931e
docs: add Groovy Docker-Client link
...
Docker-DCO-1.1-Signed-off-by: Tobias Gesellchen <tobias@gesellix.de > (github: gesellix)
2014-07-03 22:24:24 +02:00
Victor Vieux
700880ca16
Merge pull request #6838 from vieux/merge_release_v1.1.0
...
Merge release v1.1.0
2014-07-03 11:04:26 -07:00
Victor Vieux
d55cafb72e
Change version to 1.1.0-dev
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-03 18:01:36 +00:00
Victor Vieux
b3191bf042
Merge remote-tracking branch 'origin/release'
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-03 18:01:13 +00:00
Victor Vieux
4c52272a2d
Merge pull request #6818 from vieux/bump_v1.1.0
...
Bump v1.1.0
2014-07-03 10:57:44 -07:00
Matthew Heon
4318802f64
Error if Docker daemon starts with BTRFS graph driver and SELinux enabled
...
The Docker btrfs graph driver does not interact well with SELinux at present.
If btrfs mounts the same file in several locations, the same SELinux label will
be applied to all mountpoints. In the context of the graph driver, things such
as shared libraries become inaccessible to containers due to SELInux, causing
all dynamically linked applications to fail when run in a container.
Consequently, error when we detect the daemon is being run with SELinux enabled
and the btrfs driver. Documentation has been added for this behavior.
Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com > (github: mheon)
2014-07-03 08:11:18 -04:00
James Turnbull
e11a714f7a
Merge pull request #6827 from SvenDowideit/docker-com-theme-regressions
...
Fix 2 docker.com theme regressions on docs.docker.com
2014-07-03 07:30:18 -04:00
LK4D4
7bdd23bfee
BroadcastWriter refactoring
...
It became slightly faster and lighter
possibly fixes #5923 problems
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-07-03 10:12:53 +04:00
LK4D4
a8d95b7c57
Benchmark for BroadcastWriter
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-07-03 10:06:58 +04:00
unclejack
b885f61a61
update vendored archive/tar to lower allocations
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-07-03 08:28:39 +03:00
Sven Dowideit
873241790f
Fix 2 docker.com theme regressions on docs.docker.com
...
- Hover colours of doc nav wrong
- Primary Docs Nav not active when user is Logged in.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-07-02 21:19:48 -07:00
James Turnbull
d013b76e10
Minor updates and fixes to the CONTRIBUTING doc
...
* Fixed some uses of docker v. Docker
* Formatting and line wrapping.
* Spelling errors and grammar fixes.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-07-02 22:52:56 -04:00
Victor Vieux
79812e3646
Bump version to v1.1.0
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-03 01:15:11 +00:00
Sven Dowideit
6eda9f3207
Merge pull request #6825 from SvenDowideit/fix-man-page-merge-mess
...
missed these merge conflicts when manually rebasing too many files
2014-07-03 11:12:13 +10:00
SvenDowideit
f8d9ecfb2c
missed these merge conflicts when manually rebasing too many files
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-07-03 11:07:42 +10:00
Sven Dowideit
9fe95f1c5b
Merge pull request #6824 from fredlf/1-1_release_notes
...
Added Release Notes
2014-07-03 10:45:11 +10:00
Fred Lifton
c3f4972f6d
Corrected version number to 3 digits.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-07-02 17:41:52 -07:00
Sven Dowideit
65e4b57fda
Merge pull request #6819 from vieux/update_release_checklist_and_gitcommit
...
update release checklist and .gitignore
2014-07-03 10:36:52 +10:00
Fred Lifton
f746a48fe6
Merge pull request #6807 from SvenDowideit/convert-more-docker.io-to-docker.com
...
some docker.io -. docker.com conversions
2014-07-02 17:34:31 -07:00
SvenDowideit
fa29b1f062
I'm going to wish I didn't do this
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-07-03 10:31:56 +10:00
Fred Lifton
2c32c195d9
Merge pull request #6790 from SvenDowideit/pr_out_update_cli_md
...
update cli.md
2014-07-02 17:24:53 -07:00
SvenDowideit
b07f193822
Update cli.md and man pages to match current cli
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-07-03 10:22:20 +10:00
James Turnbull
b59754bcb3
Fixed numerous inconsistencies in command help text
...
* Replaced docker with Docker.
* Consistently used STDIN, STDOUT, STDERR.
* Consistently used TTY.
* Fixed some grammar and spelling issues.
* Fixed references to the index.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: SvenDowideit)
2014-07-03 10:22:09 +10:00
Adrien Folie
f337a52a6e
Move TestGetImagesByName
...
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com > (github: folieadrien)
2014-07-03 01:39:08 +02:00
Fred Lifton
d946cae364
Added Release Notes
...
Release notes for v.1.1 have been added to the docs index.md page. Made some revisions to
other content to make it shorter.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-07-02 16:33:13 -07:00
Fabio Falci
9da6c80533
Move docker restart tests to integration cli
...
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: fabiofalci)
2014-07-02 21:56:19 +01:00
Mrunal Patel
2b3959c414
api.DockerCli: Extract pullImage into separate function
...
This lets us reuse this code later.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-07-02 16:33:14 -04:00
Alexander Larsson
a4a80b64a7
server: Break out setHostConfig() from ContainerStart
...
This will be reused for ContainerCreate
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-07-02 16:32:28 -04:00
LK4D4
9d4e802221
Move WriteBroadcaster to separate package as BroadcastWriter
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-07-02 23:31:06 +04:00
Victor Vieux
170ba7f8fe
update release checklist and .gitignore
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-02 18:54:14 +00:00
Victor Vieux
8ea3589287
Merge pull request #6808 from vieux/pr_6806
...
Add backwards READ compatibility for the old libcontainer API
2014-07-02 10:51:27 -07:00
Tibor Vass
f357b18ee3
Merge pull request #6780 from unclejack/tweak_cli_integration_tests
...
Tweak cli integration tests
2014-07-02 13:16:26 -04:00
unclejack
deb57c5144
Merge pull request #6763 from folieadrien/master
...
Migrate TestGetImagesHistory into unit and CLI test
2014-07-02 19:44:21 +03:00
Tianon Gravi
292483531f
Merge pull request #6814 from tianon/more-init-ulimit
...
Add NOFILE and NPROC ulimit settings to OpenRC and SysVinit
2014-07-02 10:08:11 -06:00
unclejack
dad4768037
integcli: add & use pullImageIfNotExist for pulls
...
This speeds up the tag cli integration tests by about 20 seconds.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-07-02 18:45:11 +03:00
Tianon Gravi
bae79c3e72
Add NOFILE and NPROC ulimit settings to the SysV init script
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-02 09:38:19 -06:00
Tianon Gravi
7abe70c0b1
Add NOFILE and NPROC ulimit settings to the OpenRC init script
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-02 09:36:57 -06:00
Victor Vieux
d403936818
fix compilation and panic
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-02 00:54:08 +00:00
Tibor Vass
cccb64e863
Add backwards READ compatibility for the old libcontainer API
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-07-02 00:19:05 +00:00
Fred Lifton
5ff18b8155
Merge pull request #6789 from SvenDowideit/pr_out_expand_to_used_b2d_vm_on_any_of_the_platforms
...
expand to 'used b2d vm on any of the platforms'
2014-07-01 16:09:38 -07:00
Tibor Vass
b0824edc7c
Merge pull request #6748 from LK4D4/increase_max_patricia_prefix
...
Increase max patricia prefix
2014-07-01 19:03:30 -04:00
Fred Lifton
96e2bfe28a
Merge pull request #6781 from anweiss/6738-dscarticle
...
Add Article for PowerShell DSC
2014-07-01 15:48:19 -07:00
James Turnbull
a52d90a100
Merge pull request #6788 from SvenDowideit/remote-bang-from-hello-world
...
removing the exclaimation mark from our hello-world examples, some users...
2014-07-01 18:10:17 -04:00
Sven Dowideit
a09f99b8b0
Lowercase world, because its not important.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-07-01 15:07:48 -07:00
SvenDowideit
3091d9a31e
removing the exclaimation mark from our hello-world examples, some users get trapped by the shell
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-07-01 15:07:48 -07:00
Sven Dowideit
91c4fbb7bf
convert OSX into OS X
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-07-01 15:00:34 -07:00
SvenDowideit
84990731f7
expand to 'used b2d vm on any of the platforms'
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-07-01 15:00:34 -07:00
Tom Maaswinkel
fc4c0d9de4
Update usingdocker.md
...
boot2docker on windows also uses an IP of its own.
Docker-DCO-1.1-Signed-off-by: Tom Maaswinkel <tom.maaswinkel@12wiki.eu > (github: SvenDowideit)
2014-07-01 15:00:34 -07:00
Victor Vieux
49d49ac98f
Merge pull request #6803 from vieux/pr_6176
...
Implement tail for docker logs
2014-07-01 14:59:37 -07:00
Victor Vieux
e06d533cc2
update docs
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-01 21:59:08 +00:00
Andrew Weiss
5c344dca4b
add DSC article
...
Docker-DCO-1.1-Signed-off-by: Andrew Weiss <andrew.weiss@outlook.com > (github: anweiss)
2014-07-01 17:32:55 -04:00
Tibor Vass
1822bf730e
Merge pull request #6798 from tiborvass/docs-dockerignore
...
More docs for dockerignore
2014-07-01 17:23:00 -04:00
Alexandr Morozov
1dc0caf9c0
Implement tail for docker logs
...
Fixes #4330
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-07-01 23:44:12 +04:00
Tibor Vass
c21c55e0b6
more docs for dockerignore
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-07-01 15:11:18 -04:00
LK4D4
f387cc1205
Refactoring portallocator
...
Faster, more documented, less code.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-07-01 21:59:11 +04:00
Victor Vieux
cdc62c778f
Merge pull request #6787 from vieux/pause_commit2
...
Pause/freeze containers during commit
2014-07-01 10:11:18 -07:00
Victor Vieux
957c510d72
updated docs & tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-01 17:10:00 +00:00
unclejack
c41c00cab4
Merge pull request #6785 from tiborvass/use_new_libcontainer_state_api
...
Use new libcontainer.State API
2014-07-01 19:44:07 +03:00
James Turnbull
6ac20416c8
Merge pull request #6796 from jpetazzo/bundled-vs-packaged
...
Add FAQ entry about bundled vs packaged libraries
2014-07-01 11:11:48 -04:00
Jérôme Petazzoni
ae1ff4dea3
Add FAQ entry about bundled vs packaged libraries
...
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com > (github: jpetazzo)
2014-07-01 07:47:59 -07:00
Solomon Hykes
bc33ce0d8f
Merge pull request #6366 from proppy/add-proppy-server
...
api/MAINTAINERS: add proppy for server/
2014-06-30 17:44:02 -07:00
Eric Windisch
17d870bed5
Pause/freeze containers during commit
...
Initiates a pause before committing a container,
adds a pause option to the commit command, defaulting to 'true'.
Fixes bug: #6267
Fixes bug: #3675
Docker-DCO-1.1-Signed-off-by: Eric Windisch <ewindisch@docker.com > (github: ewindisch)
2014-07-01 00:30:21 +00:00
Sven Dowideit
3f18afc94c
Merge pull request #6764 from SvenDowideit/pr_out_blindly_make_all_uses_of_e_g_into_e_g_
...
blindly make all uses of e\.?g\.? into e.g.,
2014-07-01 09:57:39 +10:00
SvenDowideit
fde10cf87b
blindly make all uses of e\.?g\.? into e.g.,
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-07-01 09:55:19 +10:00
Christian Berendt
b44e13ae02
Fixed typographical erros in the documentation
...
Used the RETF rules provided by Wikipedia to fix some typographical
errors in the Markdown files of the documentation with the following
script:
https://github.com/openstack/openstack-doc-tools/tree/master/cleanup/retf
Docker-DCO-1.1-Signed-off-by: Christian Berendt <berendt@b1-systems.de > (github: berendt)
Docker-DCO-1.1-Signed-off-by: Christian Berendt <berendt@b1-systems.de > (github: SvenDowideit)
2014-07-01 09:54:20 +10:00
Victor Vieux
e6d9c097b2
Merge pull request #6749 from LK4D4/update_gorilla_context
...
Update gorilla/context
2014-06-30 16:52:34 -07:00
Tibor Vass
262d45e0fe
Use new libcontainer.State API
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-06-30 18:27:15 -04:00
Tianon Gravi
ff45a3cbac
Merge pull request #6784 from tianon/NikolaMandic-master
...
Update contrib/mkimage-arch.sh to remove use of "expect" since the output of pacstrap has changed
2014-06-30 16:04:09 -06:00
Tianon Gravi
75b3b382ca
Merge branch 'master' of https://github.com/NikolaMandic/docker into NikolaMandic-master
...
* 'master' of https://github.com/NikolaMandic/docker :
removed expect from mkimage-arch since it was not working
Conflicts:
contrib/mkimage-arch.sh
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-06-30 15:52:04 -06:00
unclejack
63e28cc363
make TestRemoveContainerRunning handle signals
...
This lowers the test execution time by about 5 seconds.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-06-30 22:25:50 +03:00
unclejack
eb1e8e884d
integration cli: add imageExists to docker utils
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-06-30 22:22:29 +03:00
Tibor Vass
36c78c9172
Merge pull request #6742 from vieux/remove_deprecate_syntax
...
remove deprecated syntax for docker commit
2014-06-30 10:41:07 -04:00
Tibor Vass
fef1e0a708
Merge pull request #6682 from erikh/6476-persistent_port_allocation
...
fix persistent port allocation
2014-06-30 10:14:17 -04:00
James Turnbull
7128353be5
Merge pull request #6766 from jamtur01/clirun
...
Formatting and consistency fixes to CLI and RUN references
2014-06-30 08:21:57 -04:00
Sven Dowideit
8d1cc68673
Merge pull request #6765 from SvenDowideit/pr_out_use_the_official_image_for_now_there_s_an_opensuse_image_on_its_way
...
use the official image for now - there's an opensuse image on its way
2014-06-30 20:00:12 +10:00
Sven Dowideit
753ff36cc3
Merge pull request #6768 from SvenDowideit/add-1.13-api-to-docs-menu
...
Add the 1.13 API docs to the menu
2014-06-30 19:59:39 +10:00
Adrien Folie
c2699d8d89
Add missing test for full coverage
...
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com > (github: folieadrien)
2014-06-30 09:36:46 +00:00
Alexandr Morozov
da853e98c9
Add synchronization in server.Containers
...
This fixes races between ps and other operations
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-30 10:52:11 +04:00
SvenDowideit
26332fe339
Add the 1.13 API docs to the menu
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-06-30 14:19:16 +10:00
Sven Dowideit
b4df555d27
Merge pull request #6544 from mheon/sigproxy_docs
...
Update --sig-proxy documentation
2014-06-30 13:16:38 +10:00
James Turnbull
8c765ae68a
Formatting and consistency fixes to CLI and RUN references
...
* Removed double backticks.
* Reformatted paragraphs.
* Fixed consistent STDOUT/STDIN/STDERR references.
* Fixed several broken URLs.
* Fixed backtick mismatches.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-06-29 22:25:12 -04:00
SvenDowideit
24bf8faa99
use the official image for now - there's an opensuse image on its way
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-06-30 11:46:09 +10:00
Sven Dowideit
0757a5663a
Merge pull request #6631 from SvenDowideit/add-versioning-to-docs-output
...
Add versioning to docs output
2014-06-30 11:38:04 +10:00
James Turnbull
860d8e9271
Merge pull request #6761 from fgrehm/patch-1
...
Remove extra "Docker" from docs index
2014-06-29 20:14:16 -04:00
Adrien Folie
9a2771eac2
Migrate TestGetImagesHistory into unit and CLI test
...
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com > (github: folieadrien)
2014-06-30 01:31:16 +02:00
Fabio Rehm
3be683a0bb
Remove extra "Docker" from docs index
2014-06-29 19:45:08 -03:00
Kato Kazuyoshi
dda0ce6459
Skip lxc_template_unit_test.go on non-Linux platforms
...
It doesn't work without lxc-start.
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-06-29 17:11:30 +09:00
Sven Dowideit
2075ef029e
Merge pull request #6747 from softprops/master
...
added linkage to tugboat, a scala client library
2014-06-29 16:21:32 +10:00
Tianon Gravi
86f06b6deb
Update bash completion for "docker run --link" and "docker run -v" to complete on running containers and the local filesystem respectively
...
Also, add completion for "docker run -a" ("stdin", "stdout", and "stderr"), "docker run --env-file" (local filesystem), and some other minor code style tweaks.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-06-28 23:17:51 -06:00
doug tangren
5c0819a046
added linkage to tugboat, a scala client
...
Docker-DCO-1.1-Signed-off-by: Doug Tangren <d.tangren@gmail.com > (github: softprops)
2014-06-28 23:21:40 -04:00
Jason Giedymin
e4742dbb94
Add H3 menu entries for leftnav:
...
- Add H3 formatting and entries to leftnav, to docs css.
Docker-DCO-1.1-Signed-off-by: Jason Giedymin <jasong@apache.org > (github: JasonGiedymin)
2014-06-28 23:17:46 -04:00
Sven Dowideit
7362a09cd9
Merge pull request #6752 from mchelen/patch-5
...
fix typo
2014-06-29 08:29:12 +10:00
Sven Dowideit
525d41118e
Merge pull request #6751 from mchelen/patch-3
...
missing `sudo`
2014-06-29 08:28:46 +10:00
Mike Chelen
0d2656ce6e
fix typo
2014-06-28 12:26:36 -04:00
Mike Chelen
4a5f09387e
missing sudo
2014-06-28 12:01:16 -04:00
LK4D4
ea464ea212
Update gorilla/context
...
Race condition was fixed recently
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-28 12:38:29 +04:00
LK4D4
095cb7a818
Increase patricia.MaxPrefixPerNode
...
It allows to avoid redundant prefix splits
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-28 12:27:44 +04:00
LK4D4
2edfb1e696
Update go-patricia to v1.0.1
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-28 12:20:31 +04:00
Sven Dowideit
4a9dc8d73d
Merge pull request #6741 from fredlf/suse-install-fix
...
Changed add to group command to include -a (append) flag, for safety. In...
2014-06-28 10:43:11 +10:00
Victor Vieux
1960da1dd0
Merge pull request #6713 from vieux/order_flag
...
sort flags with the same name in a consistent order
2014-06-27 17:10:55 -07:00
Victor Vieux
a0b2290713
remove deprecated syntax for docker commit
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-27 23:09:41 +00:00
Erik Hollensbe
2cdcfc0c57
portmapper: unit tests for remap problem
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-06-27 15:57:31 -07:00
Fred Lifton
ff20637499
Merge pull request #6680 from mheon/cgroup_memory
...
Update docker-run manpage
2014-06-27 14:39:03 -07:00
Fred Lifton
018f887fe1
Merge pull request #6731 from mchelen/patch-2
...
Update dockerimages.md
2014-06-27 14:37:12 -07:00
Fred Lifton
74a34bb1fe
Merge pull request #6678 from mheon/fix_man_generate
...
Path fixes in md2man script and README
2014-06-27 14:29:36 -07:00
Michael Crosby
e5d3aa2765
Merge pull request #6740 from tiborvass/untar_allow_overwrite
...
Allow overwrite in archive.Untar
2014-06-27 14:15:47 -07:00
Tibor Vass
5a3d774e56
allow overwrite in untar
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-06-27 17:03:51 -04:00
Michael Crosby
680adb98e1
Merge pull request #6232 from LK4D4/wait_functions_for_state
...
Wait functions for state
2014-06-27 13:33:13 -07:00
Michael Crosby
3aa75210c4
Merge pull request #6721 from LK4D4/integration_test_on_links
...
Integration cli tests on Links in inspect
2014-06-27 13:29:13 -07:00
Fred Lifton
0acec44374
Changed add to group command to include -a (append) flag, for safety. In response to customer email.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-06-27 12:45:55 -07:00
Alexandr Morozov
08182da5d8
Integration cli tests on Links in inspect
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-27 22:44:13 +04:00
Michael Crosby
3a50675a68
Merge pull request #6735 from unclejack/add_test_pr-6701
...
Add test for PR 6701
2014-06-27 11:05:18 -07:00
Michael Crosby
ade6bd7785
Merge pull request #6234 from jzupka/fix_check_default_ip
...
Adds check if default ip address is correct format.
2014-06-27 10:53:15 -07:00
Erik Hollensbe
e77729c2e0
Use last allocated port logic in port allocator
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-06-27 10:51:26 -07:00
Erik Hollensbe
ffd68badc0
Make ErrPortAlreadyAllocated an error interface with a few extras,
...
adjust tests to fit.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-06-27 10:51:25 -07:00
Arnaud Porterie
dafddf461e
Restrict portallocator to Docker allocated ports
...
Port allocation status is stored in a global map: a port detected in use will remain as such for the lifetime of the daemon. Change the behavior to only mark as allocated ports which are claimed by Docker itself (which we can trust to properly remove from the allocation map once released). Ports allocated by other applications will always be retried to account for the eventually of the port having been released.
Docker-DCO-1.1-Signed-off-by: Arnaud Porterie <icecrime@gmail.com > (github: icecrime)
2014-06-27 10:51:25 -07:00
unclejack
38b005ec69
integcli: add test to ensure -v /:/ isn't allowed
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-06-27 19:51:24 +03:00
unclejack
a1b6f350e8
correct typo - desination -> destination
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-06-27 19:49:40 +03:00
unclejack
510f1ba438
Merge pull request #6701 from crosbymichael/mount-root
...
Allow / as source of -v
2014-06-27 19:03:21 +03:00
Mike Chelen
815279c240
Update dockerimages.md
...
fix typo
2014-06-27 11:09:09 -04:00
Matthew Heon
4361366783
Document memory limit sizing in manpages
...
The -m flag permits the setting of a memory limit when running a Docker
container. The actual limit set must be a multiple of page size on Linux, so
whatever number the uses passes in will be rounded up if needed. Document this
behavior to prevent confusion. Also fixed several small formatting and grammar
issues in the docker run manpage.
Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com > (github: mheon)
2014-06-27 10:07:50 -04:00
Tianon Gravi
9b9d698081
Merge pull request #6729 from vincentbernat/fix/mkimage-use-var-tmp
...
Update mkimage scripts to use /var/tmp by default instead of /tmp
2014-06-27 08:04:05 -06:00
Jiří Župka
2fcbfb5a66
Adds check if default ip address is correct format.
...
It avoids hidden error when ports are redirected from
container to host using -p host_port:guest_port.
Docker-DCO-1.1-Signed-off-by: Jiří Župka <jzupka@redhat.com > (github: jzupka)
2014-06-27 15:55:20 +02:00
Vincent Bernat
287e604a8f
mkimage: use /var/tmp by default instead of /tmp
...
Additionally, this can be overridden by setting the TMPDIR variable,
like this was already the case for the generic `mkimage.sh` script.
As explained in #6456 , the rationale to use `/var/tmp` instead of `/tmp`
is that `/tmp` is often a small tmpfs filesystem with more restricted
rights.
Docker-DCO-1.1-Signed-off-by: Vincent Bernat <vincent@bernat.im > (github: vincentbernat)
2014-06-27 14:43:12 +02:00
Alexandr Morozov
57d86a5619
Use State waiting functions
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-27 15:07:40 +04:00
Alexandr Morozov
47065b9045
State refactoring and add waiting functions
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-27 15:05:48 +04:00
Sven Dowideit
a7722d752d
Merge pull request #6718 from mchelen/patch-1
...
Update dockerizing.md
2014-06-27 17:38:54 +10:00
Mike Chelen
0bfa14a70a
Update dockerizing.md
...
fix typo
2014-06-27 02:34:47 -04:00
James Turnbull
bc8d618cde
Merge pull request #6716 from leeplay/master
...
Update nodejs_web_app.md
2014-06-26 23:21:36 -07:00
James Turnbull
b074e9b01d
Merge pull request #6676 from berendt/opensuse_import_public_gpg_key
...
Import public GPG key after adding the openSUSE repository
2014-06-26 23:21:10 -07:00
James Turnbull
debbb26291
Merge pull request #6712 from SvenDowideit/pr_out_remove_superfluous_reptition_from_usingdocker_md
...
Remove superfluous reptition from usingdocker.md
2014-06-26 23:20:51 -07:00
leeplay
15ea1ca1f0
Update nodejs_web_app.md
...
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com > (github: leeplay)
2014-06-27 11:39:58 +09:00
Jonathan Boulle
d14cfc8d43
sort flags with the same name in a consistent order
...
Docker-DCO-1.1-Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com > (github: jonboulle)
2014-06-27 01:46:59 +00:00
Paul Weaver
748aaf3530
Remove superfluous reptition from usingdocker.md
...
Clarify wording about default docker ps options
Fix typo in dockerlinks.md
Docker-DCO-1.1-Signed-off-by: Paul Weaver <pauweave@cisco.com > (github: ch3pjw)
2014-06-27 11:43:29 +10:00
Sven Dowideit
425ab3da5e
Merge pull request #6709 from SvenDowideit/show-my-orgs
...
Show the user's orgs, not-Sam's email
2014-06-27 11:38:52 +10:00
Sven Dowideit
5cabfd1526
Merge pull request #6694 from leeplay/examples
...
Update examples/nodejs_web_app
2014-06-27 11:27:02 +10:00
Tibor Vass
67f6b0fd43
Merge pull request #6703 from crosbymichael/update-libcontainer-dep
...
Update libcontainer to 53cfe0a1eba9145bf5329abb
2014-06-26 21:20:59 -04:00
SvenDowideit
e817681581
Yes, ok, not-Sam
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-06-27 11:10:20 +10:00
Tibor Vass
6e3fe93148
Merge pull request #6579 from vieux/dockerignore
...
Rebased Dockerignore
2014-06-26 21:00:43 -04:00
Michael Crosby
e35a9a7def
Merge pull request #6683 from vieux/add_links_inspect
...
add links to inspect for 'linking' containers
2014-06-26 17:33:02 -07:00
Victor Vieux
f7eaeae43c
Merge pull request #6708 from crosbymichael/fix-bunk-test
...
Fix sleep command in tests
2014-06-26 17:10:58 -07:00
Michael Crosby
012091a28f
Fix sleep command in tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-06-26 17:09:41 -07:00
Michael Crosby
c9fdb08bda
Update libcontainer Context changes
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-06-26 16:56:39 -07:00
Michael Crosby
41e7523291
Update libcontainer to 53cfe0a1eba9145bf5329abbb52
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-06-26 16:56:39 -07:00
Michael Crosby
cab7894808
Merge pull request #6657 from unclejack/refactor_truncindex
...
refactor TruncIndex to use a trie & vendor deps
2014-06-26 16:53:49 -07:00
Victor Vieux
250b0d070c
add doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-26 23:36:29 +00:00
Michael Crosby
aecdbf3471
Merge pull request #6696 from cpuguy83/remove_dup_run_tests
...
Remove integration tests moved to integration-cli(dups)
2014-06-26 16:29:32 -07:00
Victor Vieux
8162dc0312
fix rebase
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-26 22:51:47 +00:00
Victor Vieux
0098360726
abort on error and fix debug
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-26 22:49:08 +00:00
Victor Vieux
42ca8a064b
add @tianon as maintainer of .dockerignore
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-26 22:49:08 +00:00
Travis Cline
9189db3aff
Add .dockerignore support
...
Fixes #2224
Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com > (github: tmc)
2014-06-26 22:49:08 +00:00
Travis Cline
111ab125b9
Change misnamed TarFilter to TarWithOptions
...
Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com > (github: tmc)
2014-06-26 22:49:08 +00:00
Michael Crosby
af025f2a95
Remove api test for bind mount /
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-06-26 15:39:45 -07:00
Solomon Hykes
69ec5824c3
Merge pull request #6625 from vieux/remove_dockerscript
...
remove dockerscript
2014-06-26 14:56:22 -07:00
Victor Vieux
55691e5fdc
add links to inspect for 'linking' containers
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-26 20:51:38 +00:00
Matthew Heon
fa3ac2d370
Fixed manpage generation script and README
...
Update md2man script to generate manpages inside docs/man/ directory. Update
usage documentation in the readme to point to the new docs/man path. Update
Ubuntu makefile to use new path to manpages
Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com > (github: mheon)
2014-06-26 15:51:26 -04:00
Tibor Vass
363b49948a
Merge pull request #6693 from tianon/bash-complete-force-rm
...
Add bash completion for "docker rm -f" and complete on all containers instead of just stopped containers when "-f" is specified
2014-06-26 15:06:02 -04:00
Victor Vieux
56a0f49dcc
Merge pull request #6640 from ostezer/commands.go-linguistics-1
...
docker help -> grammatical correction (pos. adj. apost.)
2014-06-26 11:59:49 -07:00
Michael Crosby
e39b8eade1
Allow / as source of -v
...
We discussed this at the docker plumbers meetup and for tools and
working on the system for things like boot2docker and coreos this is
needed. You can already bypass this check so we felt it is ok to start
allowing this feature.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-06-26 10:50:18 -07:00
Brian Goff
7606412d53
Remove integration tests moved to integration-cli(dups)
...
integration/commands_test.go/TestRunHostname == integration-cli/docker_cli_run_tests.go/TestModeHostname
integration/commands_test.go/TestRunWorkdir == integration-cli/docker_cli_run_tests.go/TestDockerRunWorkingDirectory
integration/commands_test.go/TestRunWorkdirExists == integration-cli/docker_cli_run_tests.go/TestDockerRunWorkingDirectory
integration/commands_test.go/TestAttachstdIn == integration-cli/docker_cli_run_tests.go/TestRunStdinPipe
integration/commands_test.go/TestCmdLogs == integration-cli/docker_cli_logs_tests.go
integration/commands_test.go/TestCmdKill == integration-cli/docker_cli_kill_test.go
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-06-26 12:57:12 -04:00
Mike Snitzer
a2f3ce2294
devmapper: add thin-pool blocksize to the 'docker info' output
...
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com > (github: snitm)
2014-06-26 12:39:16 -04:00
Mike Snitzer
79f217e350
devmapper: document the default DM thin pool blocksize
...
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com > (github: snitm)
2014-06-26 12:06:41 -04:00
Tianon Gravi
9aa840c50d
Merge pull request #6690 from tianon/remove-apt-lists
...
Update contrib/mkimage/debootstrap to remove /var/lib/apt/lists
2014-06-26 08:13:12 -06:00
unclejack
e0dad30579
refactor TruncIndex to use a trie & vendor deps
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-06-26 16:57:54 +03:00
O.S. Tezer
714c1bd8ca
Anglicanisms: Grammatical correction (pos. adj. apost.)
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-06-26 08:41:58 +01:00
leeplay
6bb6e422b5
Update examples/nodejs_web_app
...
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com > (github: leeplay)
2014-06-26 15:19:30 +09:00
Tianon Gravi
5e256799dd
Add bash completion for "docker rm -f" and complete on all containers instead of just stopped containers when "-f" is specified
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-06-25 22:12:25 -06:00
Victor Vieux
87c5ecdd69
Merge pull request #6684 from unclejack/fix_testparserunvolumes
...
fix TestParseRunVolumes with Go 1.3 randomization
2014-06-25 18:54:25 -07:00
Victor Vieux
3051ffe0fa
Merge pull request #6686 from SvenDowideit/commit-parens-update-6310
...
add missing docker commit parens (update 6310)
2014-06-25 18:30:00 -07:00
Tianon Gravi
c42b5575e5
Update contrib/mkimage/debootstrap to remove /var/lib/apt/lists (trimming at least 40MB and forcing "apt-get update" in dependent images before packages can be installed)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-06-25 19:07:39 -06:00
Sven Dowideit
389916bf9a
Add the missing paren to the documentation for docker commit too
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-06-26 11:06:45 +10:00
Trent Ogren
3fcb0d880a
Add missing parenthesis in docs for -author switch
...
Docker-DCO-1.1-Signed-off-by: Trent Ogren <tedwardo2@gmail.com > (github: misfo)
Docker-DCO-1.1-Signed-off-by: Trent Ogren <tedwardo2@gmail.com > (github: SvenDowideit)
2014-06-26 11:06:45 +10:00
Sven Dowideit
917b7436af
Merge pull request #6668 from erikh/fix-links-userguide
...
Add ticks to docker links userguide, was not being rendered properly.
2014-06-26 10:08:08 +10:00
Solomon Hykes
fe31ea7d0f
Merge pull request #6635 from SvenDowideit/deputise-fredlf
2014-06-25 17:00:57 -07:00
Solomon Hykes
c9e647e42f
Merge pull request #6218 from vieux/update_maintainers
2014-06-25 17:00:32 -07:00
James Turnbull
8eb34b2a0e
Merge pull request #6626 from SvenDowideit/pr_out_updated_cloud_sdk_download_link_added_a_command_to_set_the_project
...
Updated Cloud SDK download link, added a command to set the project
2014-06-25 16:36:51 -07:00
James Turnbull
6b6e915b85
Merge pull request #6590 from robertbachmann/patch
...
Windows needs hardware virtualization
2014-06-25 16:36:30 -07:00
Tianon Gravi
5ef0fe4b53
Merge pull request #6136 from thatsamguy/add-mageia-mkimage
...
Add mkimage support for mageia using urpmi
2014-06-25 17:33:39 -06:00
Sven Dowideit
5f6a725332
add Docker version and branch to html header
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-06-25 16:23:33 -07:00
Sven Dowideit
d3fde633bd
Merge pull request #6639 from leeplay/userguide
...
Update dockervolumes.md
2014-06-26 09:19:34 +10:00
Tianon Gravi
02a0c7aca9
Merge pull request #6185 from jbeda/debian-init-fix
...
Make debian init work when called repeatedly in quick succession
2014-06-25 17:17:04 -06:00
Tibor Vass
5743151118
Merge pull request #6649 from vieux/fix_api_return_codes_start_stop
...
return 304 is status isn't modified in start and stop
2014-06-25 19:10:19 -04:00
Sven Dowideit
d15bc4a342
Merge pull request #6665 from leeplay/patch-1
...
Update dockervolumes.md
2014-06-26 08:57:14 +10:00
unclejack
f6e6cf9071
fix TestParseRunVolumes with Go 1.3 randomization
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-06-26 01:48:58 +03:00
Michael Crosby
d91b8bcf0b
Merge pull request #6646 from tiborvass/fix-workdir
...
Fix --workdir=/
2014-06-25 15:19:51 -07:00
unclejack
94370add05
Merge pull request #6661 from tiborvass/tar_untar_file
...
Improve untar when using files instead of directories. Specifies behavior on non-existant targets.
2014-06-26 00:37:42 +03:00
Victor Vieux
17f6535482
Merge pull request #6664 from LK4D4/bench_on_truncindex_delete
...
Add benchmarks on TrucnIndex.Delete
2014-06-25 14:30:28 -07:00
Michael Crosby
7be83a0857
Merge pull request #6669 from pwaller/issue-6652
...
Allow re-mounting an existing mount with "remount"
2014-06-25 14:18:25 -07:00
Peter Waller
f87afda123
Allow re-mounting an existing mount with "remount"
...
Without this line of code, if a volume is present in /proc/mounts,
it cannot be remounted with new mount options.
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net > (github: pwaller)
2014-06-25 22:06:24 +01:00
Tibor Vass
b85f20cf13
Merge pull request #6666 from erikh/fix-escaping-whitespace
...
fix whitespace that precedes the escape in a multiline string.
2014-06-25 17:03:19 -04:00
Erik Hollensbe
03c5c1930d
fix whitespace that precedes the escape in a multiline string.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-06-25 13:39:47 -07:00
Christian Berendt
f3ea94a797
Add a step to verify if Docker is working as expected
...
Like in the other installation guides I added a simple test
to verify that importing images and starting containers is
working.
Docker-DCO-1.1-Signed-off-by: Christian Berendt <berendt@b1-systems.de > (github: berendt)
2014-06-25 21:57:54 +02:00
Christian Berendt
0b2b3221e2
Import public GPG key after adding the openSUSE repository
...
Docker-DCO-1.1-Signed-off-by: Christian Berendt <berendt@b1-systems.de > (github: berendt)
2014-06-25 21:53:45 +02:00
LK4D4
04a9fe1e62
Combined AddGet benchmark
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-25 22:49:38 +04:00
Tibor Vass
baacc7006b
add integration test for --workdir=/
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-06-25 11:02:59 -04:00
Tibor Vass
385c9b1a08
fix bug in FollowSymlinkInScope when link == root
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-06-25 11:02:59 -04:00
Tibor Vass
1c8d3106df
improve untar when using files instead of directories. Specifies behavior on non-existant targets.
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-06-25 09:35:26 -04:00
Matthew Heon
be4f4599a6
Update documentation noting that SIGCHLD is not proxied.
...
Docker's --sig-proxy option sends all signals but one to a container. The
exception s SIGCHLD, which is deliberately ignored as it doesn't make sense to
send such a signal to a process in a container. Documentation updates will make
this less confusing if anyone does attempt to do this.
Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com > (github: mheon)
2014-06-25 09:08:02 -04:00
Erik Hollensbe
6b29019541
Add ticks to docker links userguide, was not being rendered properly, fix spelling error in /etc/hosts
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-06-25 02:18:16 -07:00
hyeongkyu.lee
9026888b10
Update dockervolumes.md
...
~~~
kyu@kyu-HP-EliteBook-2570p:~/apps/docker/volume$ docker run -v /dbdata --name dbdata2 ubuntu
2014/06/25 14:17:44 Error response from daemon: No command specified
~~~
2014-06-25 14:53:59 +09:00
Alexandr Morozov
7c8445826f
Add benchmarks on TrucnIndex.Delete
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-25 09:37:39 +04:00
James Turnbull
01d4fd76dd
Merge pull request #6656 from andersryanc/master
...
Remove Docs viewport tag to fix iPhone scaling
2014-06-24 20:16:47 -07:00
Victor Vieux
b18c721555
fix tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-25 01:44:48 +00:00
Sven Dowideit
11902d4ccb
Merge pull request #6658 from amuino/doc_pause_unpause
...
Document the pause and unpause commands available on API v1.12 onwards
2014-06-25 10:00:36 +10:00
Victor Vieux
c72cfa8d45
Merge pull request #6659 from vieux/pr_6248
...
Change floats to ints recursively on env encoding
2014-06-24 16:51:28 -07:00
LK4D4
1d3d1c5d2b
Change floats to ints recursively on env encoding
...
Fixes #6246
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-24 23:39:26 +00:00
Michael Crosby
e899700254
Merge pull request #6651 from erikh/6002-conflicting-iptables-options
...
Add mutex warning when specifying -icc or -ip-forward and -iptables=false
2014-06-24 15:56:05 -07:00
Erik Hollensbe
05f293e65e
Add mutex warning when specifying -icc or -ip-forward and -iptables=false
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-06-24 15:49:35 -07:00
Abel Muiño
901a47daff
Document the pause and unpause commands available on API v1.12 onwards
...
Docker-DCO-1.1-Signed-off-by: Abel Muiño <amuino@gmail.com > (github: amuino)
2014-06-25 00:41:57 +02:00
Ryan Anderson
7b1dd54d5d
Remove viewport tag to fix iPhone scaling
2014-06-24 15:16:40 -07:00
Tibor Vass
4f5e91e3b4
Merge pull request #6654 from vieux/fix_test_search
...
Fix search integration-cli test
2014-06-24 17:51:07 -04:00
Sven Dowideit
11ef08402a
Merge pull request #6629 from SvenDowideit/move-man-pages-to-docs
...
move the man pages to the docs/ dir
2014-06-25 07:50:09 +10:00
Victor Vieux
6d8e95557c
Merge pull request #6643 from kzys/freebsd-cp
...
cp's -T and --reflink=auto are only available on GNU coreutils
2014-06-24 14:29:18 -07:00
Victor Vieux
dd258553b1
Fix search integration-cli test
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-24 21:16:34 +00:00
Michael Crosby
408963ed4d
Merge pull request #6650 from crosbymichael/update-libcontainer-post-refactor
...
Update libcontainer dep to 5210a236b92a8022a673108f347
2014-06-24 13:51:04 -07:00
unclejack
1059e166fd
Merge pull request #6595 from LK4D4/env_benchmarks
...
Benchmarks for engine/env
2014-06-24 23:35:00 +03:00
unclejack
c4dbd4f7c0
Merge pull request #6648 from LK4D4/truncindex_bench
...
Truncindex benchmarks
2014-06-24 22:10:33 +03:00
Tibor Vass
f6d11c8d50
Merge pull request #6216 from gsalgado/convert-integration-tests
...
Convert integration/api_test:TestGetEvents into a unit test and a CLI test
2014-06-24 14:53:10 -04:00
Victor Vieux
53b036032d
return 304 is status isn't modified in start and stop
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-24 18:31:56 +00:00
Michael Crosby
1dc8e2ffab
Rename libcontainer.Container to libcontainer.Config
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-06-24 11:31:03 -07:00
Michael Crosby
cee6f4506c
Update libcontainer references
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-06-24 11:31:03 -07:00
Michael Crosby
423a8f91d7
Update libcontainer to 5210a236b92a8022a673108f347
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-06-24 11:30:36 -07:00
LK4D4
01b424028e
Benchmarks for engine/env
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-24 21:48:16 +04:00
LK4D4
7eb425ccd1
Improve truncindex benchmarks
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-24 21:41:51 +04:00
Victor Vieux
e23e3a1600
Merge pull request #5413 from SvenDowideit/docker-info-list-sockets
...
Add Sockets (-H) list to `docker -D info`.
2014-06-24 10:40:53 -07:00
LK4D4
ed032ddfd6
Move truncindex in separate package in pkg/
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-24 21:19:15 +04:00
Mike Snitzer
f9c078ef38
devmapper: remove extra space in DefaultThinpBlockSize assignment
...
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com > (github: snitm)
2014-06-24 12:43:45 -04:00
Mike Snitzer
09ee269d99
devmapper: Add option for specifying the thin pool blocksize
...
Add dm.blocksize option that you can use with --storage-opt to set a
specific blocksize for the thin provisioning pool.
Also change the default dm-thin-pool blocksize from 64K to 512K. This
strikes a balance between the desire to have smaller blocksize given
docker's use of snapshots versus the desire to have more performance
that comes with using a larger blocksize. But if very small files will
be used on average the user is encouraged to override this default.
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com > (github: snitm)
2014-06-24 12:10:28 -04:00
Mike Snitzer
2470a5ed99
devmapper: use RAMInBytes() rather than FromHumanSize()
...
Device Mapper needs device sizes in binary (1024) multiples. Otherwise
kernel checks can find that the specified thin-pool device sizes aren't
a multiple of the specified thin-pool blocksize.
The name for "RAMInBytes" is likely too narrow given the new consumers
but... Also add "tebibyte" support to RAMInBytes.
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com > (github: snitm)
2014-06-24 12:10:14 -04:00
Guilherme Salgado
1c291ccbbe
Migrate TestGetEvents into a unit and a CLI test
...
Docker-DCO-1.1-Signed-off-by: Guilherme Salgado <gsalgado@gmail.com > (github: gsalgado)
2014-06-24 17:43:26 +02:00
Mike Snitzer
d420134fa2
devmapper: fix reloadPool() to also specify '1 skip_block_zeroing'
...
createPool() and reloadPool() should be consistent with the thin-pool
table params they use.
Since createPool() specifies '1 skip_block_zeroing' reloadPool() should
too. Otherwise, if the pool is reloaded (as is done when resizing
loopback devices) block zeroing will be enabled after the reload
completes.
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com > (github: snitm)
2014-06-24 11:23:13 -04:00
Kato Kazuyoshi
733711481e
cp's -T and --reflink=auto are only available on GNU coreutils
...
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-06-24 23:58:17 +09:00
kyu
a51dc92379
Update dockervolumes.md
...
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com > (github: leeplay)
2014-06-24 18:36:57 +09:00
Jonathan Camp
6e74754a50
Replace dashes in link name with underscores
...
Docker-DCO-1.1-Signed-off-by: Jonathan Camp <jonathan@irondojo.com > (github: kung-foo)
2014-06-24 09:04:02 +02:00
James Turnbull
f1ac8962f9
Merge pull request #6633 from SvenDowideit/avoid-extra-gravatar-download
...
Lets not download the gravatar and then download a different one after t...
2014-06-23 23:58:15 -07:00
Senthil Kumar Selvaraj
21e258d732
Fix typo in README.md
2014-06-24 11:57:24 +05:30
SvenDowideit
87d522a557
Add Fred as docs MAINTAINER
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-06-24 15:45:44 +10:00
SvenDowideit
c7a1bdf6c0
Lets not download the gravatar and then download a different one after the js is triggered
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-06-24 14:48:29 +10:00
SvenDowideit
42be6f2957
move the man pages to the docs/ dir
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-06-24 13:07:42 +10:00
SvenDowideit
cf513185b0
move api docs to APIv1.13
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-06-24 12:25:18 +10:00
Sven Dowideit
f54823bf05
Add Sockets (-H) list to docker -D info.
...
This will allow us to _know_ what the user's -H settings are, which may
be useful for debugging later.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-06-24 12:25:17 +10:00
James Turnbull
664ba0c031
Merge pull request #6624 from jezenielzapanta/patch-1
...
Fix typo in the docs.
2014-06-23 19:20:20 -07:00
Sven Dowideit
67ba305841
Merge pull request #6623 from rogaha/fix_header_links
...
Fix header and About Docker links
2014-06-24 12:18:29 +10:00
Victor Vieux
d7587aa976
Merge pull request #4812 from kzys/freebsd-mount
...
FreeBSD support on pkg/mount
2014-06-23 17:45:25 -07:00
Victor Vieux
6a762e8594
Merge pull request #6620 from vieux/deprecate_tag_args
...
Remove old tag format
2014-06-23 17:24:20 -07:00
James Turnbull
28c22cb7f9
Merge pull request #6599 from SvenDowideit/6478-update-fedora
...
Update fedora.md
2014-06-23 17:23:00 -07:00
Manfred Zabarauskas
c5f1cb1121
Updated Cloud SDK download link, added a command to set the project
...
no DCO - considered a spelling fix
squashed by
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-06-24 09:07:10 +10:00
Victor Vieux
431a6736d2
remove dockerscript
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-23 22:52:03 +00:00
Sven Dowideit
b49cfaffa8
Merge pull request #6617 from ifraixedes/patch-1
...
Update dockervolumes.md
2014-06-24 08:50:27 +10:00
Victor Vieux
2d195fb6f8
Merge pull request #5715 from proppy/context-tar
...
allow docker build - to accept a context tar from stdin
2014-06-23 15:33:21 -07:00
Victor Vieux
14ee021885
Merge pull request #6539 from LK4D4/fix_large_frame_in_stdcopy
...
Fix stdcopy when reads large frame at once
2014-06-23 13:52:30 -07:00
Johan Euphrosine
edcb41451a
api/client/build: allow tar as context for docker build -
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-06-23 13:34:09 -07:00
Michael Crosby
3f600c831b
Merge pull request #6621 from LK4D4/move_sorter_tests_to_integration_cli
...
Move sorter_test from integration to integration-cli
2014-06-23 13:17:37 -07:00
Jezeniel Zapanta
cf6834d797
Fix typo in the docs.
...
Fix a minor typographical error inside `run.md`.
2014-06-24 03:26:22 +08:00
Roberto G. Hashioka
edf16383c6
Fix header and about Docker links
2014-06-23 18:35:15 +00:00
LK4D4
386d1ecc6e
Move sorter_test from integration to integration-cli
...
TestServerListOrderedImagesByCreationDateAndTag was redundant and broken
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-23 22:19:52 +04:00
Victor Vieux
62b2b1bac3
Merge pull request #6532 from jonboulle/fix_capitals
...
be consistent in capitalization of Docker
2014-06-23 11:14:27 -07:00
Victor Vieux
8228d0e2bb
Remove old tag format
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-23 17:52:03 +00:00
Victor Vieux
c32036fa9b
Merge pull request #6585 from kzys/runconfig-fatalf
...
Fatal() doesn't take a format string like Fatalf()
2014-06-23 10:24:01 -07:00
Tianon Gravi
549e34b3d7
Merge pull request #6572 from tianon/better-debootstrap-self-documentation
...
Add a ton of simple improvements to contrib/mkimage/debootstrap, especially comments in the extra files put inside the image
2014-06-23 11:12:02 -06:00
Ivan Fraixedes
3ce5fde7ab
Update dockervolumes.md
...
Missed double hyphen in `--volumes-from` option
2014-06-23 16:08:34 +01:00
Sven Dowideit
fa8f89c521
Merge pull request #6536 from dgageot/patch-2
...
Fix flag names
2014-06-23 15:26:08 +10:00
James Turnbull
10b8d6b8b0
Merge pull request #6583 from jamtur01/sshd
...
Updated SSH example to ensure it continues working
2014-06-23 01:17:35 -04:00
James Turnbull
09e694aa7d
Merge pull request #6611 from SvenDowideit/remove-spurious-dollar-signs
...
Remove `$` leaders from examples of editing text in a file
2014-06-23 01:13:42 -04:00
SvenDowideit
4d7e28a7d7
Remove $ leaders from examples of editing text in a file
...
not everything that is indented is a commandline example
Closes #6591
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-06-23 14:50:11 +10:00
Alexander Shopov
9559f57463
Update fedora.md
...
Docker-DCO-1.1-Signed-off-by: Alexander Shopov <ash@kambanaria.org > (github: alshopov)
Squashed by
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
replaces #6478
Docker-DCO-1.1-Signed-off-by: Alexander Shopov <ash@kambanaria.org > (github: )
2014-06-22 19:39:45 -07:00
James Turnbull
ad19e5e133
Merge pull request #6581 from fredlf/copyedit_dockerrepo
...
Revised and fixed links on dockerrepo.md
2014-06-22 22:17:40 -04:00
Sven Dowideit
875b0698e8
Merge pull request #6426 from tianon/fix-import-man-error
...
Fix contrib/man/md/docker-import.1.md warning ("macro `tar.gz,' not defined")
2014-06-23 11:48:35 +10:00
James Turnbull
22cf1586cf
Merge pull request #6605 from SvenDowideit/6423-remove-b2d-ssh-passphrase-prompt
...
Remove mention of SSH passphrase, it was only present in v0.12
2014-06-22 20:54:22 -04:00
Sven Dowideit
1e847bff7a
Remove mention of SSH passphrase, it was only present in v0.12
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-06-22 17:36:02 -07:00
James Turnbull
e876067e34
Merge pull request #6598 from SvenDowideit/6394-missing-redirect
...
one last missing docs redirect
2014-06-22 19:06:27 -04:00
Sven Dowideit
51d032737c
one last missing redirect
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-06-22 16:01:21 -07:00
Robert Bachmann
ba7245f072
Windows needs hardware virtualization
...
VirtualBox needs hardware virtualization for
64-bit guests.
Docker-DCO-1.1-Signed-off-by: Robert Bachmann <rb@robertbachmann.at > (github: robertbachmann)
2014-06-21 23:14:23 +02:00
Kato Kazuyoshi
00469957ad
Fatal() doesn't take a format string like Fatalf()
...
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-06-21 17:32:39 +09:00
Fred Lifton
ab0fc77ebe
Fixed a typo
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-06-20 17:52:30 -07:00
Fred Lifton
c70fbae3ed
Revised and fixed links on dockerrepo.md
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-06-20 17:10:20 -07:00
Sven Dowideit
ad19f1beb7
Merge pull request #6578 from ch3pjw/documentation_fix
...
Fix minor typo and improve wording
2014-06-21 09:57:25 +10:00
Tianon Gravi
506ad22743
Merge pull request #6553 from tianon/disable-netgo-for-dynbinary
...
Disable netgo for dynbinary builds
2014-06-20 17:51:12 -06:00
Tibor Vass
d6f7725e58
Merge pull request #6529 from qwazerty/master
...
Fix minor typo
2014-06-20 17:37:07 -04:00
Paul Weaver
5266d6fa7b
Clean up some uses on 'an' in builder docs
2014-06-20 22:36:31 +01:00
Paul Weaver
1bcc37caec
Fix minor typo and improve wording
2014-06-20 22:21:18 +01:00
Jonathan Boulle
6d14e9f1ac
be consistent in capitalization of Docker
...
Docker-DCO-1.1-Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com > (github: jonboulle)
2014-06-20 14:05:46 -07:00
unclejack
a5f5d5e8d7
Merge pull request #6571 from vbatts/vbatts-raw_json
...
raw json for `docker save`
2014-06-20 23:55:10 +03:00
Michael Crosby
8ee1f2a9e9
Merge pull request #6516 from LK4D4/validate_logs_params
...
Validate that one of streams choosen in logs on api side
2014-06-20 13:43:31 -07:00
Michael Crosby
189967a12a
Merge pull request #6503 from LK4D4/verbose_parallel_error_pull_#6484
...
More verbose error for parallel pull
2014-06-20 13:29:51 -07:00
Vincent Batts
d3bc787bca
docker save: raw json
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-06-20 14:38:17 -04:00
Matthew Heon
f55fa8211b
Escape control and nonprintable characters in docker ps
...
The docker ps command displays the user-entered command running in a container.
If that command contained \n, \t, or other control characters, they were
interpreted literally, and newlines and tabs would be printed in the output.
Escape the command string to make things more readable.
Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com > (github: mheon)
2014-06-20 12:22:31 -04:00
Tianon Gravi
a206186f84
Add a ton of simple improvements to contrib/mkimage/debootstrap, especially comments in the extra files put inside the image
...
This also adds support for squeeze-lts. :)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-06-20 10:11:26 -06:00
Brian Goff
ff1ea0064b
Add cpuguy83 as volumes maintainer
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-06-20 09:40:29 -04:00
Sven Dowideit
b2eb79b7da
Merge pull request #6565 from shaunol/patch-1
...
Update windows.md
2014-06-20 23:27:12 +10:00
Sven Dowideit
ed833bb62d
Merge pull request #6568 from jokajak/patch-2
...
Minor typo/format fixes for dockerlinks.md
2014-06-20 23:23:03 +10:00
James Turnbull
0d63d68e33
Merge pull request #6540 from lalyos/docs-installation-mac-windows
...
Fix installation docs to use the new boot2docker command: ip
2014-06-20 08:02:56 -05:00
James Turnbull
a32f3b4b50
Merge pull request #6566 from jokajak/patch-1
...
Fix typo in networking.md
2014-06-20 07:59:35 -05:00
Josh
66bccf3064
Minor typo/format fixes
...
This fixes a code block typo so it renders as a code block. Additionally synchronizes the variable prefix examples from 'DB' and 'DB1_' to 'DB_' and 'DB1_'
2014-06-20 07:49:22 -04:00
Sven Dowideit
c60cde1499
Merge pull request #6564 from financeCoding/docs-installation-google-fix
...
full url to GCE image
2014-06-20 21:41:35 +10:00
Josh
cbdce9912d
Fix typo in networking.md
...
Minor typo fix
2014-06-20 07:14:56 -04:00
shaunol
db9bf744ab
Update windows.md
...
Update Program Files path description, the default install folder is "Boot2Docker", rather than "Docker"
2014-06-20 19:23:35 +12:00
Adam Singer
4efe02b3df
full url to GCE image
...
Docker-DCO-1.1-Signed-off-by: Adam Singer <financeCoding@gmail.com > (github: financeCoding)
2014-06-19 22:01:10 -07:00
James Turnbull
4e286a9094
Merge pull request #6548 from jamtur01/sec
...
Fixed #6545 - Updated Security article
2014-06-19 20:21:07 -05:00
Victor Vieux
8554841c6a
Merge pull request #6563 from vieux/merge_release_v1.0.1
...
Merge release v1.0.1
2014-06-19 18:09:07 -07:00
Victor Vieux
49376ec448
Change version to 1.0.1-dev
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-20 01:06:48 +00:00
Victor Vieux
7030cdce59
Merge pull request #6559 from vieux/bump_v1.0.1
...
Bump v1.0.1
2014-06-19 18:03:54 -07:00
Victor Vieux
990021ac2b
Bump version to v1.0.1
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-19 23:11:34 +00:00
Victor Vieux
41d405fa53
Merge pull request #6557 from crosbymichael/update-libcontainer-1.0.1
...
Update libcontainer dep to v1.0.1
2014-06-19 15:43:30 -07:00
Michael Crosby
8d06bfc12e
Update libcontainer dep to v1.0.1
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-06-19 15:23:19 -07:00
Tianon Gravi
98ea12ac38
Merge pull request #6554 from tianon/fix-dyntest
...
Fix dyntest and rename it to dyntest-unit to match the test-unit rename
2014-06-19 16:04:24 -06:00
Victor Vieux
7ba8788919
Merge pull request #6527 from subhraveti/cap-whitelist
...
Maintain a whitelist of capabilities rather than droplist
2014-06-19 14:48:38 -07:00
James Turnbull
bf69b773ec
Fixed #6545 - Updated Security article
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-06-19 16:13:20 -05:00
Tianon Gravi
986a151b8a
Fix dyntest and rename it to dyntest-unit to match the test-unit rename
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-06-19 15:06:34 -06:00
Michael Crosby
abda245ddc
Merge pull request #6493 from vieux/fix_cp_mac_os
...
allow utimes on mac os, only lutimes isn't supported
2014-06-19 14:00:59 -07:00
Tibor Vass
4ad5af81c8
Merge pull request #6552 from vbatts/vbatts-gh6551
...
sqlite-3.6.20-1 unique constraint message
2014-06-19 16:54:43 -04:00
Tianon Gravi
3f7909e996
Disable netgo for dynbinary builds
...
It's not necessary to use the netgo implementation for non-static builds. :)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-06-19 14:35:30 -06:00
Michael Crosby
707ef9618b
Update close fd issues for lxc
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-06-19 16:02:21 -04:00
Michael Crosby
d31ae5aed8
Use libcontainer cap drop method
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-06-19 16:00:53 -04:00
Vincent Batts
b4857dffa8
sqlite-3.6.20-1 unique constraint message
...
https://github.com/dotcloud/docker/issues/6551
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-06-19 15:24:22 -04:00
Tianon Gravi
2eac1c4bc5
Merge pull request #6547 from tianon/update-bash-completion-for-pushing-tags
...
Update bash-completion to reflect ability to push single tags
2014-06-19 12:40:31 -06:00
LK4D4
d17c929659
Fix stdcopy when reads large frame at once
...
Fixes TestLogsContainerMuchBiggerThanPage with go 1.3(#6520 )
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-19 21:42:55 +04:00
Tianon Gravi
bdf4b74b52
Update bash-completion to reflect ability to push single tags
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-06-19 10:11:32 -06:00
James Turnbull
346a350df4
Merge pull request #6538 from leeplay/patch-2
...
Update dockerlinks.md
2014-06-19 10:59:48 -05:00
unclejack
181e54bff3
Merge pull request #6451 from cyphar/6445-fix-onbuild-passing-to-grandchildren
...
Ensure that ONBUILD triggers aren't committed to grandchildren
2014-06-19 18:11:33 +03:00
Kevin "qwazerty" Houdebert
d7e5fdfb58
Fix minor typo
...
Docker-DCO-1.1-Signed-off-by: Kevin Houdebert kevin.houdebert@gmail.com (github: qwazerty)
2014-06-19 14:49:52 +02:00
James Turnbull
10eae16fa7
Updated SSH example to ensure it continues working
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-06-19 07:44:41 -05:00
James Turnbull
874698cb4a
Merge pull request #6524 from behemphi/patch-1
...
Update dockerizing.md
2014-06-19 07:06:02 -05:00
lalyos
40966fa096
Fix installation docs to use the new boot2docker command: ip
...
Docker-DCO-1.1-Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com > (github: lalyos)
2014-06-19 13:00:45 +02:00
cyphar
a57298791c
integration-cli: add build test for NOCACHE
...
This patch adds CLI integration tests to ensure that NOCACHE instructions
in Dockerfiles only apply to direct children of the original image.
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
2014-06-19 20:33:17 +10:00
cyphar
7303467c77
server: buildfile: ensure that ONBUILD triggers aren't committed
...
This patch fixes the bug where ONBUILD triggers are committed each build
step created during the ONBUILD trigger execution, since the triggers are
only wiped *after* all ONBUILD trigger steps have been committed. This was
fixed by simply copying the ONBUILD triggers and wiping the config
*before* committing anything.
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
2014-06-19 20:33:17 +10:00
hyeongkyu.lee
7b1f34d626
Update dockerlinks.md
...
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com > (github: leeplay)
2014-06-19 18:45:31 +09:00
David Gageot
80bc06f1cf
Fix flag names
2014-06-19 11:25:14 +02:00
Dinesh Subhraveti
cf331cdd6a
Maintain a whitelist of capabilities rather than droplist
...
This fixes 6/18 vulnerability
Docker-DCO-1.1-Signed-off-by: Dinesh Subhraveti <dineshs@altiscale.com > (github: dineshs-altiscale)
2014-06-19 03:34:04 -04:00
James Turnbull
b1c114c3a7
Merge pull request #6519 from fredlf/latest-copyedits
...
Copy edits to dockerhub.md, fixed a broken link.
2014-06-19 01:45:20 -05:00
Tianon Gravi
b13cdb01bd
Merge pull request #6427 from tianon/fix-zsh-completion-mode
...
Fix mode on contrib/completion/zsh/_docker (-x)
2014-06-18 23:01:07 -06:00
Tianon Gravi
f619243099
Fix mode on contrib/completion/zsh/_docker (-x)
...
ZSH completion scripts aren't supposed to be executable - they're sourced by ZSH and aren't run directly.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-06-18 22:59:20 -06:00
Boyd Hemphill
a841152069
Update dockerizing.md
2014-06-18 22:50:56 -05:00
Solomon Hykes
30313cacce
Merge pull request #6363 from proppy/patch-5
...
MAINTAINERS: add proppy for google.md
2014-06-18 18:03:29 -07:00
Fred Lifton
8646bf4a40
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredfl)
2014-06-18 17:50:24 -07:00
Tibor Vass
421707f638
Merge pull request #6518 from vieux/finish_remove_insert
...
cleanup all mentions of insert
2014-06-18 20:06:29 -04:00
Sven Dowideit
a790d3309c
Merge pull request #6424 from tianon/fix-minor-md2man-bug
...
Fix minor bug in contrib/man/md/md2man-all.sh causing the creation of contrib/man/manREADME
2014-06-19 09:57:23 +10:00
O.S. Tezer
df217f5377
Merge pull request #6517 from ostezer/docs-styles-update
...
Docs styles update
2014-06-18 16:53:46 -07:00
Sven Dowideit
c60d178ad0
Merge pull request #6488 from crosbymichael/readme-security
...
Add security message to readme
2014-06-19 09:52:55 +10:00
Victor Vieux
b132e7b36d
discard ErrNotSupportedPlatform
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-18 23:42:22 +00:00
Victor Vieux
1ca7964cdd
Merge pull request #6257 from proppy/test-conntimeout
...
utils: add test for TimeoutConn
2014-06-18 16:23:39 -07:00
Victor Vieux
3e2a9f667f
cleanup all mentions of insert
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-18 23:13:54 +00:00
Victor Vieux
7a0e599142
Merge pull request #6066 from tiborvass/5693-volumes-from-symlink-path
...
5693 volumes from symlink path
2014-06-18 16:10:37 -07:00
O.S. Tezer
381050b1ee
Docs styling update/upgrade
...
Closes https://github.com/dotcloud/docker/issues/6514
Closes https://github.com/dotcloud/docker/issues/6377
Closes https://github.com/dotcloud/docker/issues/6514
Closes https://github.com/dotcloud/docker/pull/6502
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-06-18 16:09:03 -07:00
Victor Vieux
f3db32c035
Merge pull request #6505 from vdloo/master
...
Fixes typo in loopback device error message
2014-06-18 15:55:51 -07:00
Michael Crosby
d803523cdc
Merge pull request #5559 from bmurphy1976/bmurphy1976-history-bug
...
Test and fix history command ordering
2014-06-18 14:34:00 -07:00
Michael Crosby
443d923f08
Merge pull request #6244 from tiborvass/fix_release_checklist
...
Fix documentation for release-checklist
2014-06-18 13:52:51 -07:00
Tibor Vass
586e72218c
Fix documentation for release-checklist
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-06-18 16:45:15 -04:00
Rick van de Loo
98041d26bb
Fixes typo in loopback device error message
...
Docker-DCO-1.1-Signed-off-by: Rick van de Loo <rickvandeloo@gmail.com > (github: vdloo)
2014-06-18 22:09:28 +02:00
Tibor Vass
48907d57ed
fix bug in getRootResourcePath in previous commit
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-06-18 15:51:28 -04:00
cyphar
5c069940db
daemon: *: updated getResourcePath and getRootResourcePath signatures
...
This patch updates container.getResourcePath and container.getRootResourcePath
to return the error from symlink.FollowSymlinkInScope (rather than using utils).
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
Remove Inject to help rebase
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Docker-DCO-1.1-Signed-off-by: cyphar <cyphar@cyphar.com > (github: tiborvass)
2014-06-18 15:51:28 -04:00
Tibor Vass
65d4047cb6
expose unresolved path for volumes and resolve symlink in container.getResourcePath
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-06-18 15:51:27 -04:00
Tibor Vass
def86d0cf4
rename TestVolumeWithSymlink to TestCreateVolumeWithSymlink and remove run_tests folder
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-06-18 15:51:27 -04:00
Tibor Vass
c4c92e66cd
add integration test
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-06-18 15:50:39 -04:00
LK4D4
216b4c9cf6
Validate that one of streams choosen in logs on api side
...
Fixes #6506
There is the bug, that very hard to fix: When we return job.Errorf in
"logs" job it writes to job.Stderr, to which connected ResponseWriter and on
this write w.WriteHeader(http.StatusOK) is called. So, we get 200 on error
from "logs" job.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-18 23:34:46 +04:00
Alexandr Morozov
3303789b4f
More verbose error for parallel pull
...
Partially fixes #6484
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-18 23:30:52 +04:00
Victor Vieux
7c52ab7f83
Merge pull request #5878 from timthelion/docs-docker-readme
...
Add README.md file for the docker directory
2014-06-18 12:19:43 -07:00
Michael Crosby
40b55a4174
Merge pull request #6399 from dvberkel/master
...
use a numbered list for maintainers responsibility
2014-06-18 11:57:46 -07:00
Michael Crosby
f53b922f40
Merge pull request #6495 from vieux/pr_6269
...
Fix go vet errors
2014-06-18 11:02:17 -07:00
LK4D4
f08cd445b0
Fix go vet errors
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-18 17:39:57 +00:00
NikolaMandic
962e1186f9
removed expect from mkimage-arch since it was not working
...
Docker-DCO-1.1-Signed-off-by: NikolaMandic <mn080202@gmail.com > (github: NikolaMandic)
2014-06-18 19:25:51 +02:00
Michael Crosby
d9d08c5ef5
Wrap lines in security notice
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-06-18 10:15:51 -07:00
Tibor Vass
331ae9c0f8
Merge pull request #6487 from vbatts/vbatts-error_info
...
adding a little uniqueness, to wrapped errors.
2014-06-18 11:43:59 -04:00
Matthew Heon
06cd125e64
Increase size of buffer for signals
...
The chan struct used to forward signals to containers was one element only,
which caused some signals to be dropped when many were being received.
Increasing the size of the chan buffer makes this much less likely to happen.
Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com > (github: mheon)
2014-06-18 10:51:44 -04:00
James Turnbull
4195fc0494
Merge pull request #6497 from SvenDowideit/awscli-changes
...
pin awscli to 1.3.9, and then complexify the sync's to make them more li...
2014-06-18 08:46:30 -05:00
James Turnbull
ffe3ae7bfb
Merge pull request #6499 from SvenDowideit/add-redirects-for-renames
...
compared the 0.11 sitemap to the 1.0 one and these are the differences
2014-06-18 08:43:32 -05:00
James Turnbull
2294294e19
Merge pull request #6468 from jstoja/6374-docs-apache-image
...
Docs: apache image on installation
2014-06-18 08:19:58 -05:00
Daan van Berkel
cc96d31252
use a numbered list for maintainers responsibility
...
At the moment maintainers responsibility are spelled out with a hybrid
list. I.e. an unordered list with an associated number.
In this commit I the number list proper is used.
Docker-DCO-1.1-Signed-off-by: Daan van Berkel <daan.v.berkel.1980@email.com > (github: dvberkel)
2014-06-18 14:31:26 +02:00
James Turnbull
0c5d9626b8
Merge pull request #6500 from leeplay/userguide
...
fixed docker port command
2014-06-18 01:25:28 -05:00
kyu
438d26b405
fixed docker port command
2014-06-18 15:01:29 +09:00
SvenDowideit
42fe9327b9
compared the 0.11 sitemap to the 1.0 one and these are the differences
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-06-18 15:39:30 +10:00
SvenDowideit
6b352d1cfe
pin awscli to 1.3.9, and then complexify the sync's to make them more likely to complete
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-06-18 12:38:45 +10:00
Victor Vieux
f0ec901819
Merge pull request #6490 from icecrime/6203-artifacts_on_events_output
...
Avoid erasing line for non-progress messages
2014-06-17 16:26:51 -07:00
Victor Vieux
04bfa8e91f
allow utimes on mac os, only lutimes isn't supported
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-17 23:19:42 +00:00
Tibor Vass
d0fe1147ea
Merge pull request #6199 from icecrime/event_subscription_refactoring
...
Event subscription refactoring
2014-06-17 17:39:28 -04:00
unclejack
ec0fb311ed
Merge pull request #6415 from LK4D4/increase_timeout_in_test_attach
...
Increase time before exit in TestMultipleAttachRestart
2014-06-18 00:36:18 +03:00
Michael Crosby
4dcf4e9bd0
Merge pull request #6320 from LK4D4/fix_stdcopy_eof
...
Don't exit on eof in header reading in stdcopy
2014-06-17 14:20:13 -07:00
Victor Vieux
3336bdf5b5
Merge pull request #6489 from vieux/fix_mflags_panic
...
prevent panic when empty flag
2014-06-17 14:04:20 -07:00
Michael Crosby
ba4ae2c46d
Merge pull request #6405 from gsalgado/migrate-test-getcontainersbyname
...
Convert TestGetContainersByName into a unit test
2014-06-17 14:01:42 -07:00
Tibor Vass
092826152c
Merge pull request #6485 from crosbymichael/update-libcontainer
...
Update libcontainer dependency to 77ffd49dfedbc78a
2014-06-17 16:57:35 -04:00
Victor Vieux
c7fdd51eb6
Merge pull request #6471 from LK4D4/more_buildfile_tests_to_cli
...
Move more buildfile tests to integration-cli
2014-06-17 13:54:55 -07:00
Victor Vieux
661a1e9026
prevent panic when empty flag
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-17 20:45:57 +00:00
Arnaud Porterie
3807f8b708
Avoid erasing line for non-progress messages
...
The JSONMessage.Display methods erases the entire line by outputting the <ESC>[2K\r sequence before displaying the message content. This is not necessary for messages other than progress indicators, and introduces unwanted characters in the /events output.
Fixes #6203 .
Docker-DCO-1.1-Signed-off-by: Arnaud Porterie <icecrime@gmail.com > (github: icecrime)
2014-06-17 22:40:34 +02:00
Michael Crosby
9e2cc4fcd9
Add security message to readme
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-06-17 13:26:26 -07:00
Michael Crosby
698ded75b9
Update libcontainer dependency to 77ffd49dfedbc78a
...
Fixes #6256
Fixes #6383
Fixes #6414
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-06-17 13:09:36 -07:00
Vincent Batts
4902f047d3
adding a little uniqueness, to wrapped errors.
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-06-17 16:07:34 -04:00
Arnaud Porterie
d0c4e44863
Refactor events publishing
...
Events subscription (/events API endpoint) attributes pseudo-unique identifiers to incoming subscribers: originally its host, then its subscription time. This is unecessary and leads to code complexity.
Introduce a JSONMessagePublisher to provide simple pub/sub mechanism for JSONMessage, and rely on this new type to publish events to all subscribed listeners. The original logic is kept for the 'since' and 'until' parameters, and for client disconnection handling.
Docker-DCO-1.1-Signed-off-by: Arnaud Porterie <icecrime@gmail.com > (github: icecrime)
2014-06-17 21:56:22 +02:00
Alexandr Morozov
cc42eeac21
Move TestBuildAddToSymlinkDest to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-17 23:44:30 +04:00
O.S. Tezer
52edbe6a23
Merge pull request #6356 from mattyw/master
...
fixed a broken link in the readme
2014-06-17 11:00:46 -07:00
mattyw
d4ec4d6e9b
fixed a broken link in the docs
...
Docker-DCO-1.1-Signed-off-by: Matt Williams <lp@mattyw.net > (github: mattyw)
2014-06-17 18:36:59 +01:00
Julien Bordellier
207d7807af
Now using the nginx docker image instead of the apache one. dotcloud/docker/issues/6374
...
Docker-DCO-1.1-Signed-off-by: Julien Bordellier <me@julienbordellier.com > (github: jstoja)
2014-06-18 00:38:04 +08:00
James Turnbull
bf9482987f
Merge pull request #6470 from adelton/dns-no-hostname
...
The docker run --dns does not resolve hostname and having hostname in resolv.conf does not work.
2014-06-17 10:13:12 -05:00
James Turnbull
0ba7f934ee
Merge pull request #6473 from leeplay/userguide
...
fix missing TAG for docker run
2014-06-17 06:23:06 -05:00
James Turnbull
087acccf0c
Merge pull request #6469 from mariusv/patch-1
...
fixed Automated Build page link
2014-06-17 06:16:35 -05:00
kyu
cac97b6bd8
fix wrong command
2014-06-17 17:49:34 +09:00
Jan Pazdziora
e278082c21
The docker run --dns does not resolve hostname and having hostname in resolv.conf does not work.
...
Docker-DCO-1.1-Signed-off-by: Jan Pazdziora <jpazdziora@redhat.com > (github: adelton)
2014-06-17 09:40:59 +02:00
Alexandr Morozov
690711b584
Move TestBuildOnBuildForbiddenMaintainerTrigger to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-17 11:39:47 +04:00
Alexandr Morozov
1c8ec01c55
Move TestBuildOnBuildForbiddenFromTrigger to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-17 11:36:45 +04:00
Marius Voila
2ed8b22099
fixed Automated Build page link
...
Corrected the link in the Automated Builds page from https://registry.hub.docker.io/builds/ to https://registry.hub.docker.com/builds/ as the *.io is not working
2014-06-17 08:24:56 +01:00
Alexandr Morozov
1e0e86360f
Move TestBuildOnBuildForbiddenChainedTrigger to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-17 11:24:47 +04:00
Alexandr Morozov
2629e2ec23
Move TestBuildOnBuildTrigger to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-17 11:14:45 +04:00
Alexandr Morozov
08a10f936b
Move TestBuildFailsDockerfileEmpty to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-17 11:06:44 +04:00
Alexandr Morozov
d3023f25f5
Move TestBuildFails to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-17 11:06:40 +04:00
Alexandr Morozov
f1d7ed35bd
Move TestBuildInheritance to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-17 11:05:45 +04:00
Alexandr Morozov
62d97afaf8
Move TestBuildADDFileNotFound to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-17 11:05:36 +04:00
Alexandr Morozov
686786f107
Move TestForbiddenContextPath to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-17 10:38:45 +04:00
Alexandr Morozov
c5b82f5e8d
Move TestBuildEntrypointRunCleanup to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-17 10:16:36 +04:00
Guilherme Salgado
c44c98edec
Convert TestGetContainersByName into a unit test
...
Docker-DCO-1.1-Signed-off-by: Guilherme Salgado <gsalgado@gmail.com > (github: gsalgado)
2014-06-17 07:56:57 +02:00
O.S. Tezer
da327c8fa3
Merge pull request #6464 from SvenDowideit/pr_out_exclaimation_marks_cause_shell_pain_simplify_it_away
...
exclaimation marks cause shell pain - simplify it away
2014-06-16 18:13:24 -07:00
Victor Vieux
6228761f67
add a test using the flags
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-17 01:05:13 +00:00
Victor Vieux
614c57c521
improve test
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-17 00:59:51 +00:00
SvenDowideit
21849f1a21
exclaimation marks cause shell pain - simplify it away
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-06-17 10:49:23 +10:00
Sven Dowideit
5e8402568e
Merge pull request #6462 from SvenDowideit/pr_out_fixup_small_formatting
...
fixup small formatting
2014-06-17 10:41:58 +10:00
SvenDowideit
7e9fbbba1c
fixup small formatting
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-06-17 10:39:12 +10:00
Richard Harvey
2c5405f699
Updated Viewing App when on OSX
...
Added section to show how to get IP address and view running python app if the user is using boot2docker on OSX
Docker-DCO-1.1-Signed-off-by: Richard Harvey <richard@squarecows.com > (github: richarvey)
Docker-DCO-1.1-Signed-off-by: Richard Harvey <richard@squarecows.com > (github: SvenDowideit)
2014-06-17 10:39:11 +10:00
Sven Dowideit
b3e80c6935
Merge pull request #6438 from jamtur01/opts
...
Fixed DOCKER_OPTS
2014-06-17 10:16:07 +10:00
Michael Crosby
742d8bf922
Merge pull request #6417 from mrunalp/dev/system_prctl
...
Add helper function to make prctl system call.
2014-06-16 17:13:06 -07:00
Victor Vieux
3e4e8636c1
do not alter json in docker save
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-17 00:06:21 +00:00
Sven Dowideit
8f6162f17b
Merge pull request #6240 from pmorie/docs
...
Add ApiVersion to doc example for remote API 1.12 /version
2014-06-17 09:21:21 +10:00
Sven Dowideit
d5f7b4df1b
Merge pull request #6306 from mheon/fix_manpage_issue
...
Update documentation for docker pull
2014-06-17 09:13:29 +10:00
Sven Dowideit
95ca361df6
Merge pull request #6459 from ostezer/issue-5036-main-nav-top-level-click
...
Issue #5036 -> Click on nav bar goes to top level doc
2014-06-17 09:08:37 +10:00
Sven Dowideit
4e2cf53f4f
Merge pull request #6449 from timthelion/host-net-docs
...
Document the potential insecurity of --net host
2014-06-17 09:06:27 +10:00
Victor Vieux
d671768b52
Merge pull request #6430 from LK4D4/lock_inspect
...
Do inspect under container lock
2014-06-16 15:31:08 -07:00
Victor Vieux
06248d745a
update MAINTAINERS files
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-16 22:20:07 +00:00
James Turnbull
69a1f53e70
Merge pull request #6458 from ostezer/docs-code-block-scrolling
...
Issue #5279 -> Introduce horizontal scrolling to code-blocks
2014-06-16 16:14:17 -05:00
O.S. Tezer
8ae966de75
Issue #5036 -> Click on nav bar goes to top level doc
...
Closes issue #5036
This commit redirects the reader to top level doc upon clicking
on a main nav. menu item (eg. Installation [click] -> Mac OS X)
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-06-16 13:51:56 -07:00
Timothy
ed5054389a
Document the potential insecurity of --net host
...
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
2014-06-16 20:40:07 +00:00
O.S. Tezer
7a7bb43db5
Issue #5279 -> Introduce horizontal scrolling to code-blocks
...
Closes issue #5279
This commit re-introduces horizontal scrolling to docs' codeblocks
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-06-16 13:29:20 -07:00
Matthew Heon
03ae463c8d
Updated CLI documentation for docker pull with notes on specifying URL
...
Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com > (github: mheon)
2014-06-16 15:58:05 -04:00
Tianon Gravi
a6ce867e48
Merge pull request #6425 from tianon/fix-man-page-spelling-errors
...
Fix several man page spelling errors
2014-06-16 13:24:10 -06:00
Matthew Heon
aab9078ff9
Updated docker pull manpage to reflect ability to specify URL of registry.
...
Also fixed a typo in same file.
Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com > (github: mheon)
2014-06-16 15:13:47 -04:00
James Turnbull
4e20407d82
Merge pull request #6304 from glyn/mac-build-no-sudo
...
Do not build using sudo on Mac OS X
2014-06-16 09:45:52 -04:00
Glyn Normington
1c05ddd645
Do not build using sudo on Mac OS X
...
Building using sudo fails on Mac OS X, but is necessary on Linux.
See https://groups.google.com/d/topic/docker-dev/1EW_pfA1t9o/discussion for discussion.
Docker-DCO-1.1-Signed-off-by: Glyn Normington <gnormington@gopivotal.com > (github: glyn)
2014-06-16 14:39:48 +01:00
Solomon Hykes
f83c873d8b
Merge pull request #6448 from shykes/pr_out_guillaume_is_busy_full_time_on_his_new_business_and_no_longer_available_as_a_maintainer
2014-06-16 06:25:19 -07:00
Solomon Hykes
41d437117d
Guillaume is busy full-time on his new business, and no longer available
...
as a maintainer.
Best of luck on your e-commerce business Guillaume, and thanks for all
the great contributions!
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-06-16 06:22:15 -07:00
James Turnbull
7085ec875f
Merge pull request #6443 from catharsis/patch-1
...
dockervolumes: Fix a minor typo
2014-06-16 09:09:32 -04:00
Sven Dowideit
2b468dc283
Merge pull request #6437 from jamtur01/net
...
Fixed headers and ' characters
2014-06-16 20:19:03 +10:00
Anton Löfgren
8df0b12d82
dockervolumes: Fix a minor typo
2014-06-16 09:52:23 +02:00
James Turnbull
50d49d0db8
Merge pull request #6378 from evanderkoogh/patch-1
...
Linking containers added to API example
2014-06-15 20:29:50 -04:00
O.S. Tezer
50fde602a1
Merge pull request #6433 from soulshake/small-typos
...
Fix spelling and grammar errors; remove seemingly out-of-place words
2014-06-15 11:36:19 -07:00
James Turnbull
8ca34e4b5e
Merge pull request #6440 from marcuslinke/patch-1
...
docker-java has moved to new location
2014-06-15 14:24:44 -04:00
marcuslinke
520163a00e
docker-java has moved to new location
2014-06-15 20:16:51 +02:00
James Turnbull
0b97725340
Fixed DOCKER_OPTS
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-06-15 12:26:52 -04:00
James Turnbull
4adab34dfa
Fixed headers and ' characters
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-06-15 12:15:59 -04:00
AJ Bowen
be9dcbbef5
Fix spelling and grammar errors; remove seemingly out-of-place words
...
Docker-DCO-1.1-Signed-off-by: AJ Bowen <aj@gandi.net > (github: soulshake)
2014-06-15 01:18:11 +02:00
Sven Dowideit
c4327f7146
Merge pull request #6431 from mika/mika/typos
...
Fix several typos
2014-06-15 07:51:48 +10:00
Michael Prokop
c0c58b6b46
Fix several typos
...
Docker-DCO-1.1-Signed-off-by: Michael Prokop <github@michael-prokop.at > (github: mika)
2014-06-14 23:16:30 +02:00
LK4D4
947405a909
Do inspect under container lock
...
It fixes some race conditions
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-14 21:08:23 +04:00
James Turnbull
93bf556f13
Merge pull request #6429 from mika/patch-1
...
Fix missing leading slash for /bin/bash executable
2014-06-14 11:07:38 -04:00
Michael Prokop
e9f1f760f2
Fix missing leading slash for /bin/bash executable
2014-06-14 15:54:27 +02:00
Tianon Gravi
e02cf69789
Fix contrib/man/md/docker-import.1.md warning ("macro `tar.gz,' not defined")
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-06-14 01:59:52 -06:00
Tianon Gravi
cb92c47144
Fix several man page spelling errors
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-06-14 01:49:51 -06:00
Tianon Gravi
d561fe6d2d
Fix minor bug in contrib/man/md/md2man-all.sh causing the creation of contrib/man/manREADME
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-06-14 01:44:55 -06:00
O.S. Tezer
c40602b254
Merge pull request #6386 from cpuguy83/fix_link_docs
...
Adds info on how to get env vars from container
2014-06-13 23:12:32 -07:00
Fred Lifton
1a441d9aea
Fixed whitespace errors
2014-06-13 17:08:53 -07:00
O.S. Tezer
821d3aab65
Merge pull request #6421 from nathanleclaire/doc_fix
...
Note user name and password in docs on boot2docker
2014-06-13 16:03:39 -07:00
Nathan LeClaire
073382a9c6
Note user name and password in docs on boot2docker
...
Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathan.leclaire@docker.com > (github: nathanleclaire)
2014-06-13 15:38:45 -07:00
O.S. Tezer
77b09a6a19
Merge pull request #6416 from danielnorberg/dano/docs-spotify-client
...
docs: add spotify docker-client link
2014-06-13 12:08:17 -07:00
Mrunal Patel
65567e125d
Add helper function to make prctl system call.
...
Docker-DCO-1.1-Signed-off-by: Mrunal Patel <mrunalp@gmail.com > (github: mrunalp)
2014-06-13 11:49:57 -07:00
Daniel Norberg
27b2d7ff72
docs: add spotify docker-client link
...
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com > (github: danielnorberg)
2014-06-13 14:20:31 -04:00
LK4D4
eb97163348
Increase time before exit in TestMultipleAttachRestart
...
Sometimes third attacher attaching to already stopped container.
Also I've changed prefix to attach and fixed cleanup on Fatal.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-13 21:40:30 +04:00
James Turnbull
7b366b1f01
Merge pull request #6411 from alazaro/patch-1
...
Fix typo
2014-06-13 08:15:29 -07:00
Álvaro Lázaro
52e88d92f0
Fix typo
2014-06-13 15:53:42 +02:00
Alexander Larsson
05243104fc
Add support for client certificates for registries
...
This lets you specify custom client TLS certificates and CA root for a
specific registry hostname. Docker will then verify the registry
against the CA and present the client cert when talking to that
registry. This allows the registry to verify that the client has a
proper key, indicating that the client is allowed to access the
images.
A custom cert is configured by creating a directory in
/etc/docker/certs.d with the same name as the registry hostname. Inside
this directory all *.crt files are added as CA Roots (if none exists,
the system default is used) and pair of files <filename>.key and
<filename>.cert indicate a custom certificate to present to the registry.
If there are multiple certificates each one will be tried in
alphabetical order, proceeding to the next if we get a 403 of 5xx
response.
So, an example setup would be:
/etc/docker/certs.d/
└── localhost
├── client.cert
├── client.key
└── localhost.crt
A simple way to test this setup is to use an apache server to host a
registry. Just copy a registry tree into the apache root, here is an
example one containing the busybox image:
http://people.gnome.org/~alexl/v1.tar.gz
Then add this conf file as /etc/httpd/conf.d/registry.conf:
# This must be in the root context, otherwise it causes a re-negotiation
# which is not supported by the tls implementation in go
SSLVerifyClient optional_no_ca
<Location /v1>
Action cert-protected /cgi-bin/cert.cgi
SetHandler cert-protected
Header set x-docker-registry-version "0.6.2"
SetEnvIf Host (.*) custom_host=$1
Header set X-Docker-Endpoints "%{custom_host}e"
</Location>
And this as /var/www/cgi-bin/cert.cgi
#!/bin/bash
if [ "$HTTPS" != "on" ]; then
echo "Status: 403 Not using SSL"
echo "x-docker-registry-version: 0.6.2"
echo
exit 0
fi
if [ "$SSL_CLIENT_VERIFY" == "NONE" ]; then
echo "Status: 403 Client certificate invalid"
echo "x-docker-registry-version: 0.6.2"
echo
exit 0
fi
echo "Content-length: $(stat --printf='%s' $PATH_TRANSLATED)"
echo "x-docker-registry-version: 0.6.2"
echo "X-Docker-Endpoints: $SERVER_NAME"
echo "X-Docker-Size: 0"
echo
cat $PATH_TRANSLATED
This will return 403 for all accessed to /v1 unless *any* client cert
is presented. Obviously a real implementation would verify more details
about the certificate.
Example client certs can be generated with:
openssl genrsa -out client.key 1024
openssl req -new -x509 -text -key client.key -out client.cert
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-06-13 11:13:18 +02:00
Michael Crosby
51b188c510
Merge pull request #6214 from LK4D4/fix_some_more_race_conditions
...
Fix some more race conditions
2014-06-12 15:17:10 -07:00
Tibor Vass
8091157038
Merge pull request #6391 from vieux/fix_hostname_file_net_host
...
fix hostname generation with --net=host
2014-06-12 14:11:26 -07:00
Michael Crosby
d871725cf2
Merge pull request #6381 from glyn/prod-ready
...
Remove "production ready" from the roadmap
2014-06-12 14:02:51 -07:00
Victor Vieux
f9f6379a53
Merge pull request #6360 from vieux/remove_beam
...
remove unused beam, will be back later as libchan
2014-06-12 13:55:53 -07:00
Victor Vieux
15243cdbde
Merge pull request #6365 from vieux/allow_net_none_h
...
Allow --net=none and -h
2014-06-12 12:26:54 -07:00
Victor Vieux
f5979b9d0d
add hostname generation with --net=host
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-12 19:20:57 +00:00
Victor Vieux
9494643bf1
add test
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-12 19:11:51 +00:00
Michael Crosby
a8d6d28be4
Merge pull request #6307 from W4RH4WK/master
...
restore logo for README.md
2014-06-12 10:21:10 -07:00
Brian Goff
fbf7815b25
Adds info on how to get env vars from container
...
Currently the docs just say "let's go into the container and look at the
env vars", but doesn't show how to do it. It is also not currently
possible to enter the container as it is written in the doc
( container started with app.py and then somehow later on we have a
shell in the same container )
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-06-12 09:26:55 -07:00
Glyn Normington
784a008346
Remove "production ready" from the roadmap
...
It's done as of v1.0.0.
Docker-DCO-1.1-Signed-off-by: Glyn Normington <gnormington@gopivotal.com > (github: glyn)
2014-06-12 14:21:20 +01:00
evanderkoogh
0bdadfe4e7
Linking containers added to API example
...
Linking containers was not covered in the API documentation. I looked it up in the client source code and testing it manually.
2014-06-12 17:15:14 +08:00
O.S. Tezer
dbee7dd69e
Merge pull request #6372 from ostezer/docs-fix-logged-in-hdr
...
Docs: Fixed logged-in header username label target
2014-06-12 01:17:38 -07:00
Johan Euphrosine
338e87f6b3
api/server/MAINTAINERS: add proppy and vieux
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-06-12 00:54:35 -07:00
Tianon Gravi
3b9e8679db
Merge pull request #6361 from asbjornenge/tmlang_copy
...
Add contribute/syntax highlight for the COPY instruction
2014-06-12 00:06:51 -07:00
Asbjørn Enge
cb47ddd968
Added highlight for the COPY instruction
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net > (github: asbjornenge)
2014-06-12 08:25:09 +02:00
O.S. Tezer
4ccd91f0d8
Docs: Fixed logged-in header username label target
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-06-11 18:09:43 -07:00
Jérôme Petazzoni
a084f4bc61
Select masquerade by outgoing interface rather than by destination subnet
...
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com > (github: jpetazzo)
2014-06-11 17:09:19 -07:00
Michael Crosby
c99ee556d4
Merge pull request #6060 from dineshs-altiscale/maintainers
...
Add Dinesh Subhraveti to MAINTAINERS
2014-06-11 14:37:01 -07:00
Victor Vieux
6cb16f1c31
add tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-11 21:15:48 +00:00
Victor Vieux
f411f8bfc5
Allow --net=none & -h
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-11 21:07:50 +00:00
Johan Euphrosine
37115ffb00
MAINTAINERS: add proppy for google.md
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-06-11 13:55:47 -07:00
Victor Vieux
384b60b940
remove unused beam, will be back later as libchan
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-11 19:09:55 +00:00
Michael Crosby
9ac293e1a8
Merge pull request #6335 from levigross/master
...
Fixed up if statement
2014-06-11 11:51:57 -07:00
Michael Crosby
6c953a3059
Merge pull request #6357 from crosbymichael/vendor-libcontainer
...
Vendor libcontainer
2014-06-11 10:57:39 -07:00
unclejack
8f909221f5
Merge pull request #6277 from philips/remove-unneeded-time-duration
...
registry: remove unneeded time.Duration()
2014-06-11 20:33:22 +03:00
James Turnbull
96c03d6d92
Merge pull request #6351 from lenw/patch-1
...
minor spelling fix
2014-06-11 06:55:33 -07:00
James Turnbull
a092f979d4
Merge pull request #6349 from chrismckinnel/master
...
Fix some bullet points so they render correctly.
2014-06-11 06:54:44 -07:00
Alexandr Morozov
a1b7a35c90
Fix race in LogEvent
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-11 15:23:33 +04:00
Alexandr Morozov
fa7c8d523e
Fix race in get/set HostConfig
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-11 15:23:33 +04:00
Alexandr Morozov
0b3fe55442
Fix race in contStore.List
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-11 15:23:33 +04:00
Len Weincier
db00e224c2
minor spelling fix
2014-06-11 13:16:53 +02:00
Alexandr Morozov
b1bae92534
Don't exit on eof in header reading in stdcopy
...
There was random lines drops in docker logs because of this
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-11 15:13:31 +04:00
chrismckinnel
a247af9c97
Fix some bullet points so they render correctly.
2014-06-11 11:44:30 +01:00
Michael Crosby
d1757c005f
Use libcontainer version tag for vendor script
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-10 20:23:05 -07:00
Michael Crosby
8194556337
Update libcontainer imports
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-10 19:58:15 -07:00
Michael Crosby
8a8b6d7964
Remove and vendor libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-10 19:49:57 -07:00
James Turnbull
4cf40c968f
Merge pull request #6339 from ostezer/docs-fix-css-title-conflict
...
docs: Fix docs' styling conflict with common names
2014-06-10 13:40:22 -07:00
O.S. Tezer
cb40e3302e
docs: Fix docs' styling conflict with common names
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Closes issue #6329
2014-06-10 11:18:20 -07:00
James Turnbull
9a7bd6d95b
Merge pull request #6322 from crucerucalin/master
...
Repaired broken links in docs/sources/faq.md
2014-06-10 08:46:42 -07:00
Sven Dowideit
9254a62cd6
Merge pull request #6315 from erikh/ubuntu-latest-install-docs
...
Improve documentation on Ubuntu for getting the latest release of docker.
2014-06-11 00:54:52 +10:00
Sven Dowideit
b83a171f9e
Merge pull request #6300 from whatthejeff/patch-1
...
Avoid history expansion.
2014-06-11 00:49:29 +10:00
Tianon Gravi
5ff3a28cb4
Merge pull request #6252 from tianon/update-check-config
...
Update contrib/check-config.sh to check for CGROUP_FREEZER and to use /proc/mounts
2014-06-10 08:09:34 -06:00
Levi Gross
a7b60b21de
Fixed up if statement
...
Signed-off-by: Levi Gross <levi@levigross.com >
Docker-DCO-1.1-Signed-off-by: Levi Gross <levi@levigross.com > (github: levigross)
2014-06-10 10:02:00 -04:00
Cruceru Calin-Cristian
53802d54d6
Repaired broken links
...
Docker-DCO-1.1-Signed-off-by: Calin Cruceru <crucerucalincristian@gmail.com > (github: crucerucalin)
2014-06-10 08:21:12 +03:00
Erik Hollensbe
7ab1a90e59
Improve documentation on Ubuntu for getting the latest release of
...
docker.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-06-09 18:31:46 -07:00
unclejack
fb2ac5bedb
Merge pull request #6317 from crosbymichael/libcontainerdep
...
Move libcontainer deps into libcontainer
2014-06-10 03:16:15 +03:00
Michael Crosby
bae6a5a616
Gofmt imports
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-09 16:01:57 -07:00
Michael Crosby
6158ccad97
Move libcontainer deps into libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-09 15:52:12 -07:00
Jeff Welch
052ad32a7b
Avoid history expansion.
...
Docker-DCO-1.1-Signed-off-by: Jeff Welch <whatthejeff@gmail.com > (github: whatthejeff)
2014-06-09 17:30:34 -04:00
Alex Warhawk
cacb5c0dde
restore logo for README.md
...
Docker-DCO-1.1-Signed-off-by: Alex Hirsch <ax.warhawk@gmail.com > (github: W4RH4WK)
2014-06-09 22:15:13 +02:00
Bryan Murphy
e827c8ff61
Add integration test for history command and fix bug where history
...
would occasionally be returned in the incorrect order if sequential
layers had the same created time.
Docker-DCO-1.1-Signed-off-by: Bryan Murphy <bmurphy1976@gmail.com > (github: bmurphy1976)
2014-06-09 10:45:54 -05:00
Michael Crosby
fd32fc8062
Merge pull request #6305 from crosbymichael/merge_release_v1.0.0
...
Merge release v1.0.0
2014-06-09 07:17:43 -07:00
Michael Crosby
faf5ef6f80
Change version to v1.0.0-dev
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-09 07:14:51 -07:00
Michael Crosby
07e9ac9ffe
Merge branch 'release' into merge_release_v1.0.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-09 07:14:40 -07:00
Michael Crosby
d9939758e6
Merge pull request #6303 from crosbymichael/bump_v1.0.0
...
Bump version to v1.0.0
2014-06-09 07:12:42 -07:00
James Turnbull
5dc6339e33
Merge pull request #6302 from Costent/patch-1
...
Update windows.md
2014-06-09 06:14:16 -07:00
William Riancho
875d0b776d
Update windows.md
...
Replace "OS X" by "Windows"
2014-06-09 11:23:54 +02:00
Sven Dowideit
e2fce7d612
Merge pull request #6299 from jamtur01/12link
...
Fixed API 1.12 links and misc other fixes
2014-06-08 18:06:27 -07:00
James Turnbull
135ced208c
Merge pull request #6297 from jamtur01/hub
...
Updated Docker Hub documentation
2014-06-08 18:03:28 -07:00
James Turnbull
871299de0d
Updated Docker Hub documentation
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-06-08 18:01:44 -07:00
James Turnbull
11fee48c2d
Fixed API 1.12 links and misc other fixes
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-06-08 17:59:22 -07:00
James Turnbull
3b0ae3ec68
Merge pull request #6298 from fredlf/copyedits
...
Edits to Win and OSX install
2014-06-08 17:56:34 -07:00
Fred Lifton
9e2e8188ae
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredfl)
2014-06-08 17:36:49 -07:00
Fred Lifton
9bc75d008e
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredfl)
2014-06-08 17:35:49 -07:00
Sven Dowideit
a43cebf088
Merge pull request #6295 from ostezer/docs-ref-index-hub
...
Docs: Rename index with hub for ref. section
2014-06-08 16:47:48 -07:00
Sven Dowideit
83b446492c
Merge pull request #6265 from fredlf/copyedits
...
Copyedits
2014-06-08 16:47:12 -07:00
Fred Lifton
4fd9cc9980
Copy edits to Understanding Docker
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredfl)
2014-06-08 16:46:31 -07:00
Michael Crosby
63fe64c471
Bump to version v1.0.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-08 16:42:30 -07:00
Michael Crosby
9722c66dad
Merge branch 'master' into bump_v1.0.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-08 16:40:19 -07:00
O.S. Tezer
b0a46d1cb9
Docs: Rename index with hub for ref. section
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-06-08 16:34:47 -07:00
unclejack
e570987c4f
Merge pull request #6293 from vieux/fix_version_decode
...
Fix version numbering
2014-06-09 02:23:27 +03:00
Sven Dowideit
c740c76017
Merge pull request #6294 from SvenDowideit/simplify-windows-networking-docs
...
Simplify the windows docs and fix formatting
2014-06-08 16:14:54 -07:00
SvenDowideit
744d39a466
Simplify the windows docs and fix formatting
...
The mention of NAT is confusing for those coming from pre-host-only networking b2d
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-06-09 09:10:41 +10:00
Sven Dowideit
23cc3e5c63
Merge pull request #6292 from ostezer/docs-merge-on-builds
...
Docs: Fix merge issue on docker-hub/builds.md
2014-06-08 16:09:56 -07:00
Victor Vieux
e975687b9a
fix version numbering
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-08 23:06:47 +00:00
O.S. Tezer
c37b4828dd
Docs: Fix merge issue on docker-hub/builds.md
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-06-08 16:05:07 -07:00
Sven Dowideit
23bdb3b3a6
Merge pull request #6291 from jamtur01/mac
...
Fixed issues in Mac or Windows
2014-06-08 15:56:52 -07:00
James Turnbull
bb7baf1835
Fixed issues in Mac or Windows
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-06-08 15:53:20 -07:00
Sven Dowideit
4dc5315e3b
Merge pull request #6289 from jamtur01/dev
...
Removed re-appearing production warnings
2014-06-08 15:36:17 -07:00
James Turnbull
7842630480
Removed re-appearing production warnings
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-06-08 15:35:32 -07:00
James Turnbull
d87fdaa1e3
Merge pull request #6287 from jamtur01/userguide
...
Initial links
2014-06-08 14:57:40 -07:00
James Turnbull
ef364f7e1f
Initial links
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-06-08 14:54:32 -07:00
James Turnbull
c9f216d2fa
Merge pull request #6284 from SvenDowideit/remove-table-of-contents-eyebrow
...
Remove the 'TABLE OF CONTENTS' header
2014-06-08 14:22:09 -07:00
James Turnbull
b737837882
Merge pull request #6264 from SvenDowideit/add-osx-boot2docker-start
...
add an image to show the use of the Docker OSX applet
2014-06-08 14:03:42 -07:00
Thatcher
3cb59c5140
Merge pull request #6285 from ostezer/docs-new-style-improvements
...
Docs: Remove unused font and fix navigation links
2014-06-08 13:59:49 -07:00
O.S. Tezer
55d645246a
Docs: Remove unused font and fix navigation links
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-06-08 13:57:34 -07:00
Sven Dowideit
90251a488d
add an image to show the use of the Docker OSX applet
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-06-09 06:51:13 +10:00
Sven Dowideit
f72a31ae31
Merge pull request #6283 from huslage/doc-videos
...
Videos for installing b2d
2014-06-08 13:44:21 -07:00
SvenDowideit
8e851aaa27
Remove the 'TABLE OF CONTENTS' header
...
Its tricked a number of readers, as its not a TOC, its just local to the
current topic. Now that the docs are not mobile responsive its not an
active UI element either.
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-06-09 06:21:07 +10:00
Aaron Huslage
fa7946a510
Videos for installing b2d
...
Mac and Windows video embeds from YouTube
Docker-DCO-1.1-Signed-off-by: Aaron Huslage <huslage@gmail.com > (github: huslage)
2014-06-08 13:11:50 -07:00
James Turnbull
faeede0200
Merge pull request #6282 from jobrieniii/patch-3
...
Update usingdocker.md
2014-06-08 12:14:05 -07:00
John OBrien III
862d3eb284
Update usingdocker.md
...
Added container name `nostalgic_morse` to end of `inspect -f` example
2014-06-08 15:12:00 -04:00
James Turnbull
8ac4261263
Merge pull request #6281 from jobrieniii/patch-2
...
Update usingdocker.md
2014-06-08 12:05:36 -07:00
James Turnbull
8349e282a9
Merge pull request #6275 from ostezer/docs-design-dev
...
Docker Docs styling overhaul
2014-06-08 12:03:59 -07:00
John OBrien III
2337f52999
Update usingdocker.md
...
Just noticed `sudo` missing on line 232. (Learning so doing lots of copying / pasting)
2014-06-08 14:58:13 -04:00
James Turnbull
1ecb170352
Merge pull request #6280 from jobrieniii/patch-1
...
Update dockerizing.md
2014-06-08 11:51:53 -07:00
John OBrien III
d6c494671f
Update dockerizing.md
2014-06-08 14:37:58 -04:00
James Turnbull
5b85dc3584
Merge pull request #6279 from sebastienhouzet/patch-3
...
Update dockervolumes.md
2014-06-08 11:33:06 -07:00
Sébastien
752c3e9208
Update dockervolumes.md
...
Error on title note :)
2014-06-08 20:31:10 +02:00
James Turnbull
7992fb5911
Merge pull request #6278 from sebastienhouzet/patch-2
...
Update dockerimages.md
2014-06-08 11:25:22 -07:00
O.S. Tezer
38daa47ee2
Docker Docs styling overhaul
...
This commit/PR changes docs' styling with Docker general styling
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-06-08 11:18:24 -07:00
Sébastien
5f9a673025
Update dockerimages.md
...
Error on title Note.
2014-06-08 20:15:31 +02:00
Brandon Philips
4a3b36f443
registry: remove unneeded time.Duration()
...
These constants don't need to use time.Duration(). Fixup this file since
it seems to be the only one using this style.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-06-08 11:04:06 -07:00
James Turnbull
1151f9ef9e
Merge pull request #6272 from sebastienhouzet/patch-1
...
Update dockerizing.md
2014-06-08 08:39:42 -07:00
Sébastien
31e8993d57
Update dockerizing.md
...
Error on title Note :)
2014-06-08 17:25:53 +02:00
O.S. Tezer
259d714b93
Merge pull request #6235 from zdover23/06_Jun_2014
...
Fixed docker commit man page typos
2014-06-07 23:15:39 -07:00
Zac Dover
8f99875d03
BZ#1104401
...
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com > (github: zdover23)
2014-06-08 14:15:37 +10:00
Michael Crosby
cfd209fd6e
Merge pull request #6260 from vieux/disable_timeout_on_push
...
Disable timeout for push
2014-06-07 17:24:43 -07:00
Victor Vieux
8baafacf40
Disable timeout for push
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-07 23:48:25 +00:00
unclejack
a2c08792f0
Merge pull request #6258 from crosbymichael/capkill
...
Add CAP_KILL to unprivileged containers
2014-06-08 01:37:28 +03:00
Michael Crosby
fa72eb3a58
Add CAP_KILL to unprivileged containers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-07 15:18:18 -07:00
Johan Euphrosine
39320f9393
utils: add test for TimeoutConn
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-06-07 15:11:57 -07:00
unclejack
94dc07c044
Merge pull request #6255 from vieux/improve_trusted_detection
...
improve trusted location detection
2014-06-08 00:28:18 +03:00
Victor Vieux
daa89c420c
improve trusted location detection
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-07 21:17:56 +00:00
James Turnbull
f7e4546af0
Merge pull request #6241 from proppy/fix-google-docs
...
docs/google: fix code blocks
2014-06-07 09:54:21 -07:00
Tianon Gravi
a59e1949b5
Update contrib/check-config.sh to check for CGROUP_FREEZER (which is newly required), and to use /proc/mounts for checking if we have a cgroup hierarchy instead of using /proc/$$/mountinfo (which on systemd might not list the cgroup hierarchy)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-06-07 08:43:40 -06:00
Solomon Hykes
0c611d9b15
Mention bugfixes in 0.12 changelog
2014-06-06 13:31:10 -07:00
Johan Euphrosine
e2119f3050
docs/google: fix code blocks
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-06-06 13:11:21 -07:00
Paul Morie
92f46d233e
Docs: add ApiVersion to /version for remote API 1.12
...
Docker-DCO-1.1-Signed-off-by: Paul Morie <pmorie@gmail.com > (github: pmorie)
2014-06-06 15:13:25 -04:00
Victor Vieux
5d07362a84
Merge pull request #6238 from tiborvass/merge_release_v0.12.0
...
Merge release v0.12.0
2014-06-06 11:55:50 -07:00
Tibor Vass
c95f77866c
Change version to 0.12.0-dev
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-06-06 11:45:57 -07:00
Michael Crosby
c624caa949
Merge pull request #6230 from tiborvass/bump_v0.12.0
...
Bump version to v0.12.0
2014-06-06 11:41:06 -07:00
Tibor Vass
14680bf724
Bump version to v0.12.0
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-06-05 17:59:19 -07:00
Tibor Vass
c06f32a7b9
Merge pull request #6228 from vieux/fix_restart_links
...
Fix restart links
2014-06-05 17:54:27 -07:00
Victor Vieux
30ba7546cb
add wait4 after kill
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-06 00:32:14 +00:00
Victor Vieux
34bd2d6229
start containers after all of them are registered
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-06 00:31:58 +00:00
James Turnbull
98d44ac491
Merge pull request #6226 from fredlf/copyedits
...
More minor copy edits, typo fix.
2014-06-05 17:07:18 -07:00
Tianon Gravi
c6dc8275b2
Merge pull request #6227 from crosbymichael/fix-test-compile
...
Don't compile nsinit during tests (it has package main)
2014-06-05 18:06:31 -06:00
Michael Crosby
3986bc659b
Don't compile nsinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-05 17:03:32 -07:00
Fred Lifton
762c528501
More minor copy edits, typo fix.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredfl)
2014-06-05 16:55:32 -07:00
Michael Crosby
acb9f156fd
Merge pull request #6207 from crosbymichael/nsinit-cli
...
Make nsinit nicer to work with libcontainer
2014-06-05 16:51:31 -07:00
Michael Crosby
c239c8ad9d
Merge pull request #6221 from crosbymichael/no-unmount
...
Move remount as private to the graph drivers
2014-06-05 16:51:10 -07:00
Michael Crosby
3609b051b8
Move remount as private to the graph drivers
...
If this is at the root directory for the daemon you could unmount
somones filesystem when you stop docker and this is actually only needed
for the palces that the graph drivers mount the container's root
filesystems.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-05 16:02:25 -07:00
Tibor Vass
9329c0d2e0
Merge pull request #6224 from tiborvass/storage-options
...
Add --storage-opt daemon option and some devicemapper option (with fixes)
2014-06-05 16:00:03 -07:00
unclejack
2f72fdf6ea
Merge pull request #6145 from shykes/pr_out_pkg_testutils_utility_functions_to_facilitate_writing_go_tests
...
pkg/testutils: utility functions to facilitate writing Go tests
2014-06-06 01:26:53 +03:00
James Turnbull
19ef3ff112
Merge pull request #6182 from mheon/fix_manpage_issue
...
Clarify manpages on docker start
2014-06-05 15:15:50 -07:00
Tibor Vass
b1ac791d84
Ensures files get closed properly. Closes #6213
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-06-05 15:13:43 -07:00
Sven Dowideit
a2c553bd6b
Merge pull request #6219 from cpuguy83/fix_ssh_example_docs_root_login
...
Fixes broken ssh server example
2014-06-05 15:02:43 -07:00
Sven Dowideit
64ce33268c
Merge pull request #6222 from SvenDowideit/pr_out_reflow_to_80_columns
...
Initial edits to home page
2014-06-05 14:58:29 -07:00
SvenDowideit
abcb724ed9
reflow to 80 columns
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-06-06 07:58:05 +10:00
Fred Lifton
09b19752e0
Initial copy edits to home page.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: SvenDowideit)
2014-06-06 07:58:04 +10:00
Sven Dowideit
6be75947ab
Merge pull request #6223 from jamtur01/rl
...
Revert "Initial links for Docker Hub rename"
2014-06-05 14:56:12 -07:00
James Turnbull
fad14eda3a
Revert "Initial links for Docker Hub rename"
...
This reverts commit 2819677c21james@lovedthanlost.net > (github: jamtur01)
2014-06-05 14:52:06 -07:00
James Turnbull
6fa3acc96c
Merge pull request #6156 from jamtur01/links
...
Initial link update for Docs
2014-06-05 14:46:33 -07:00
Victor Vieux
cedab4d06a
Merge pull request #6220 from vieux/fix_redirect
...
Only forward auth to trusted locations
2014-06-05 14:34:37 -07:00
Michael Crosby
f362153157
Update for nsenter
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-05 14:31:16 -07:00
Michael Crosby
1a3d43c23e
Update nsinit to be nicer to work with and test
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-05 14:13:02 -07:00
Victor Vieux
a124531863
only forward auth to trusted locations
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-05 19:47:33 +00:00
Matthew Heon
d08c965e2c
Clarify effect of docker start on started container in CLI docs
...
This behavior changed from v0.9 to v0.10, so document it to prevent
any confusion.
Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com > (github: mheon)
2014-06-05 15:08:54 -04:00
cpuguy83
04620e0154
Fixes broken ssh server example
...
Docker-DCO-1.1-Signed-off-by: cpuguy83 <cpuguy83@gmail.com > (github: cpuguy83)
2014-06-05 14:10:52 -04:00
Sven Dowideit
734d108ed2
Merge pull request #6215 from cpuguy83/fix_volumes_from_api_doc
...
Fixes incorrect API spec for items moved to HostConfig
2014-06-05 10:33:16 -07:00
cpuguy83
8c646ebf16
Fixes incorrect API spec for items moved to HostConfig
...
DNS and VolumesFrom were moved to HostConfig and as such are part of the
container start and not create.
For some reason 0.10 docs are correct (except for a missing quote in the
JSON") but 0.11 and latest are not.
Docker-DCO-1.1-Signed-off-by: cpuguy83 <cpuguy83@gmail.com > (github: cpuguy83)
2014-06-05 09:50:27 -04:00
Alexander Larsson
0434a2ce64
devmapper: Add blkdiscard option and disable it on raw devices
...
The blkdiscard hack we do on container/image delete is pretty slow, but
required to restore space to the "host" root filesystem. However, it
is pretty useless on raw devices, and you may not need it in development
either.
In a simple test of the devicemapper backend on loopback the time to
delete 20 container went from 11 seconds to 0.4 seconds with
--storage-opt blkdiscard=false.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-06-05 11:45:59 +02:00
Alexander Larsson
a226168a8b
devmapper: Add options for specifying block devices
...
This adds dm.datadev and dm.metadatadev options that you can use with
--storage-opt to set to specific devices to use for the thin
provisioning pool.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-06-05 11:45:55 +02:00
Alexander Larsson
807bc2cd04
devmapper: Allow specifying filesystem for thin devices
...
This adds the following --storage-opts for the daemon:
dm.fs: The filesystem to use for the base image
dm.mkfsarg: Add an argument to the mkfs command for the base image
dm.mountopt: Add a mount option for devicemapper mount
Currently supported filesystems are xfs and ext4.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-06-05 11:25:06 +02:00
Alexander Larsson
10083f4140
devicemapper: Probe what filesystem to use when mounting
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-06-05 11:03:19 +02:00
Alexander Larsson
7f5ba068f4
devmapper: Add --storage-opt options for basic devicemapper settings
...
This allows setting these settings to be passed:
dm.basesize
dm.loopdatasize
dm.loopmetadatasize
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-06-05 10:50:07 +02:00
Alexander Larsson
822ea97ffc
Add --storage-opt graph driver option and pass through to driver
...
This lets you add storage specific options for the daemon.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-06-05 10:42:27 +02:00
Alexander Larsson
948e54ac45
devmapper: Fail init with ErrNotSupported if simple devmapper call fails
...
If we can't even get the current device mapper driver version, then
we cleanly fail the devmapper driver as not supported and fall back
on the next one.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-06-05 10:42:27 +02:00
Alexander Larsson
13f07b636f
pkg/units: Add FromHumanSize
...
This does the "reverse" of HumanSize, i.e. maps a string to an int64
using SI prefixes for the extension.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-06-05 10:02:37 +02:00
Victor Vieux
7e96f8de1c
Merge pull request #6026 from vmarmol/nsenter
...
Adding initial version of C-based nsenter for allowing execin in libcontainer.
2014-06-04 19:06:27 -07:00
Victor Vieux
fe706af3c0
Merge pull request #6210 from tiborvass/fix_doc_remove_insert_remote_api
...
Move doc section in Remote API about removing insert from v1.11 to v1.12
2014-06-04 18:31:55 -07:00
Tibor Vass
0d1906feea
Move doc section in Remote API about removing insert from v1.11 to v1.12
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-06-04 18:30:10 -07:00
Tibor Vass
894814f708
Merge pull request #6208 from crosbymichael/remove-insert
...
Totally remove insert feature
2014-06-04 18:17:23 -07:00
Victor Marmol
a0137e104c
Merge pull request #1 from crosbymichael/nsenter-path
...
Move environment loading to nsenter
2014-06-04 18:14:12 -07:00
Michael Crosby
7eb508633d
Exclude the user namespace for setns
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-04 18:03:17 -07:00
Michael Crosby
8497d1274b
Move env load to nsenter
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-04 17:54:00 -07:00
Victor Marmol
0a725ea282
Adding initial version of C-based nsenter for allowing execin in
...
libcontainer.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-06-05 00:44:13 +00:00
Michael Crosby
7a145b022a
Totally remove insert feature
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-04 17:35:15 -07:00
Michael Crosby
a8ef66d84a
Merge pull request #6205 from crosbymichael/rename-namespaces
...
Rename nsinit package to namespaces in libcontainer
2014-06-04 17:27:45 -07:00
James Turnbull
2819677c21
Initial links for Docker Hub rename
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-06-04 16:48:49 -07:00
Victor Vieux
aa05170a82
Merge pull request #6204 from crosbymichael/no-structs
...
Remove the API container struct and use env
2014-06-04 16:40:20 -07:00
Michael Crosby
8aff01c0b4
Rename nsinit package to namespaces in libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-04 15:47:57 -07:00
Michael Crosby
91757eaeb3
Remove the API container struct and use env
...
This change touches docker logs, attach, and start -a along with get
exit code in the client.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-04 15:37:49 -07:00
unclejack
048833c246
Merge pull request #6178 from calfonso/freezer-pr-integration
...
Freezer integration to support container pause/unpause
2014-06-05 01:29:47 +03:00
Michael Crosby
fd21da4b0b
Merge pull request #6198 from vishh/stats2
...
Add more stats to libcontainer.
2014-06-04 15:28:19 -07:00
unclejack
597c06ca34
Merge pull request #6195 from kieslee/master
...
pass address of metaHeaders to GetenvJson in ImagePush and ImagePull
2014-06-05 00:23:08 +03:00
Vishnu Kannan
8d63b610c3
Add stats for memory allocation failure count and instantaneous cpu usage in the usermode and kernelmode.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
2014-06-04 21:20:21 +00:00
Chris Alfonso
26246ebd53
Integrating systemd freeze functionality.
...
This pulls together #6061 and #6125
Docker-DCO-1.1-Signed-off-by: Chris Alfonso <calfonso@redhat.com > (github: calfonso)
2014-06-04 13:33:44 -06:00
Ian Main
b054569cde
Add ability to pause/unpause containers via cgroups freeze
...
This patch adds pause/unpause to the command line, api, and drivers
for use on containers. This is implemented using the cgroups/freeze
utility in libcontainer and lxc freeze/unfreeze.
Co-Authored-By: Eric Windisch <ewindisch@docker.com >
Co-Authored-By: Chris Alfonso <calfonso@redhat.com >
Docker-DCO-1.1-Signed-off-by: Ian Main <imain@redhat.com > (github: imain)
2014-06-04 13:33:44 -06:00
Michael Crosby
1f5b323208
Merge pull request #6187 from vieux/wait_freeze
...
Implement wait on freeze
2014-06-04 12:00:20 -07:00
kies
eb3e2f4f47
pass address of metaHeaders to GetenvJson in ImagePush and ImagePull
...
Docker-DCO-1.1-Signed-off-by: kies <lleelm@gmail.com > (github: kieslee)
2014-06-04 17:54:06 +08:00
Sven Dowideit
9f14ff83b2
Merge pull request #6191 from snowch/patch-1
...
Small clarification
2014-06-04 01:56:01 -07:00
Chris Snow
2e14f0f70a
Update builder.md
2014-06-04 08:08:44 +01:00
Victor Vieux
3704996089
Merge pull request #6082 from FLGMwt/2342-change-wording-uploading-context
...
Change 'Uploading context' wording
2014-06-03 23:58:20 -07:00
Victor Vieux
dc21dd2634
implement wait on freeze
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-04 02:21:10 +00:00
Tibor Vass
2a92c53a06
Merge pull request #6186 from unclejack/fix_typo_aufsgo
...
fix diffs->diff typo in aufs.go
2014-06-03 16:59:43 -07:00
Joe Beda
c11fadb282
Make debian init work when called quickly.
...
We use the start-stop-daemon pid creation mechanism in addition the intrinsic built into docker. This means the pid file is guaranteed to be written out by the time the script exits.
See #6184 .
Docker-DCO-1.1-Signed-off-by: Joe Beda <joe.github@bedafamily.com > (github: jbeda)
2014-06-03 16:57:32 -07:00
unclejack
7a60b9063c
fix diffs->diff typo in aufs.go
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-06-04 02:46:55 +03:00
Victor Vieux
2c27e6e9ab
Merge pull request #6183 from crosbymichael/fix-freezer-fs
...
Don't rejoin the freezer cgroup each time
2014-06-03 16:16:58 -07:00
Victor Vieux
37d69aae5e
Merge pull request #6180 from unclejack/apparmor
...
apparmor: write & load the profile on every start
2014-06-03 15:56:28 -07:00
Michael Crosby
534521301c
Don't rejoin the cgroup each time
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-03 15:24:30 -07:00
unclejack
a2ec8fa1db
Merge pull request #6181 from SvenDowideit/change-out-port-number
...
IANA allocated Docker port: 2375
2014-06-04 01:07:48 +03:00
Sven Dowideit
201d20fe34
Merge pull request #6164 from jamtur01/automated
...
Changed all references from Trusted Builds to Automated Builds
2014-06-03 15:06:09 -07:00
unclejack
1ef3ca83d8
apparmor: write & load the profile on every start
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-06-04 00:56:35 +03:00
Matthew Heon
d96eb47dee
Added note in manpages to clarify effect of docker start on started container
...
When run on a container that is already running, docker always succeeds.
This was an intentional change in v0.10; it previously caused an error.
This commit clarifies the man pages to indicate this is intended behavior.
Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com > (github: mheon)
2014-06-03 17:10:59 -04:00
SvenDowideit
5febba93ba
IANA allocated Docker port: 2375
...
2375/2376 are assigned:
http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=docker
For #1440
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-06-04 06:54:19 +10:00
James Turnbull
9fc8028c98
Changed all references from Trusted Builds to Automated Builds
...
* Updated docker images output
* Deprecated docker images -t/--trusted option and replace with --automated
* Changed *trusted variables to *automated
* Changed added support for is_automated alongside deprecated is_trusted
* Updated man pages, docs and completion
* Updated API documentation
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-06-03 12:55:30 -07:00
Victor Vieux
2f514fb891
Merge pull request #6125 from crosbymichael/systemd-freezer
...
Implement systemd support for freezer
2014-06-03 11:39:21 -07:00
Sven Dowideit
7f55d92837
Merge pull request #6173 from zdover23/03_Jun_2014
...
grammar; nothing big (added a "the")
2014-06-03 10:48:20 -07:00
Michael Crosby
613f74c1fb
Implement systemd support for freezer
...
These PR does a few things. It ensures that the freezer cgroup is
joined in the systemd driver. It also provides a public api for setting
the freezer state via the cgroups package.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-03 10:46:53 -07:00
Michael Crosby
ae93939414
Merge pull request #6175 from alexlarsson/systemd-use-raw-devices
...
libcontainer/cgroup: Use raw access to set up and join the devices cgroup
2014-06-03 10:38:31 -07:00
unclejack
5aeb77296a
Merge pull request #4430 from vbatts/vbatts-images_orphan
...
Adding -f untagged=true flag to `docker images`
2014-06-03 20:33:56 +03:00
Vincent Batts
02255ddaa4
filters: don't encode empty set. API docs
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-06-03 12:19:26 -04:00
Sam Bailey
d9885abdc4
reuse the febootstrap-minimize from rinse
...
Docker-DCO-1.1-Signed-off-by: Sam Bailey <sam@thatsamguy.com > (github: thatsamguy)
2014-06-03 20:41:32 +10:00
Albert Zhang
b611198d28
mount of /.dockerinit is not needed for native driver, so move it into lxc driver
...
Docker-DCO-1.1-Signed-off-by: Albert Zhang <zhgwenming@gmail.com > (github: zhgwenming)
2014-06-03 18:13:54 +08:00
Alexander Larsson
6b8f0e394b
libcontainer/cgroup: Use raw access to set up and join the devices cgroup
...
The systemd support for the devices cgroup lacks two required features:
* Support for wildcards to allow mknod on any device
* Support for wildcards to allow /dev/pts support
The second is available in more recent systemd as "char-pts", but not in e.g. v208 which is in wide use.
Additionally, the current approach of letting systemd set up the devices cgroup and then adding
some devices to it doesn't work, because some times systemd (at least v208) re-initializes
the devices cgroup, overwriting our custom devices. See https://github.com/dotcloud/docker/issues/6009
for the details.
When wildcarded mknod support is available in systemd we should implement a pure systemd version,
but we need to keep the old one around for backwards compat.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-06-03 11:34:14 +02:00
Victor Vieux
dccf336204
Merge pull request #6172 from tianon/remove-duplicated-magic-values
...
Move duplicated FS "magic" values to the graphdriver package so they can be shared
2014-06-02 23:25:46 -07:00
Zac Dover
3a77a73a85
grammar; nothing big
...
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com > (github: zdover23)
Added another "The"
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com > (github: zdover23)
2014-06-03 15:40:22 +10:00
James Turnbull
19e4fddcce
Merge pull request #6122 from mheon/fix_manpage_issue
...
Added documentation for special case in run command
2014-06-02 21:19:43 -07:00
Tianon Gravi
68476e277f
Move duplicated FS "magic" values to the graphdriver package so they can be shared instead of duplicated
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-06-02 19:56:47 -06:00
Victor Marmol
5bf4068d60
Merge pull request #6171 from crosbymichael/add-chroot
...
Add SYS_CHROOT cap to unprivileged containers
2014-06-02 18:33:34 -07:00
Michael Crosby
41f7cef2bd
Add SYS_CHROOT cap to unprivileged containers
...
Fixes #6103
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-02 18:23:47 -07:00
unclejack
3fb0870878
Merge pull request #6167 from crosbymichael/volume-ownership
...
Retain volume ownership and permissions
2014-06-03 04:23:30 +03:00
Victor Vieux
fd342cb777
Merge pull request #6170 from vieux/redirect_login
...
Add redirect and env proxy support to docker login
2014-06-02 18:19:28 -07:00
Michael Crosby
c024c9bd1e
Add test for volume ownership and perms
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-02 18:10:52 -07:00
Michael Crosby
f41ced96af
Ensure that ownership and perms are copied to volume
...
This only works if the file or dir is already created in
the image before setting it to be a volume. There is no way around this
because we don't have the data avaliable to set the volume at the
beginning of the dockerfile
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-02 18:06:58 -07:00
Michael Crosby
f65fadbda0
Merge pull request #6143 from LK4D4/move_some_more_tests_to_cli
...
Move some more tests to integration cli
2014-06-02 18:06:11 -07:00
Sven Dowideit
dd93845ad0
Merge pull request #6056 from ipbabble/master
...
Made fixes to man pages to remove some ambiguities and typos
2014-06-02 18:01:22 -07:00
unclejack
a8ade72b6a
Merge pull request #6168 from vieux/add_proto_validation
...
add proto validation at parse
2014-06-03 03:55:41 +03:00
Victor Marmol
70b778751e
Merge pull request #6153 from vishh/stats1
...
Add per cpu usage to libcontainer stats
2014-06-02 17:53:17 -07:00
Victor Vieux
4e7254840b
Add redirect and env proxy support to docker login
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-03 00:46:06 +00:00
Victor Vieux
98d7b720c2
Merge pull request #6169 from vieux/add_volumes_inspect_back
...
add volumes back to inspect
2014-06-02 17:07:00 -07:00
Victor Vieux
996133b9ba
add volumes back to inspect
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-03 00:05:54 +00:00
Victor Vieux
0633b12b28
add proto validation at parse
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-02 23:03:10 +00:00
Victor Vieux
b292928cd5
Merge pull request #5848 from unclejack/resumable_pulls
...
resume pulling the layer on disconnect
2014-06-02 14:07:01 -07:00
Victor Vieux
dcba54aa99
Merge pull request #6166 from vieux/debug_skipping
...
switch skipping from error to debug
2014-06-02 14:01:49 -07:00
Victor Vieux
af6ab357e8
switch skipping from error to debug
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-02 20:47:07 +00:00
unclejack
aa61cc759b
Merge pull request #6165 from vieux/update_tests
...
Update tests regarding busybox & inspect
2014-06-02 23:39:12 +03:00
Vincent Batts
3a4e3ca327
filters: don't encode an empty set. update comments
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-06-02 16:33:52 -04:00
Vincent Batts
89a15fa235
filters: use json marshal, instead of beam/data
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-06-02 16:33:52 -04:00
Vincent Batts
3ecfaa8f2d
filters: change untagged to dangling
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-06-02 16:33:52 -04:00
Vincent Batts
f322168563
server: very debug.
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-06-02 16:33:52 -04:00
Vincent Batts
f1cc7ce5d7
filter flag: split out for separate --filter flags
...
adding tests and allowing for easy passing of filters.Args from client
to server.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-06-02 16:33:51 -04:00
Vincent Batts
3391aac2b2
images: fix markdown documentation
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-06-02 16:33:51 -04:00
Vincent Batts
cb7857de5d
images filter: remove the redundant inverted filter
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-06-02 16:33:51 -04:00
Vincent Batts
babd572015
filters: cleanup & fmt
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-06-02 16:33:51 -04:00
Vincent Batts
55d95185ed
filters, for images: docs
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-06-02 16:33:51 -04:00
Vincent Batts
caf9b19b0c
filters: remove out filter proc prototype
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-06-02 16:33:50 -04:00
Vincent Batts
5f3812ec97
filters, for images: start with untagged/tagged boolean
...
This is a new feature and flag. (replaces the suggestion of a flag for
--untagged images).
The concept is to have a syntax to filter. This begins with this
filtering for the 'images' subcommand, and at that only filtering for
whether images are untagged.
example like: docker rmi $(docker images -q --filter 'untagged=true')
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-06-02 16:33:50 -04:00
Victor Vieux
730d9ba174
fix busybox image detection
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-02 19:57:20 +00:00
Victor Vieux
b8932abcd3
pull only busybox:latest
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-02 19:54:17 +00:00
LK4D4
ae128437ce
Move build cache tests to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-02 23:40:14 +04:00
LK4D4
bf4d907092
More verbose build tests
...
I've decided that custom asserts only hide the meaning of tests
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-02 23:40:13 +04:00
LK4D4
2e85568816
Aux functions for build testing
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-02 23:40:13 +04:00
Sven Dowideit
afb2d5de3d
Merge pull request #6159 from SvenDowideit/s3-json-fixup
...
aws json is not javascript style json. trailing comma breaks it :(
2014-06-02 12:28:57 -07:00
Victor Vieux
55230b3332
Merge pull request #6138 from NERSC/6092-setuidrace
...
Fix for setuid race condition in LXC driver
2014-06-02 12:16:00 -07:00
Victor Vieux
c136384b20
Merge pull request #6160 from crosbymichael/update-test-for-nil-error
...
Update cpu stat test for no error
2014-06-02 12:12:49 -07:00
Victor Vieux
24ea088124
Merge pull request #6147 from cyphar/6142-mflag-strip-quotes-long-equal-form
...
mflag: strip quotes in certain forms from flag values
2014-06-02 12:03:58 -07:00
Michael Crosby
3e13aaec00
Merge pull request #6130 from vieux/standardize_api_keys
...
Standardize api keys to CamelCase
2014-06-02 12:03:11 -07:00
Victor Vieux
43b7af1dd1
Merge pull request #6150 from LK4D4/remove_used_from_streamformatter
...
Remove unused and racy "used" param from streamformatter
2014-06-02 11:56:05 -07:00
Michael Crosby
30fdac2cb1
Update cpu stat test for no error
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-02 11:54:23 -07:00
Michael Crosby
f1a217be0f
Merge pull request #6116 from vishh/nsinit_stats
...
Adding "stats" and "spec" option to nsinit CLI
2014-06-02 11:44:37 -07:00
unclejack
2a1b7f222a
resume pulling the layer on disconnect
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-06-02 21:41:22 +03:00
SvenDowideit
cac24bbfaf
aws json is not javascript style json. trailing comma breaks it :(
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-06-03 04:30:32 +10:00
James Turnbull
d3ff00948f
Merge pull request #6157 from SvenDowideit/pr_out_update_networking_md
...
Update networking.md
2014-06-02 13:46:26 -04:00
Alexandr Morozov
1ae37cef91
Remove unused and racy "used" param from streamformatter
...
Also tests written
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-02 21:43:07 +04:00
Andre Dublin
4ac216d8d3
Update networking.md
...
grammar
Docker-DCO-1.1-Signed-off-by: Andre Dublin <81dublin@gmail.com > (github: andredublin)
rebased by
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-06-03 03:41:53 +10:00
Sven Dowideit
2404ce3d26
Merge pull request #6154 from SvenDowideit/pr_out_adding_user_guide
...
Adding User Guide
2014-06-02 10:39:15 -07:00
Solomon Hykes
0a06e9bd91
Fix format in maintainers files
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-06-02 07:05:06 +00:00
Solomon Hykes
1a93d3b054
Add Cristian as maintainer to pkg/testutils
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-06-02 07:01:17 +00:00
Vishnu Kannan
3723d6341e
Adding percpu usage to cgroup stats reported by libcontainer.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
2014-06-02 06:56:15 +00:00
Vishnu Kannan
f7b82be0dd
Adding "stats" and "spec" option to nsinit binary which will print the stats and spec respectively.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
2014-06-02 06:37:22 +00:00
cyphar
e4497feaba
pkg: mflag: flag: added tests for quote-stripped flags
...
This patch adds some tests to ensure that quoted flags are properly
handled by the mflag package.
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
2014-06-02 15:25:38 +10:00
cyphar
0e9c40eb82
pkg: mflag: flag: make mflag strip quotes in -flag="var" forms
...
This patch improves the mflag package to ensure that things arguments
to mflag such as `-flag="var"` or `-flag='var'` have the quotes
stripped from the value (to mirror the getopt functionality for similar
flags).
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
2014-06-02 15:25:33 +10:00
Solomon Hykes
ca231b3de5
pkg/testutils: utility functions to facilitate writing Go tests
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-06-01 23:23:31 +00:00
William Henry
2858180a9a
Changed the term rename to alias etc.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
Changes to be committed:
modified: contrib/man/md/docker-tag.1.md
2014-06-01 17:16:14 -06:00
James Turnbull
a7b2c4804b
Adding User Guide
...
* Added User Guide section outlines.
* Added User Guide to menu.
* Moved HTTPS example to articles.
* Replaced Hello World example with User Guide.
* Moved use cases out of examples.
* Updated Introduction to add User Guide.
* Redirected migrated /use and /articles links.
* Added Docker.io section
* Added Dockerized section
* Added Using Docker section
* Added Docker Images section
* Added Docker Links section
* Added Docker Volumes section
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-06-01 17:34:07 -04:00
Sven Dowideit
4edcbfdeb7
Merge pull request #6140 from zanedeg/patch-1
...
Updated link to new docker-node-hello repository
2014-06-02 07:32:43 +10:00
Sven Dowideit
758e23df4d
Merge pull request #5924 from SvenDowideit/docs-build-instructions
...
Add documentation build steps for the next release manager to follow.
2014-06-01 08:31:51 +10:00
SvenDowideit
953abf6ae7
Add documentation build steps for the next release manager to follow.
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-06-01 08:31:33 +10:00
unclejack
2024a0e517
Merge pull request #6089 from unclejack/docker_build_copy
...
add support for COPY to docker build
2014-06-01 01:26:31 +03:00
William Henry
e471a87f19
Fixed some typos and other issues from ostezer comments.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
Changes to be committed:
modified: contrib/man/md/docker-build.1.md
modified: contrib/man/md/docker-run.1.md
modified: contrib/man/md/docker-tag.1.md
2014-05-31 15:44:17 -06:00
O.S. Tezer
b51802a47c
Merge pull request #6073 from SvenDowideit/b2d-port-redirection-docs
...
sync the initial port redirection docs from b2d
2014-05-31 13:58:28 -07:00
Zane DeGraffenried
0658868c7f
Updated link to new docker-node-hello repository
2014-05-31 14:55:59 -06:00
Shane Canon
f9705477d0
Fix for setuid race condition in LXC driver
...
This is a fix for a race condition in the LXC driver. This is described
more in issue #6092 .
Closes #6092
Docker-DCO-1.1-Signed-off-by: Shane Canon <scanon@lbl.gov > (github: scanon)
2014-05-31 10:42:48 -07:00
Sam Bailey
05e9574cf3
add mkimage support for mageia using urpmi
...
Docker-DCO-1.1-Signed-off-by: Sam Bailey <sam@thatsamguy.com > (github: thatsamguy)
2014-05-31 21:37:56 +10:00
unclejack
05cf3498a6
Merge pull request #6128 from crosbymichael/empty-sqlite
...
Init database if empty file
2014-05-31 06:56:00 +03:00
unclejack
af31fe95cd
Merge pull request #6129 from crosbymichael/copy-all-in-priv
...
Ensure all dev nodes are copied for privileged
2014-05-31 06:40:20 +03:00
Michael Crosby
69989b7c06
Ensure all dev nodes are copied for privileged
...
This also makes sure that devices are pointers to avoid copies
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-30 18:39:11 -07:00
Victor Vieux
1dd02ff4a0
update docs
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-31 01:28:08 +00:00
Victor Vieux
68fb7f4b74
Standardize API keys: CamelCase
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-31 01:22:07 +00:00
Michael Crosby
b0ea389c69
Init database if empty file
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-30 17:44:00 -07:00
unclejack
0ef637722f
Merge pull request #6097 from timthelion/consistentdevices
...
Refactor device handling code
2014-05-31 03:34:52 +03:00
Michael Crosby
efb4ebcfe8
Merge pull request #6127 from unclejack/reuse_timestamp
...
reuse timestamp, don't call time.Now() 3 times
2014-05-30 17:21:19 -07:00
unclejack
b64209f7b6
reuse timestamp, don't call time.Now() 3 times
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-05-31 03:03:51 +03:00
Michael Crosby
8ac516094e
Merge pull request #5947 from glebfm/fix-socket-race-condition
...
Fix race condition during socket creation
2014-05-30 15:07:06 -07:00
unclejack
b46449cb33
Merge pull request #6123 from vieux/no_number_default
...
no default default number in names
2014-05-31 00:55:11 +03:00
unclejack
0f40cedc23
Merge pull request #6124 from vieux/standadize_debug_iptables
...
use stderr to debug iptables
2014-05-31 00:46:28 +03:00
unclejack
c90faa47b6
Merge pull request #6065 from vieux/fix_race_waitlock
...
update container's state after we close the waitLock
2014-05-31 00:38:35 +03:00
Victor Vieux
5708aa62f3
use stderr to debug iptables
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-30 19:39:42 +00:00
Timothy Hobbs
608702b980
Refactor device handling code
...
We now have one place that keeps track of (most) devices that are allowed and created within the container. That place is pkg/libcontainer/devices/devices.go
This fixes several inconsistencies between which devices were created in the lxc backend and the native backend. It also fixes inconsistencies between wich devices were created and which were allowed. For example, /dev/full was being created but it was not allowed within the cgroup. It also declares the file modes and permissions of the default devices, rather than copying them from the host. This is in line with docker's philosphy of not being host dependent.
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
2014-05-30 19:21:29 +00:00
Victor Vieux
e70a5ab014
no default default number in names
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-30 19:08:21 +00:00
Michael Crosby
251de0887b
Merge pull request #6121 from unclejack/refactor_daemon_restore
...
optimize restore & use Getenv less in daemon.go
2014-05-30 11:37:12 -07:00
unclejack
0fd0deb75d
optimize restore & use Getenv less in daemon.go
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-05-30 21:20:27 +03:00
Matt Heon
ba1c0f4c81
Documented special case of container memory limits in manpages
...
If a container is started with a memory limit of 0, no memory limit is applied.
To prevent this from causing confusion, make interaction explicit in docs.
Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com > (github: mheon)
2014-05-30 13:55:13 -04:00
Michael Crosby
9e58a77e26
Merge pull request #6118 from LK4D4/fix_race_conditions
...
Fix race conditions
2014-05-30 10:43:56 -07:00
Alexandr Morozov
adb639117b
Atomically increment sequence in pkg/netlink
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-05-30 16:08:29 +04:00
Alexandr Morozov
af17b01ad7
Goroutine-safe daemon.containers
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-05-30 16:08:06 +04:00
Alexandr Morozov
64bd6a6a53
Fix race in native driver on activeContainers usage
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-05-30 14:16:00 +04:00
Alexandr Morozov
4e5f6951f2
Fix races in set/get currentInterfaces in networkdriver
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-05-30 14:16:00 +04:00
Alexandr Morozov
ce9e9ff4a1
Fix race on shutting down
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-05-30 14:15:46 +04:00
Alexandr Morozov
c4990ab999
Fix races on TagStore accessing
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-05-30 13:36:14 +04:00
unclejack
838d6a9e9b
Merge pull request #5855 from philips/remove-dead-code
...
chore(graph/graph): remove dead code
2014-05-30 04:51:12 +03:00
SvenDowideit
23dd221e52
sync the initial docs from b2d
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-05-30 11:16:38 +10:00
Michael Crosby
107cd5dd5f
Merge pull request #6109 from unclejack/block_aufs_on_top_of_btrfs
...
block aufs on incompatible file systems
2014-05-29 16:58:30 -07:00
unclejack
e8a87120d4
block aufs on incompatible file systems
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-05-30 02:32:27 +03:00
Michael Crosby
a86975f29b
Merge pull request #6048 from crquan/use-timeout-conn
...
Use Timeout Conn wrapper to set read deadline for downloading layer
2014-05-29 15:23:21 -07:00
Michael Crosby
887ab77922
Merge pull request #6096 from vishh/stats_strongtype
...
Replaced fs.Stats() interface with fs.GetStats() which returns a cgroups.Stats strong type
2014-05-29 15:23:01 -07:00
Vishnu Kannan
72e6e5ff7e
Added a new method cgroups.GetStats() which will return a cgroups.Stats object which will contain all the available cgroup Stats.
...
Remove old Stats interface in libcontainers cgroups package.
Changed Stats to use unit64 instead of int64 to prevent integer overflow issues.
Updated unit tests.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
2014-05-29 20:16:49 +00:00
Michael Crosby
189c600b3b
Merge pull request #6105 from gdm85/master
...
Do not consider iptables' output an error in case of xtables lock
2014-05-29 11:06:25 -07:00
Michael Crosby
e2935f9c16
Merge pull request #6106 from discordianfish/improve-error-btrfs-on-non-btrfs
...
Add ErrPrerequisites to improve misleading errors
2014-05-29 11:00:13 -07:00
Victor Marmol
f65f1660c0
Merge pull request #6098 from crosbymichael/retry-mount
...
Handle EBUSY on remount
2014-05-29 09:18:54 -07:00
Johannes 'fish' Ziemke
75754e69f6
Add ErrPrerequisites to improve misleading errors
...
There are two cases where we can't use a graphdriver:
1) the graphdriver itself isn't supported by the system
2) the graphdriver is supported by some configuration/prerequisites are
missing
This introduces a new error for the 2) case and uses it when trying to
run docker with btrfs backend on a non-btrfs filesystem.
Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org > (github: discordianfish)
2014-05-29 17:09:55 +02:00
Giuseppe Mazzotta
5e3b643ce6
* do not consider iptables' output an error in case of xtables lock
...
Docker-DCO-1.1-Signed-off-by: Giuseppe Mazzotta <gdm85@users.noreply.github.com > (github: gdm85)
2014-05-29 15:57:29 +02:00
Sven Dowideit
8622641b58
Merge pull request #6100 from SvenDowideit/pr_out_docs_installation_google_update_to_use_container_vm_images
...
docs/installation/google: update to use container-vm images
2014-05-29 11:41:43 +10:00
Johan Euphrosine
456ba11d89
docs/installation/google: update to use container-vm images
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
rebased by
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-05-29 11:36:28 +10:00
Sven Dowideit
b9619bf957
Merge pull request #6099 from SvenDowideit/pr_out_updated_documentation_for_mentioning_images_vs_containers
...
updated documentation for mentioning images vs containers
2014-05-29 11:23:53 +10:00
Robin Speekenbrink
a0505edc9a
updated documentation for mentioning images vs containers
...
Docker-DCO-1.1-Signed-off-by: Robin Speekenbrink <robin@kingsquare.nl > (github: fruitl00p)
rebased by
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-05-29 11:20:41 +10:00
Michael Crosby
5d04b9deaf
Handle EBUSY on remount
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-28 18:10:50 -07:00
Victor Vieux
b204b97c9a
Merge pull request #6083 from bernerdschaefer/nsinit-drop-capabilities-after-changing-user
...
SETUID/SETGID not required for changing user
2014-05-28 17:29:17 -07:00
unclejack
341a2b85be
Merge pull request #5402 from SvenDowideit/dont-update-authors
...
Don't add yourself to the AUTHORs file - its generated
2014-05-29 02:00:29 +03:00
unclejack
745445ebb7
Merge pull request #6067 from SvenDowideit/go-fmt-s
...
gofmt does not result in the same thing as go fmt -s, which is what travis uses
2014-05-29 01:58:03 +03:00
unclejack
a8131c7354
Merge pull request #6090 from alexlarsson/fix-console
...
Fix /dev/console
2014-05-29 01:09:33 +03:00
unclejack
180c2a6785
add support for COPY to docker build
...
This adds a COPY command to docker build which works like ADD, but is
only for local files and it doesn't extract files.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-05-29 00:07:52 +03:00
Alexander Larsson
7f5cd76824
libcontainer: Don't create a device node on /dev/console to bind mount on
...
There is no need for this, the device node by itself doesn't work, since
its not on a devpts fs, and we can just a regular file to bind mount over.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-05-28 21:07:40 +02:00
Alexander Larsson
35d08bdd01
Revert "Remove the bind mount for dev/console which override the mknod/label"
...
This reverts commit ae85dd5458alexl@redhat.com > (github: alexlarsson)
2014-05-28 21:07:27 +02:00
unclejack
2330be2adc
Merge pull request #6076 from LK4D4/remove_collections_package
...
Remove collections package
2014-05-28 21:32:27 +03:00
Victor Marmol
5e2af07137
Merge pull request #5868 from jhspaybar/5749-libcontainerroutes
...
libcontainer support for arbitrary route table entries
2014-05-28 10:50:56 -07:00
William Thurston
bf7f360dca
Fixes #5749
...
libcontainer support for arbitrary route table entries
Docker-DCO-1.1-Signed-off-by: William Thurston <me@williamthurston.com > (github: jhspaybar)
2014-05-28 17:42:02 +00:00
FLGMwt
50417f6abc
Change 'Uploading context' wording
...
Docker-DCO-1.1-Signed-off-by: Ryan Stelly <ryan.stelly@live.com > (github: FLGMwt)
2014-05-28 11:59:29 -05:00
Bernerd Schaefer
0563453b91
SETUID/SETGID not required for changing user
...
It is no longer necessary to pass "SETUID" or "SETGID" capabilities to
the container when a "user" is specified in the config.
Docker-DCO-1.1-Signed-off-by: Bernerd Schaefer <bj.schaefer@gmail.com > (github: bernerdschaefer)
2014-05-28 16:41:48 +02:00
Bernerd Schaefer
fd58524f81
Add system.SetKeepCaps and system.ClearKeepCaps
...
Docker-DCO-1.1-Signed-off-by: Bernerd Schaefer <bj.schaefer@gmail.com > (github: bernerdschaefer)
2014-05-28 16:40:36 +02:00
Sven Dowideit
f00c2e5007
Merge pull request #5957 from cgwalters/manpage-typo
...
docker-run.1: Fix typo 'priviledged'
2014-05-28 22:43:46 +10:00
Alexandr Morozov
31f0a61a3d
Remove collections package
...
It doesn't needed anymore аfter port and ip allocators refactoring
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4dmath@gmail.com > (github: LK4D4)
2014-05-28 13:59:45 +04:00
Derek
02f4ae6c56
Use Timeout Conn wrapper to set read deadline for downloading layer
...
Docker-DCO-1.1-Signed-off-by: Derek <crq@kernel.org > (github: crquan)
2014-05-27 22:50:04 -07:00
Sven Dowideit
77ae37a383
Merge pull request #6068 from jpetazzo/update-wording-private-self-hosted-registries
...
Replace 'private' with 'self-hosted' in a couple of places
2014-05-28 14:39:05 +10:00
Victor Vieux
e56cf35c29
Merge pull request #6069 from crosbymichael/dm-errors
...
Return devmapper errors with additional text
2014-05-27 19:15:59 -07:00
Michael Crosby
6964012382
Return devmapper errors with additional text
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-27 19:03:57 -07:00
Jérôme Petazzoni
b64535166f
Replace 'private' with 'self-hosted' in a couple of places
...
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com > (github: jpetazzo)
2014-05-27 18:57:25 -07:00
SvenDowideit
147ad3480d
gofmt does not result in the same thing as go fmt -s file.go, which is what travis tests for
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-05-28 11:11:47 +10:00
O.S. Tezer
d53eb2f67c
Merge pull request #6053 from jamtur01/produpdate
...
Removed Docker production warnings
2014-05-27 18:00:49 -07:00
Victor Vieux
1de52caedc
update container's state after we close the waitLock
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-28 00:18:51 +00:00
Sven Dowideit
58a0e8af8a
Merge pull request #6044 from zdover23/27May_dockerfile_2
...
27 may dockerfile 2
2014-05-28 07:58:02 +10:00
Sven Dowideit
b76302e5d9
Merge pull request #6040 from SvenDowideit/installer-docs
...
Rewrite the mac and windows docs to use the boot2docker installers.
2014-05-28 07:57:43 +10:00
SvenDowideit
5f5d66ade6
Rewrite the mac and windows docs to use the boot2docker installers.
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-05-28 07:56:15 +10:00
Sven Dowideit
080d8a7a83
Merge pull request #6005 from jimperrin/master
...
Updated documentation to include CentOS installation instructions.
2014-05-28 07:55:03 +10:00
unclejack
70c6d806c8
Merge pull request #6063 from vieux/improve_number_detection
...
improve numeric only id detection
2014-05-28 00:36:57 +03:00
Victor Vieux
b8a89ba963
Merge pull request #6062 from crosbymichael/update-waits
...
Update wait calls to call Wait on Command
2014-05-27 14:17:19 -07:00
Victor Vieux
f2baa364a1
improve numeric only id detection
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-27 21:03:12 +00:00
Michael Crosby
5310e8575f
Update lxc to use cmd.Wait()
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-27 13:52:05 -07:00
Dinesh Subhraveti
249524ec49
Add Dinesh Subhraveti to MAINTAINERS
...
Docker-DCO-1.1-Signed-off-by: Dinesh Subhraveti <dineshs@altiscale.com > (github: dineshs-altiscale)
2014-05-27 16:45:17 -04:00
Michael Crosby
b9de22e828
Update wait calls to call Wait on Command
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-27 13:38:24 -07:00
Victor Vieux
a605379927
Merge pull request #6059 from erikh/fix-tests
...
Fix race condition in CLI tests: diff was not acquiring a container lock
2014-05-27 13:19:32 -07:00
unclejack
0d9a5ce6dd
Merge pull request #6025 from crosbymichael/concurrent-names
...
Improve name generation on concurrent requests
2014-05-27 23:18:19 +03:00
Michael Crosby
88cefe20b4
Merge pull request #6030 from erikh/5971-fix-zombies
...
Add Wait() calls in the appropriate spots
2014-05-27 12:53:17 -07:00
Erik Hollensbe
8b77e0183e
Fix race condition in CLI tests: diff was not acquiring a container lock
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-05-27 12:28:31 -07:00
Erik Hollensbe
b01c3283fa
libcontainer/nsinit: remove Wait call from Exec and Kill from Attach in tty_term.go
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-05-27 12:26:56 -07:00
Erik Hollensbe
92e41a02ce
Add Wait() calls in the appropriate spots
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-05-27 12:26:56 -07:00
Michael Crosby
bdb5aa4c27
Merge pull request #5937 from LK4D4/ipallocator_refactoring
...
Ip allocator refactoring
2014-05-27 12:22:36 -07:00
Victor Vieux
b904d0af56
Merge pull request #6051 from LK4D4/move_some_build_tests_to_integration_cli
...
Move some build tests to integration cli
2014-05-27 12:11:42 -07:00
Victor Vieux
754797bba7
Merge pull request #6000 from cyphar/5619-fix-unsafe-path-resolution
...
Properly handle paths with symlink path components
2014-05-27 12:06:19 -07:00
Alexandr Morozov
ef94ac7d2f
Ip allocator refactoring
...
We don't need ordered set anymore, also some cleanings and simple
benchmark.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-05-27 22:56:26 +04:00
William Henry
a14a88e53d
Fixed some typos in docker-build.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
Changes to be committed:
modified: contrib/man/md/docker-build.1.md
2014-05-27 12:05:48 -06:00
William Henry
2cb184ade5
Some changes to semantics around tagging, detaching.
...
Tried to clarify some of the semantics regarding --tag and renaming etc.
Added some text clarifying how to detach from a running containers.
Fixed a bug that reference /varlog instead of /dev/log.
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
Changes to be committed:
modified: docker-attach.1.md
modified: docker-build.1.md
modified: docker-run.1.md
modified: docker-tag.1.md
2014-05-27 11:56:11 -06:00
Michael Crosby
a22622b022
Merge pull request #5983 from vieux/add_tianon_mailmap_authors
...
add Tianon as maintainer of AUTHORS and .mailmap
2014-05-27 10:43:17 -07:00
Zac Dover
2bbf87504b
fixed spacing, removed extraneous line
...
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com > (github: zdover23)
2014-05-28 03:32:52 +10:00
Tianon Gravi
b2cf28306d
Merge pull request #6029 from jeffreybolle/master
...
Update upstart script to ensure networking is up before starting docker
2014-05-27 11:23:54 -06:00
James Turnbull
838e69e11e
Removed Docker production warnings
...
* Removed warnings.
* Removed inconsistent Community installation sections.
* Fixed all installation page descriptions.
* Removed old .inc files.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-05-27 13:08:19 -04:00
William Henry
ca49da41ee
Merge branch 'master' of https://github.com/dotcloud/docker
2014-05-27 09:11:12 -06:00
Jim Perrin
b7e88250f4
Update documentation per suggestions from ostezer
...
Docker-DCO-1.1-Signed-off-by: Jim Perrin <jperrin@centos.org > (github: jimperrin)
2014-05-27 08:59:30 -05:00
James Turnbull
cf47b46036
Merge pull request #6046 from thomasleveil/patch-1
...
Update ubuntulinux.md - bash completion
2014-05-27 05:39:39 -07:00
Thomas LEVEIL
250229605f
Update ubuntulinux.md and debian.md
...
to add bash completion for the docker command
2014-05-27 14:17:01 +02:00
Alexandr Morozov
b25a9b7138
Move entrypoint build test to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-05-27 08:36:38 +04:00
LK4D4
81d1641139
Move expose build test to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-05-27 08:00:35 +04:00
LK4D4
c58991f31a
Move cmd build test to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-05-27 08:00:35 +04:00
LK4D4
b05be686ec
Move env build test to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-05-27 08:00:35 +04:00
LK4D4
40630ce4b6
Move relative workdir build test to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-05-27 08:00:35 +04:00
LK4D4
360fb3d4ea
Move user build test to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-05-27 08:00:34 +04:00
LK4D4
3dd4c5f499
Move maintainer build test to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-05-27 08:00:34 +04:00
LK4D4
11f7f0bf9b
Move volume build test to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-05-27 08:00:34 +04:00
O.S. Tezer
e5ba9f6443
Merge pull request #6042 from dcorking/patch-1
...
Update fedora.md
2014-05-26 12:27:45 -07:00
David Corking
b26bebac31
Update fedora.md
...
The renamed package 'wmdocker' did not make it into Fedora 20. It is still available for rawhide (will be Fedora 21.)
2014-05-26 12:29:27 +01:00
Sven Dowideit
4a2ca56ea0
Merge pull request #6039 from zdover23/26May_dockerfile
...
Dockerfile.5.md stub
2014-05-26 16:46:12 +10:00
Zac Dover
41a913b390
Dockerfile.5.md stub
...
Properly formatted DCO:
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com > (github: zdover23)
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com > (github: )
2014-05-26 15:57:20 +10:00
Tianon Gravi
bddcbc1b15
Merge pull request #6037 from tianon/fix-debootstrap-typo
...
Fix embarrassing debootstrap typo :)
2014-05-25 22:37:59 -06:00
Tianon Gravi
dd3319636d
Fix embarrassing debootstrap typo :)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-05-25 21:59:43 -06:00
Jeffrey Bolle
c52889db27
Ensure networking is up before starting docker
...
This resolves a problem that I have been having where docker starts before networking is up. See issue #5944 for more details.
Docker-DCO-1.1-Signed-off-by: Jeffrey Bolle <jeffreybolle@gmail.com > (github: jeffreybolle)
2014-05-24 19:03:11 +01:00
James Turnbull
7393eafde7
Merge pull request #6001 from jamtur01/introfixes
...
Some fixes to the Intro pages
2014-05-25 00:21:40 +10:00
James Turnbull
955bfda99a
Some fixes to the Intro pages
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-05-25 00:20:59 +10:00
Jim Perrin
1cb2570a27
Correct appearance of shell output
...
Docker-DCO-1.1-Signed-off-by: Jim Perrin <jperrin@centos.org > (github: jimperrin)
2014-05-24 08:33:41 -05:00
Sven Dowideit
22777fbc1e
Merge pull request #6006 from therealprologic/master
...
Updated installation docs for CRUX as a Docker Host.
2014-05-24 16:08:14 +10:00
Sven Dowideit
d81912e323
Merge pull request #6016 from ronsmits/patch-1
...
Update using_supervisord.md
2014-05-24 16:07:32 +10:00
Sven Dowideit
b820b9778f
Merge pull request #6023 from proppy/patch-4
...
docs/reference/builder: fix USER doc
2014-05-24 13:41:34 +10:00
cyphar
ff24a32876
integration-cli: cp: added symlink-related tests
...
This patch adds cli integration tests for #5619 , which are tests
to ensure that symlinks are kept relative to the container rootfs
(even when a path component).
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
2014-05-24 11:01:20 +10:00
cyphar
328d2cba11
daemon: container: properly handle paths with symlink path components
...
This patch fixes the incorrect handling of paths which contain a
symlink as a path component when copying data from a container.
Essentially, this patch changes the container.Copy() method to
first "resolve" the resource by resolving all of symlinks encountered
in the path relative to the container's rootfs (using pkg/symlink).
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
2014-05-24 11:01:19 +10:00
Michael Crosby
6ec86cb6e5
Improve name generation on concurrent requests
...
Fixes #2586
This fixes a few races where the name generator asks if a name is free
but another container takes the name before it can be reserved. This
solves this by generating the name and setting it. If the set fails
with a non unique error then we try again.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-23 17:51:16 -07:00
Johan Euphrosine
e89cb9a5e0
docs/reference/builder: fix USER doc
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-05-23 17:20:15 -07:00
Guillaume J. Charmes
baed5d7433
Merge pull request #6020 from vieux/update_test_remove_nc_bind_mount
...
now busybox as nc
2014-05-23 14:48:24 -07:00
Michael Crosby
3b4b0a901d
Merge pull request #6018 from vishh/stats_strongtype
...
Strong type all stats exported by libcontainer
2014-05-23 14:35:14 -07:00
Michael Crosby
f3bd86376e
Merge pull request #6022 from crosbymichael/iptables-wait
...
Add check for iptables xlock support
2014-05-23 14:25:51 -07:00
Michael Crosby
034babf175
Add check for iptables xlock support
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-23 14:18:50 -07:00
Victor Vieux
0be44d1a0a
now busybox as nc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-23 21:03:52 +00:00
Tibor Vass
7e38d6a358
Merge pull request #6019 from tianon/update-dockerfile-busybox
...
Add specific branch of @jpetazzo's busybox to clone from so we can assume nice things about it
2014-05-23 13:46:48 -07:00
Vishnu Kannan
321b457044
Added stats.go which provides strong types for all stats that will be exported by libcontainer. This commit only introduces the strong type.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
2014-05-23 20:42:43 +00:00
Tianon Gravi
886d3c9396
Simplify "adduser" in the Dockerfile to use the more scripting-friendly "useradd"
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-05-23 14:32:43 -06:00
Tianon Gravi
efa79a09a9
Add specific branch of jpetazzo's busybox to clone from so we can assume nice things about it
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-05-23 14:32:43 -06:00
Tibor Vass
cfded04ac2
Merge pull request #6015 from crosbymichael/update-test-flags
...
Update integration tests with --net flag
2014-05-23 13:31:47 -07:00
Tibor Vass
174ab74755
Merge pull request #5998 from crosbymichael/iptables-wait
...
Add wait flag to iptables
2014-05-23 13:31:35 -07:00
Michael Crosby
2487237937
Update ip test to parse new output
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-23 13:22:01 -07:00
Ron Smits
9429fe6f49
Update using_supervisord.md
...
changed the version of ubuntu to 13.04. In latest sshd will not work.
2014-05-23 21:15:44 +02:00
Victor Vieux
0874b85627
Merge pull request #6008 from rhatdan/umount
...
We need to umount /var/lib/docker when the daemon exits.
2014-05-23 12:01:38 -07:00
Victor Vieux
494cbbec44
Merge pull request #5993 from LK4D4/fix_race_on_stop_#5154
...
Add synchronization between jobs and server closing
2014-05-23 11:31:10 -07:00
Michael Crosby
581e8e8918
Update integration tests with --net flag
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-23 11:31:01 -07:00
James Turnbull
973fae9d75
Merge pull request #5952 from nathanleclaire/patch-2
...
Fix a few issues.
2014-05-24 03:00:37 +10:00
Tianon Gravi
3c430e2599
Merge pull request #6012 from tianon/check-config-cgroup-subsystems
...
Add more required cgroup subsystems to check-config.sh
2014-05-23 10:43:16 -06:00
Nathan LeClaire
1e74cd0e01
Fix a few issues.
...
-single-dash => --double-dash for a few flags, and also there was a missing "B", as in "Container B".
Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com > (github: nathanleclaire)
2014-05-23 09:36:27 -07:00
Tianon Gravi
0c0ffb7773
Add more required cgroup subsystems to check-config.sh (specifically, SCHED for cpu and CPUACCT for cpuacct)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-05-23 10:27:09 -06:00
Jim Perrin
2a35e41a9c
Squashed for pull request
...
Updated documentation to include CentOS installation instructions.
Extraneous line removal, description change
Docker-DCO-1.1-Signed-off-by: Jim Perrin <jperrin@centos.org > (github: jimperrin)
2014-05-23 10:46:01 -05:00
Dan Walsh
a3ff8a98f7
We need to umount /var/lib/docker when the daemon exits.
...
Currently we are leaving it bind mounted on stop.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-05-23 11:43:46 -04:00
James Mills
c0529e5fc1
Updated installation docs for CRUX as a Docker Host.
...
Docker-DCO-1.1-Signed-off-by: James Mills <prologic@shortcircuit.net.au > (github: therealprologic)
2014-05-24 01:18:00 +10:00
James Turnbull
a6577708ab
Merge pull request #5949 from nathanleclaire/patch-1
...
Change single-dash flag usage to double-dash
2014-05-23 13:43:23 +10:00
Michael Crosby
b315c380f4
Add wait flag to iptables
...
Fixes #1573
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-23 01:24:58 +00:00
Tibor Vass
be622a78da
Merge pull request #5997 from crosbymichael/add-hang
...
Fix add hang when dest is .
2014-05-22 17:48:51 -07:00
Michael Crosby
04e357d09f
Merge pull request #25 from tiborvass/3960-add-file-hangs
...
adding test for hanging ADD src .
2014-05-22 17:38:11 -07:00
Tibor Vass
1ce5457d57
adding test for hanging ADD src .
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-05-22 17:28:04 -07:00
Michael Crosby
c8ada301ba
Fix add hang when dest is .
...
Fixes #3960
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-23 00:26:38 +00:00
Michael Crosby
3d78c49aab
Merge pull request #5995 from vieux/recur_nodes
...
Add device nodes recursively
2014-05-22 16:35:27 -07:00
Victor Vieux
b6c65df093
update test
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-22 22:50:41 +00:00
Victor Vieux
0abb52c7a9
add recursive device nodes
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-22 22:29:13 +00:00
Michael Crosby
24a58a66e3
Merge pull request #5994 from vmarmol/libcontainers-stats
...
Make all cgroup stats output int64s instead of float64.
2014-05-22 14:24:14 -07:00
Victor Marmol
4a33a757d5
Make all cgroup stats output int64s instead of float64.
...
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-05-22 20:53:36 +00:00
Alexandr Morozov
f92d68a6ce
Add synchronization between jobs and server closing
...
Fixes #5154
Daemon waiting 15 seconds for finishing server jobs before shutdown. In
this time it doesn't accept new jobs. After this time, it shutdown
despite running jobs.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-05-22 22:54:49 +04:00
Michael Crosby
db1a3551a3
Merge pull request #5839 from unclejack/improve_build_rm
...
add --force-rm to clean up after a failed build
2014-05-22 10:54:05 -07:00
Tianon Gravi
8006f6583d
Merge pull request #5967 from tianon/consolidated-mkimage
...
Add new consolidated mkimage scripts
2014-05-22 11:27:08 -06:00
unclejack
32c1e3005f
Merge pull request #5990 from alexlarsson/no-discard-mkfs
...
devmapper: Don't enable discard during mkfs.ext4
2014-05-22 19:38:21 +03:00
Alexander Larsson
42708181b1
devmapper: Don't enable discard during mkfs.ext4
...
There is no reason to do discard durink mkfs, as the filesystem
is on a newly allocated device anyway. Discard is a slow operation,
so this may help initial startup a bit, especially if you use a larger
thin pool.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-05-22 09:23:52 +02:00
James Turnbull
7470ebf30b
Merge pull request #5746 from ImJasonH/patch-1
...
Update google.md
2014-05-22 13:43:40 +10:00
Victor Vieux
55d41c3e21
Merge pull request #5976 from crosbymichael/getpids
...
Move get pid into cgroup implementation
2014-05-21 19:09:50 -07:00
Victor Vieux
5a0a03e394
Merge pull request #5922 from crosbymichael/host-dev-priv
...
Mount /dev in tmpfs for privileged containers
2014-05-21 18:56:24 -07:00
James Turnbull
2fec15cff1
Merge pull request #5982 from jamtur01/bitbucket
...
Added BitBucket support to documentation
2014-05-22 11:35:17 +10:00
Nathan LeClaire
e7babb28cc
Change single-dash flag usage to double-dash
...
The single-dash long-form flag usage is deprecated.
Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathanleclaire@gmail.com > (github: nathanleclaire)
2014-05-21 17:07:04 -07:00
James Turnbull
cd44cd26cb
Merge pull request #5959 from tpng/patch-1
...
Add instructions for persisting data
2014-05-22 09:55:05 +10:00
Sven Dowideit
a0260c1181
Merge pull request #5897 from jamtur01/newintro
...
Rewrite of the Introduction documentation
2014-05-21 16:53:03 -07:00
Michael Crosby
4bb4bf634a
Merge pull request #5859 from philips/append-etc-hosts-not-bind
...
fix(daemon): prepend host /etc/hosts instead of bind mounting
2014-05-21 15:57:59 -07:00
Victor Vieux
fe1d297b9d
Merge pull request #5895 from tianon/update-authors
...
Update AUTHORS and .mailmap
2014-05-21 22:57:05 +00:00
Victor Vieux
cedd76cb52
Merge pull request #5981 from philips/bump-go-systemd
...
vendor: bump github.com/coreos/go-systemd to v2
2014-05-21 15:52:35 -07:00
Victor Vieux
b1464b2daa
add Tianon as maintainer of AUTHORS and .mailmap
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-21 22:48:31 +00:00
James Turnbull
62468a3eba
Added BitBucket support to documentation
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-05-22 08:35:10 +10:00
Brandon Philips
df5585b273
vendor: bump github.com/coreos/go-systemd to v2
...
There are a couple of bugfixes since this was last bumped. Pull them in.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-05-21 15:31:04 -07:00
Brandon Philips
61ac745d7a
integration-cli: fix spelling error in test
...
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-05-21 15:20:29 -07:00
Brandon Philips
5579bec47b
integration-cli: tests for /etc/hosts and net=host
...
Some basic tests to make sure this is acting correctly on machines.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-05-21 15:20:29 -07:00
Michael Crosby
718e522c71
Merge pull request #5979 from rhatdan/terminal
...
This check was backwards.
2014-05-21 14:51:13 -07:00
Dan Walsh
26b4a4920a
This check was backwards.
...
If I do a
docker events > /tmp/out
I do not want the control characters getting written to the file.
The check should check the output file not the input file.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-05-21 17:37:40 -04:00
Michael Crosby
811d93326b
Move get pid into cgroup implementation
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-21 21:14:07 +00:00
James Turnbull
0056884090
Rewrite of the Introduction documentation
...
1. Re-aligns the introduction with the new product positioning.
2. Cleanup of some issues with language and formatting.
3. Makes the introduction leaner and meaner.
4. Responds to feedback from product.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-05-22 07:11:43 +10:00
Victor Vieux
b7f9e683c3
Merge pull request #5958 from erikh/5738-docker_port_in_use
...
docker port in use
2014-05-21 21:06:27 +00:00
Victor Vieux
457cb86cf2
Merge pull request #5975 from tianon/revert-run-tmpfs
...
Revert "Always mount a /run tmpfs in the container"
2014-05-21 13:46:48 -07:00
Tianon Gravi
8e967fe802
Revert "Always mount a /run tmpfs in the container"
...
This reverts commit 905795ece6admwiggin@gmail.com > (github: tianon)
2014-05-21 14:28:19 -06:00
Michael Crosby
2ff4f71528
Merge pull request #5953 from tiborvass/remove-chmod-755
...
remove chmod 755: fixes #5941
2014-05-21 12:27:06 -07:00
Tibor Vass
bb431a7190
for perms checking tests, create files from Go and remove them from git
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-05-21 11:35:12 -07:00
Tibor Vass
56a53c72d2
remove chmod 755: fixes #5941
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-05-21 11:35:08 -07:00
James Turnbull
29a192ca4d
Merge pull request #5965 from cpuguy83/5963-fix-single-dash-in-working-with-volumes
...
Fixes some docs issues with using single-dash arguments where they should be double
2014-05-22 03:31:46 +10:00
Victor Vieux
286a17ff19
Merge pull request #5955 from anandkumarpatel/5923-fix-leaking-go-routine
...
5923-fix-leaking-go-routine
2014-05-21 10:11:56 -07:00
Erik Hollensbe
91ba337931
bridge: retry any proxy set up failures until we get a successful port, defeats a race condition
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-05-21 09:14:53 -07:00
Erik Hollensbe
f0489ce3a9
portallocator: rewrite to simplify, removes race condition
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-05-21 09:14:53 -07:00
Tianon Gravi
51f707cf9d
Add deprecation warnings to the mkimage scripts that are have consolidated mkimage implementations
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-05-21 09:58:11 -06:00
Tianon Gravi
7e42505083
Add new consolidated mkimage scripts
...
These new scripts are streamlined such that, for example, "contrib/mkimage/debootstrap" is _only_ responsible for filling a directory with the results of running debootstrap, and it can accept any arbitrary arguments.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-05-21 09:47:36 -06:00
Brian Goff
6d9e64b27b
Fixes some docs issues with using single-dash arguments where they should be double
...
I found a bunch of issues where we have "-<opt>" instead of "--<opt>".
Also a couple of other issues, like "-notrunc", which is now "--no-trunc"
Fixes #5963
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-05-21 09:35:22 -04:00
unclejack
a94a87778c
Merge pull request #5954 from vieux/fix_cp_error
...
Ignore lchown error on docker cp
2014-05-21 15:55:57 +03:00
Colin Walters
cfe7211a22
man/docker-run.1: Fix typo 'priviledged', add missing closing brackets
...
Docker-DCO-1.1-Signed-off-by: Colin Walters <walters@verbum.org > (github: cgwalters)
2014-05-21 07:00:38 -04:00
tpng
accea18920
Add instructions for persisting data
...
Docker-DCO-1.1-Signed-off-by: Benny Ng <benny.tpng@gmail.com > (github: tpng)
2014-05-21 16:45:41 +08:00
James Turnbull
f37339c2db
Merge pull request #5765 from jamtur01/contribf
...
Added to small patch exemption to cover Markdown/syntax errors
2014-05-21 17:13:03 +10:00
AnandkumarPatel
789a8f2616
use buffered channel so goroutine does not get blocked on done <- true when a timeout occurs.
...
Docker-DCO-1.1-Signed-off-by: Anandkumar Patel <anandkumarpatel@gmail.com > (github: anandkumarpatel)
2014-05-20 21:33:40 -07:00
Michael Crosby
f042c3c157
Update code post codereview
...
Add specific types for Required and Optional DeviceNodes
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-21 00:40:41 +00:00
Victor Vieux
9e51b7abae
ignore lchown error on docker cp
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-21 00:23:17 +00:00
Victor Vieux
5eef0a28cb
add test
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-21 00:10:07 +00:00
Michael Crosby
ed5892ed4e
Update documentation for container struct in libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-20 23:34:46 +00:00
Michael Crosby
34c05c58c8
Mount /dev in tmpfs for privileged containers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-20 22:51:24 +00:00
Michael Crosby
83e9dc7200
Merge pull request #5755 from vieux/move_inspect_daemon
...
move inspect from server to daemon
2014-05-20 15:50:38 -07:00
Tianon Gravi
1f219672fa
Merge pull request #5950 from tianon/update-deps
...
Update gorilla/mux, gorilla/context, and kr/pty deps
2014-05-20 16:16:21 -06:00
Michael Crosby
1310243d48
Merge pull request #5946 from crosbymichael/lxc-host-net
...
Fix network mode for lxc 1.0
2014-05-20 14:51:33 -07:00
Victor Vieux
240fad4974
Merge pull request #5951 from vieux/pr5919
...
Fix remote add cache
2014-05-20 14:33:05 -07:00
Victor Vieux
03a109e446
add test
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-20 21:31:28 +00:00
Guillaume J. Charmes
bcfe2ceffb
Remove the mtime for temp file. Prevent false negative cache
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-05-20 21:31:28 +00:00
Brice Jaglin
9810da853b
force the read of the tarSum so that sums actually get computed
...
Docker-DCO-1.1-Signed-off-by: Brice Jaglin <bjaglin@teads.tv > (github: bjaglin)
2014-05-20 21:31:28 +00:00
Michael Crosby
70d35b9d39
Merge pull request #5918 from crosbymichael/volumes-commit
...
Do not commit host bind mounts into image
2014-05-20 14:28:49 -07:00
Tianon Gravi
d98af1236c
Update gorilla/mux, gorilla/context, and kr/pty deps
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-05-20 15:23:50 -06:00
Michael Crosby
e2d79bec3a
Update runconfig unit test for changes
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-20 21:11:33 +00:00
Tianon Gravi
a16cb394fa
Merge pull request #5945 from crosbymichael/lxc-version-bump
...
Update LXC requirement to 1.0
2014-05-20 14:54:24 -06:00
Michael Crosby
94f01184be
Update lxc requirement to 1.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-20 20:45:22 +00:00
Michael Crosby
f915988a5d
Merge pull request #5916 from rhatdan/crash
...
docker '' causes a golang crash.
2014-05-20 13:42:48 -07:00
Victor Vieux
603e00a3a7
move inspect from server to daemon
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-20 19:36:15 +00:00
Gleb Fotengauer-Malinovskiy
24c73ce2d3
Fix race condition during socket creation
...
Docker-DCO-1.1-Signed-off-by: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org > (github: glebfm)
2014-05-20 23:22:06 +04:00
Michael Crosby
0f27894094
Fix network mode for lxc 1.0
...
Fixes #5692
This change requires lxc 1.0+ to work and breaks lxc versions less than
1.0 for host networking. We think that this is a find tradeoff by
bumping docker to only support lxc 1.0
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-20 19:10:23 +00:00
Dan Walsh
bc081a03d8
docker '' causes a golang crash.
...
This patch fixes the problem.
Docker-DCO-1.1-Signed-off-by: Daniel Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-05-20 14:04:27 -04:00
Michael Crosby
e5202de918
Merge pull request #5930 from alexlarsson/add-cap-setfcap
...
native driver: Don't drop SETFCAP
2014-05-20 10:29:37 -07:00
Michael Crosby
f3edb7c0e8
Merge pull request #5929 from alexlarsson/systemd-cgroup-allow-mknod
...
cgroups: Allow mknod for any device in systemd cgroup backend
2014-05-20 10:13:13 -07:00
Tianon Gravi
47aa9f5a0e
Merge pull request #5844 from stpierre/init-script-wait-for-pidfile
...
Wait for pidfile to exist when starting with RedHat init script
2014-05-20 10:25:03 -06:00
Alexander Larsson
fcf2e9a910
native driver: Add required capabilities
...
We need SETFCAP to be able to mark files as having caps, which is
heavily used by fedora.
See https://github.com/dotcloud/docker/issues/5928
We also need SETPCAP, for instance systemd needs this to set caps
on its childen.
Both of these are safe in the sense that they can never ever
result in a process with a capability not in the bounding set of the
container.
We also add NET_BIND_SERVICE caps, to be able to bind to ports lower
than 1024.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-05-20 11:31:39 +02:00
Timothy
6854e2997e
Add README.md file for the docker directory
...
See issue #5873
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
2014-05-20 09:04:46 +00:00
Alexander Larsson
6029504350
cgroups: Allow mknod for any device in systemd cgroup backend
...
Without this any container startup fails:
2014/05/20 09:20:36 setup mount namespace copy additional dev nodes mknod fuse operation not permitted
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-05-20 09:29:32 +02:00
Brandon Philips
000a37fe9d
fix(daemon): prepend host /etc/hosts instead of bind mounting
...
systemd systems do not require a /etc/hosts file exists since an nss
module is shipped that creates localhost implicitly. So, mounting
/etc/hosts can fail on these sorts of systems, as was reported on CoreOS
in issue #5812 .
Instead of trying to bind mount just copy the hosts entries onto the
containers private /etc/hosts.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-05-19 22:32:51 -07:00
Sven Dowideit
bfe72c6189
Merge pull request #5920 from jmccrohan/master
...
docs: cli.md; document docker version output
2014-05-19 21:41:05 -07:00
Jonathan McCrohan
4052a81830
docs: cli.md; document docker version output
...
Commit 3cec63d56fjmccrohan@gmail.com > (github: jmccrohan)
2014-05-20 02:00:31 +01:00
Sven Dowideit
5511be7512
Merge pull request #5905 from jamtur01/faq
...
Adding the FAQ back
2014-05-20 10:17:01 +10:00
Michael Crosby
d31c37fceb
Add test for commiting container with bind mount
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-19 22:57:29 +00:00
Tianon Gravi
05c3325a02
Merge pull request #5890 from LK4D4/fix_tee_hanging_on_test_fails_#5672
...
Fix hanging on tests failing
2014-05-19 16:37:19 -06:00
Michael Crosby
d535d98100
Don't save bind mounts in image
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-19 22:18:37 +00:00
Michael Crosby
e454be7567
Move init volumes code to func
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-19 22:04:51 +00:00
Guillaume J. Charmes
b5d0bdc9e8
Merge pull request #5915 from vieux/start_remove_link
...
starts by removing the name from the graph db
2014-05-19 14:38:55 -07:00
Guillaume J. Charmes
2d1c245631
Merge pull request #5913 from crosbymichael/fuse
...
Make sure dev/fuse is created in container
2014-05-19 14:31:32 -07:00
Victor Vieux
c12dd77090
starts by removing the name from the graph db
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-19 21:22:33 +00:00
Michael Crosby
b466672a4c
Merge pull request #5914 from unclejack/fix_unprivileged_user_creation
...
add unprivilegeduser via the Dockerfile
2014-05-19 14:08:06 -07:00
unclejack
599cb12bb8
add unprivilegeduser via the Dockerfile
...
This changes the test TestBuildWithInaccessibleFilesInContext to not
add the user 'unprivilegeduser' and add it via the Dockerfile instead.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-05-19 23:55:28 +03:00
Michael Crosby
a87bcefb8b
Make sure dev/fuse is created in container
...
Fixes #5849
If the host system does not have fuse enabled in the kernel config we
will ignore the is not exist errors when trying to copy the device node
from the host system into the container.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-19 20:46:59 +00:00
Guillaume J. Charmes
5fee3774d4
Merge pull request #5911 from LK4D4/chmod_on_add_#3979
...
Make chmod on ADDed files
2014-05-19 13:35:55 -07:00
unclejack
a691fcb277
integcli: add tests for build --rm
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-05-19 23:10:54 +03:00
unclejack
b60d647172
default to deleting images via the remote api
...
This makes the remote API version 1.12 and newer default to
automatically deleting intermediate containers when the build has
succeedeed.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-05-19 23:10:54 +03:00
unclejack
69dcf767fd
integcli: test container removal for failed builds
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-05-19 23:10:54 +03:00
unclejack
77f5425260
integcli: add getContainerCount utility function
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-05-19 23:10:54 +03:00
unclejack
667e2bd4ea
bump remote api to 1.12 & add --force-rm to build
...
This adds a `--force-rm` flag to docker build which makes the Docker
daemon clean up all containers, even when the build has failed.
This new flag requires that we bump the remote API, so we also bump the
remote API version.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-05-19 23:10:49 +03:00
Alexandr Morozov
620c8c7253
Make chmod on ADDed files
...
Fixes #3979
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-05-20 00:09:39 +04:00
unclejack
e39299ca1d
docs: add back build to remote api v1.10 & v1.11
...
This adds back the rm query parameter to the remote api docs for api
v1.10 and v1.11.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-05-19 22:46:19 +03:00
Victor Marmol
30bd2bbc83
Merge pull request #5903 from alexlarsson/writable-proc
...
Make /proc writable, but not /proc/sys and /proc/sysrq-trigger
2014-05-19 12:21:15 -07:00
Victor Vieux
d74b6095c9
Merge pull request #5861 from crquan/fix-user-agent-trailing-space
...
Remove Trailing Whitespace in User-Agent
2014-05-19 12:08:53 -07:00
Michael Crosby
b2275ee8df
Merge pull request #5869 from vbatts/vbatts-vendor-capabilities
...
gocapability: upstream fix for unsporrted caps
2014-05-19 12:08:12 -07:00
Alexander Larsson
68493e2f7f
Make /proc writable, but not /proc/sys and /proc/sysrq-trigger
...
Some applications want to write to /proc. For instance:
docker run -it centos groupadd foo
Gives: groupadd: failure while writing changes to /etc/group
And strace reveals why:
open("/proc/self/task/13/attr/fscreate", O_RDWR) = -1 EROFS (Read-only file system)
I've looked at what other systems do, and systemd-nspawn makes /proc read-write
and /proc/sys readonly, while lxc allows "proc:mixed" which does the same,
plus it makes /proc/sysrq-trigger also readonly.
The later seems like a prudent idea, so we follows lxc proc:mixed.
Additionally we make /proc/irq and /proc/bus, as these seem to let
you control various hardware things.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-05-19 20:46:05 +02:00
Victor Vieux
ccf29f0b94
Merge pull request #5879 from timthelion/docs-sysinit-readme
...
Add README.md file for sysinit directory
2014-05-19 11:26:22 -07:00
Victor Vieux
7fb5ce44a0
Merge pull request #5875 from timthelion/docs-archive-readme
...
Add readme file for the archive directory
2014-05-19 11:25:55 -07:00
Victor Marmol
cb7680b9b9
Merge pull request #5792 from bernerdschaefer/nsinit-supports-pdeathsig
...
Add PDEATHSIG support to nsinit library
2014-05-19 11:13:23 -07:00
Victor Vieux
8674ec7f75
Merge pull request #5871 from unclejack/speed_up_buildsixtysteps
...
integcli: speed up TestBuildSixtySteps
2014-05-19 11:02:36 -07:00
Victor Vieux
40c8fc668c
Merge pull request #5876 from timthelion/docs-daemon-readme
...
Add readme for daemon directory
2014-05-19 10:51:17 -07:00
Victor Vieux
5690e03553
Merge pull request #5877 from timthelion/docs-daemon-config-readme
...
Add readme for the daemonconfig directory
2014-05-19 10:50:51 -07:00
Victor Vieux
3fa96c55e3
Merge pull request #5874 from timthelion/docs-api-readme
...
Add readme file for the api directory
2014-05-19 10:50:00 -07:00
Victor Vieux
8eef1be29e
Merge pull request #5782 from unclejack/fix_5270
2014-05-19 10:36:10 -07:00
Michael Crosby
b50c9a185c
Merge pull request #5670 from jmccrohan/master
...
client: Remove docker new version check
2014-05-19 10:26:58 -07:00
Michael Crosby
15a94fdcbb
Merge pull request #5864 from shykes/pr_out_make_cristian_maintainer_of_integration_cli_he_wrote_it
...
Make Cristian maintainer of integration-cli (he wrote it)
2014-05-19 10:26:18 -07:00
Michael Crosby
a3a26cd349
Merge pull request #5907 from vmarmol/caps
...
Don't drop CAP_FOWNER in the container.
2014-05-19 10:06:29 -07:00
Michael Crosby
265de539ff
Merge pull request #5865 from crosbymichael/add-all-caps
...
Add the rest of the caps so that they are retained in privilged mode
2014-05-19 09:56:55 -07:00
Michael Crosby
66e7cf24b7
Merge pull request #5880 from LK4D4/fix_uid_overflow_#5647
...
Check uid ranges
2014-05-19 09:55:36 -07:00
Victor Marmol
0abad3ae22
Don't drop CAP_FOWNER in the container. Also sorts the list of allowed
...
capabilities.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-05-19 16:52:39 +00:00
Michael Crosby
e1c7abe890
Add the rest of the caps so that they are retained in privilged mode
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-19 16:43:31 +00:00
James Turnbull
702442b586
Adding the FAQ back
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-05-19 10:07:57 -04:00
James Turnbull
e5422e212f
Merge pull request #5884 from brandon-rhodes/master
...
Expand the Advanced Networking page to all options
2014-05-19 03:35:48 -04:00
James Turnbull
59e37784ee
Merge pull request #5834 from waitingkuo/patch-1
...
Update ubuntulinux.md
2014-05-19 03:34:14 -04:00
Alexandr Morozov
7cd1e48230
Fix hanging on tests failing
...
Tee hanging when `go test` exit with non-zero code.
Fixes #5672
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-05-19 08:26:05 +04:00
Brandon Rhodes
ca9c35cdf7
Expand the Advanced Networking page to all options
...
For issue #5658 this rewrite of the networking page explains what every
single option (unless I missed one!) does both for the Docker server and
also the Docker client when submitting a "docker run". I somehow
thought that, when I was done, there would be a lot more about setting
up topologies like I did for my Foundations of Python Network
Programming network of Docker containers. More about making routers and
firewalls that NAT and so forth. But, at least for this draft, I think
that setting up subnets and setting up point-to-point links is most of
what Docker users will need unless they are doing something exotic.
We can always expand later.
Docker-DCO-1.1-Signed-off-by: Brandon Rhodes <brandon@rhodesmill.org > (github: brandon-rhodes)
Improve networking.md documentation per @jamtur01
Besides catching some typos and awkward sentences, @jamtur01 had several
more thorough changes to suggest:
* He illustrated the correct way to delimit "Note" paragraphs in
Docker documentation.
* He helped point out where I was presuming an Ubuntu host running
Docker, so that I could re-word those sections to be specific that
the advice only applied to Ubuntu (these mostly related to how to
set server-wide options and restart the server).
* He is happy to have "Ethernet" capitalized even where Linux
documentation would render it with an ugly lower-case first letter.
Docker-DCO-1.1-Signed-off-by: Brandon Rhodes <brandon@rhodesmill.org > (github: brandon-rhodes)
Improve networking.md per ideas from @SvenDowideit
A response to a bit of further discussion of pull request #5884 .
2014-05-18 21:58:39 -04:00
James Turnbull
3b96078856
Merge pull request #5883 from jamtur01/debianinst
...
Added basic Debian installation page
2014-05-18 19:02:48 -04:00
James Turnbull
f8974b5cfc
Fixed sudo section to match Debian installation doc
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-05-18 18:55:58 -04:00
James Turnbull
88afc8992f
Added basic Debian installation page
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-05-18 18:55:36 -04:00
James Turnbull
255eca7193
Merge pull request #5889 from financeCoding/couchdb_doc_nit
...
removing grep command that depends on perl, better for boot2docker
2014-05-18 23:29:29 +02:00
Tianon Gravi
89c4748b83
Update AUTHORS and .mailmap
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-05-18 13:26:13 -06:00
Adam Singer
7f9178c6d1
removing grep command that depends on perl, better for boot2docker
...
Docker-DCO-1.1-Signed-off-by: Adam Singer <financeCoding@gmail.com > (github: financeCoding)
2014-05-18 10:02:39 -07:00
Alexandr Morozov
72d1e40c4a
Check uid ranges
...
Fixes #5647
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-05-18 20:49:08 +04:00
O.S. Tezer
f65db7c565
Merge pull request #5882 from jamtur01/ubfix
...
Fixed description and keywords on Ubuntu installation docs
2014-05-18 17:26:29 +01:00
O.S. Tezer
a2dffd72ef
Merge pull request #5886 from financeCoding/mac_doc_nit
...
command line nit
2014-05-18 17:17:47 +01:00
Adam Singer
21e36ab36c
command line nit
2014-05-17 22:04:41 -07:00
Jonathan McCrohan
3cec63d56f
client: Rip out HTTP check from docker version
...
For background to this change please see:
https://github.com/dotcloud/docker/issues/4802
https://github.com/dotcloud/docker/pull/5670
Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com > (github: jmccrohan)
2014-05-18 02:22:22 +01:00
Jonathan McCrohan
82712ed67e
client: rearrange docker version output
...
Rearrange docker version output so that server output matches client
output
Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com > (github: jmccrohan)
2014-05-18 01:49:58 +01:00
James Turnbull
a52db7d880
Fixed description and keywords on Ubuntu installation docs
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-05-17 22:18:08 +02:00
Timothy
f9728de7a3
Add README.md file for sysinit directory
...
Note, this text is just copied from sysinit.go
See Issue #5873
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
2014-05-17 18:12:44 +00:00
Timothy
8dfd4b677b
Add readme for the daemonconfig directory
...
See Issue #5873
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
2014-05-17 18:01:47 +00:00
Timothy
b175b4dd43
Add readme for daemon directory
...
See issue #5873
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
2014-05-17 17:56:02 +00:00
Timothy
28fc387cf0
Add readme file for the archive directory
...
See issue #5873
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
2014-05-17 17:48:07 +00:00
Timothy
3e2b97ef26
Add readme file for the api directory
...
See issue #5873
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
2014-05-17 17:37:05 +00:00
unclejack
58c11ee0a8
integcli: speed up TestBuildSixtySteps
...
This improves the TestBuildSixtySteps test by switching from busybox to
scratch and simply adding a file.
This lowers the execution time of that test from 20 seconds to 5
seconds.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-05-17 17:25:56 +03:00
James Turnbull
9405a58e99
Merge pull request #5850 from rhatdan/fixmanpage
...
Add description of --volume read-only/read-write to docker-run man page.
2014-05-17 10:50:18 +02:00
O.S. Tezer
4dabca9046
Merge pull request #5832 from stevenburgess/documentation_cli_fix
...
Refactor b.tar -> busybox.tar
2014-05-17 09:42:20 +01:00
Vincent Batts
4bf03a0fac
gocapability: upstream fix for unsporrted caps
...
@vmarmol has made the fix upstream for not failing if the capability
being dropped is returned as invalid from the syscall, which is the case
when the capability is not supported on the host.
This is a blocker presently for RHEL6.5 on CAP_SYSLOG. We have patched
around this in our RPM for the time being, but this is the proper fix.
See also https://github.com/dotcloud/docker/pull/5810
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-05-17 03:51:02 -04:00
Solomon Hykes
ab6027324d
Make Cristian maintainer of integration-cli (he wrote it)
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-05-16 19:03:08 -07:00
Michael Crosby
cc84dd0967
Merge pull request #5863 from vieux/pr5862
...
Make libcontainer's CapabilitiesMask into a []string (Capabilities). + add support for CAP_FOWNER
2014-05-16 18:23:50 -07:00
Victor Vieux
9e7757a3d2
Merge pull request #5827 from vieux/fix_multiple_events_on_same_computer
...
allow 2 docker events to be opened on the same computer over unix socket
2014-05-16 18:17:46 -07:00
Victor Vieux
a0070f0c17
add support for CAP_FOWNER
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-17 01:16:07 +00:00
Victor Marmol
92614928ce
Make libcontainer's CapabilitiesMask into a []string (Capabilities).
...
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-05-17 00:44:10 +00:00
Derek
42734394b0
Remove Trailing Whitespace in User-Agent
...
After removed, the User-Agent shows in log like this:
[debug] http.go:160 https://index.docker.io/v1/repositories/busybox/images --
HEADERS: map[User-Agent:[docker/0.11.1-dev go/go1.2.2 git-commit/8887e00-dirty kernel/3.14.3-n1 os/linux arch/amd64]]
The code also moved all validation work into validVersion,
to keep the main logic as clean.
Docker-DCO-1.1-Signed-off-by: Derek <crq@kernel.org > (github: crquan)
2014-05-16 17:15:04 -07:00
Victor Vieux
704e9f9ff0
Merge pull request #5761 from SvenDowideit/pr_out_tell_the_user_not_to_run_from_osx
...
tell the user not to run -d from OSX
2014-05-16 16:52:08 -07:00
unclejack
f5b1afae74
add test for issue #5270
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-05-17 02:38:29 +03:00
unclejack
33d5b38d62
use ValidateContextDirectory to validate context
...
This commit makes the Docker cli client use ValidateContextDirectory
before attempting to create a tarball out of the context. This ensures
we avoid errors such as "unexpected EOF" during the upload of the
context.
This check is done before uploading any data and can save time and
bandwidth for remote Docker daemons.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-05-17 02:38:29 +03:00
unclejack
1dedcd0d37
add ValidateContextDirectory to utils/utils.go
...
This commit adds a function which can be used to ensure all contents of
a directory can be accessed.
This function doesn't follow symlinks to check if they're pointing to
files which exist. Such symlinks can be useful later.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-05-17 02:38:28 +03:00
unclejack
46578a2359
integcli: resolve full path to docker binary
...
Setting dockerBinary to the full path of the Docker binary is a good
idea and this is now done in the test code.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-05-17 02:38:28 +03:00
Guillaume J. Charmes
6f651ec62b
Merge pull request #5851 from proppy/archive-simple-detect
...
archive: simplify DetectCompression
2014-05-16 16:32:55 -07:00
Michael Crosby
eb61a1f73a
Merge pull request #5822 from creack/update_vendors
...
Update archive/tar vendored
2014-05-16 16:31:37 -07:00
Johan Euphrosine
4a3aefbb52
archive: add missing bytes package
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-05-16 16:26:28 -07:00
Johan Euphrosine
67ce59a806
archive: fix panic if len(source) < len(m)
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-05-16 16:25:56 -07:00
Johan Euphrosine
3118952e0a
archive: simplify DetectCompression
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-05-16 16:25:56 -07:00
Michael Crosby
58b49e60bb
Merge pull request #4882 from vieux/fix_merge_issue_tty
...
Fix merge issue tty
2014-05-16 15:42:43 -07:00
Victor Vieux
2c8b63cb75
do not merge -i or -t options
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-05-16 22:31:16 +00:00
Victor Vieux
366f084eb0
add test
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-05-16 22:23:32 +00:00
Brandon Philips
a42e451e10
chore(graph/graph): remove dead code
...
This code was introduced with commented out sections. Just delete them.
Original commit: 18fc707fdfbrandon.philips@coreos.com > (github: philips)
2014-05-16 14:26:14 -07:00
Victor Vieux
00ce30bc74
Merge pull request #5571 from vieux/fix_race_docker_daemon
...
Fix race docker daemon
2014-05-16 13:57:43 -07:00
Victor Vieux
1adc2fa533
Merge pull request #5853 from proppy/update-tarfilter-comment
...
archive: update TarFilter comments
2014-05-16 13:06:12 -07:00
Victor Vieux
4b587ac118
Merge pull request #5436 from hobofan/master
...
reapply Cmd value even if CmdAdd returns early
2014-05-16 12:45:23 -07:00
Johan Euphrosine
311614952e
archive: update TarFilter comments
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-05-16 12:44:42 -07:00
Dan Walsh
2e0d47e5c4
Add description of --volume read-only/read-write to docker-run man page.
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-05-16 15:06:34 -04:00
Michael Crosby
62c3183fc8
Merge pull request #5833 from ActiveState/fix_nsinit_env_panic
...
fix panic when passing empty environment
2014-05-16 12:03:26 -07:00
Sridhar Ratnakumar
d787f2731e
fix panic when passing empty environment
...
Docker-DCO-1.1-Signed-off-by: Sridhar Ratnakumar <github@srid.name > (github: srid)
2014-05-16 11:55:34 -07:00
Victor Marmol
01d10d6f13
Merge pull request #5810 from vmarmol/drop-caps
...
Change libcontainer to drop all capabilities by default.
2014-05-16 11:51:41 -07:00
Michael Crosby
23062e55fd
Merge pull request #5396 from lalyos/5370-infinite-loop-caused-by-symlink
...
5370 infinite loop caused by symlink
2014-05-16 11:28:37 -07:00
Victor Vieux
808d28033b
Merge pull request #5841 from unclejack/run_pull_latest
...
run: pull only latest when no tag specified
2014-05-16 11:21:29 -07:00
Michael Crosby
dbd6f10b3d
Merge pull request #5842 from alexlarsson/dm-cleanup-tests
...
devicemapper: Remove non-general tests
2014-05-16 11:08:04 -07:00
Victor Vieux
2b3b03b596
Merge pull request #5837 from proppy/patch-2
...
server/buildfile: correct daemon.Create comments
2014-05-16 10:51:09 -07:00
Johan Euphrosine
8b31824ad6
server/buildfile: correct daemon.Create comments
...
s/and start it//
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-05-16 10:50:02 -07:00
Victor Vieux
021ac36a70
Merge pull request #5838 from timthelion/patch-1
...
Typo in execdrivers.go five => give
2014-05-16 10:49:44 -07:00
Tianon Gravi
6dd4fa0b74
Merge pull request #5840 from unclejack/upstart_mounted
...
Update contrib/init/upstart to "start on local-filesystems"
2014-05-16 10:16:34 -06:00
unclejack
ba0c829291
contrib/init/upstart: start on local-filesystems
...
This changes the upstart init script to start on `local-filesystems`.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-05-16 19:12:59 +03:00
Chris St. Pierre
1ee423bd5d
added timeout when waiting for docker pidfile
...
Docker-DCO-1.1-Signed-off-by: Chris St. Pierre <chris.a.st.pierre@gmail.com > (github: stpierre)
2014-05-16 09:36:54 -04:00
Chris St. Pierre
a598dba134
Wait for pidfile to exist when starting with Redhat init script
...
Fixes #5359
Docker-DCO-1.1-Signed-off-by: Chris St. Pierre <chris.a.st.pierre@gmail.com > (github: stpierre)
2014-05-16 09:08:59 -04:00
unclejack
b8e338144e
run: pull only latest when no tag specified
...
This makes Docker pull only the image tagged as latest when no tag has
been specified. This makes Docker pull only the image it'll run.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-05-16 15:23:47 +03:00
Alexander Larsson
39d244a593
devmapper: Remove sys.go mocking framework
...
This is no longer needed, as the tests are gone.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-05-16 14:12:56 +02:00
Bernerd Schaefer
6a1d76bc7b
nsinit.DefaultCreateCommand sets Pdeathsig to SIGKILL
...
Docker-DCO-1.1-Signed-off-by: Bernerd Schaefer <bj.schaefer@gmail.com > (github: bernerdschaefer)
2014-05-16 13:48:41 +02:00
Bernerd Schaefer
00e1adfead
nsinit.Init() restores parent death signal before exec
...
Docker-DCO-1.1-Signed-off-by: Bernerd Schaefer <bj.schaefer@gmail.com > (github: bernerdschaefer)
2014-05-16 13:48:41 +02:00
Timothy Hobbs
408f050d64
Typo in execdrivers.go five => give
...
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: timthelion)
2014-05-16 11:45:20 +00:00
O.S. Tezer
c4fc591fbe
Merge pull request #5828 from SvenDowideit/pr_out_update_the_cli_md_docs_with_the_output_of_the_docker_command
...
Update the cli.md docs with the output of the docker command
2014-05-16 12:10:55 +01:00
Alexander Larsson
bd6fd25dfb
devicemapper: Remove non-general tests
...
Now that we have the generic graphtest tests that actually tests
the driver we can remove the old mock-using tests. Almost all of
these tests were disabled anyway, and the four remaining ones
didn't really test much while at the same time being really
fragile and making the rest of the code more complex due to
the mocking setup.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-05-16 12:46:28 +02:00
waitingkuo
1b4915c1a8
Update ubuntulinux.md
...
In Ubuntu 14.04, we should use
$ sudo service docker.io restart
instead of
$ sudo service docker restart
2014-05-16 17:08:05 +08:00
Steven Burgess
ddb99054bc
Refactor b.tar -> busybox.tar
...
The file was saved as busybox.tar, but the ls commands named it b.tar.
Docker-DCO-1.1-Signed-off-by: Steven Burgess <steven.a.burgess@hotmail.com > (github: stevenburgess)
2014-05-15 22:33:28 -04:00
Victor Marmol
9d6875d19d
Change libcontainer to drop all capabilities by default. Only keeps
...
those that were specified in the config. This commit also explicitly
adds a set of capabilities that we were silently not dropping and were
assumed by the tests.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-05-16 00:57:58 +00:00
Michael Crosby
08a7bcf5db
Merge pull request #5497 from alexlarsson/generic-driver-tests
...
graphdriver: Add generic test framework for graph drivers
2014-05-15 17:21:09 -07:00
Guillaume J. Charmes
4353ee78e8
Merge pull request #5454 from kzys/utime-omit
...
UTIME_OMIT is only available on Linux
2014-05-15 17:18:37 -07:00
Solomon Hykes
87fc7130a4
Merge pull request #5461 from SvenDowideit/getmaintainers.sh
2014-05-15 17:15:40 -07:00
Sven Dowideit
6297f333bd
Merge pull request #5802 from shykes/pr_out_add_licensing_information_to_readme
...
Add Licensing information to README
2014-05-16 10:08:46 +10:00
Sven Dowideit
8da44c9b2a
Merge pull request #5732 from SvenDowideit/pr_out_the_last_remaining_raw_github_com_url_s
...
the last remaining raw.github.com URL's
2014-05-16 10:01:14 +10:00
SvenDowideit
d35330bb7a
Update the cli.md docs with the output of the docker command
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-05-16 10:00:20 +10:00
Victor Vieux
81ffd6530a
allow 2 docker events to be opened on the same computer over unix socket
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-15 23:27:36 +00:00
Guillaume J. Charmes
924aa984cf
Merge pull request #5823 from proppy/archive-bufio
...
archive: use bufio for compression detection
2014-05-15 16:08:21 -07:00
lalyos
ad35d522db
Fixes 5370 infinite/maxLoopCount loop for relative symlinks
...
use path.IsAbs() instead of checking if first char is '/'
Docker-DCO-1.1-Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com > (github: lalyos)
2014-05-16 01:03:11 +02:00
lalyos
b51c366bfc
Defend against infinite loop when following symlinks
...
ideally it should never reach it, but there was already multiple issues with infinite loop
at following symlinks. this fixes hanging unit tests
Docker-DCO-1.1-Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com > (github: lalyos)
2014-05-16 00:47:20 +02:00
lalyos
8b77a5b7ae
Adding test case for symlink causes infinit loop, reproduces: dotcloud#5370
...
normally symlinks are created as either
ln -s /path/existing /path/new-name
or
cd /path && ln -s ./existing new-name
but one can create it this way
cd /path && ln -s existing new-name
this drives FollowSymlinkInScope into infinite loop
Docker-DCO-1.1-Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com > (github: lalyos)
2014-05-16 00:47:20 +02:00
Guillaume J. Charmes
aedcb76adc
Add test for invalid tarball read
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-05-15 15:45:40 -07:00
Guillaume J. Charmes
094926206b
Update archive/tar vendored
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-05-15 15:40:26 -07:00
James Turnbull
e5a5808f51
Merge pull request #5820 from joelhandwell/patch-1
...
changed deprecated option styles to supported ones
2014-05-16 00:40:16 +02:00
Victor Vieux
041dbcb7be
Merge pull request #5826 from tianon/add-cross-to-test
...
Add "cross" to the "test" Makefile target
2014-05-15 15:35:18 -07:00
Tianon Gravi
8ec01f9dc1
Add "cross" to the "test" Makefile target
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-05-15 16:21:17 -06:00
Johan Euphrosine
77c2b76e44
archive: use bufio for compression detection
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-05-15 11:41:07 -07:00
Joel Handwell
10a320818e
changed deprecated option styles to supported ones
...
-name and -rm to --name and --rm
2014-05-15 10:50:59 -04:00
Sven Dowideit
5dfe7c43d4
Merge pull request #5816 from unclejack/docs_run_cache
...
docs: explain when RUN cache gets invalidated
2014-05-15 19:54:15 +10:00
unclejack
239d1ef301
docs: explain when RUN cache gets invalidated
...
This adds a few lines to the RUN Dockerfile docs to explain how to
bypass the RUN caching and how ADD can also invalidate the cache for
these instructions.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-05-15 12:32:01 +03:00
Bernerd Schaefer
002aa8fc20
Add GetParentDeathSignal() to pkg/system
...
Docker-DCO-1.1-Signed-off-by: Bernerd Schaefer <bj.schaefer@gmail.com > (github: bernerdschaefer)
2014-05-15 10:17:44 +02:00
Sven Dowideit
8887e00630
Merge pull request #5762 from SvenDowideit/pr_out_add_some_more_specific_help_for_dockerfile_build_contexts
...
Add some more specific help for Dockerfile build contexts.
2014-05-15 11:03:22 +10:00
Solomon Hykes
8d213e91b3
Merge pull request #5706 from vieux/remove_add_string
2014-05-14 17:31:52 -07:00
James Turnbull
db4d534b5b
Merge pull request #5800 from jamtur01/paras
...
Updated a bunch of formatting in the docs/sources/use files
2014-05-15 01:58:14 +02:00
SvenDowideit
ed703fc8be
Add some more specific help for Dockerfile build contexts.
...
I've copy and pasted the error message so its googlable.
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-05-15 09:41:05 +10:00
Sven Dowideit
d9e3d88082
Merge pull request #5801 from jamtur01/fixups
...
Minor fixups to the Docs README
2014-05-15 09:38:52 +10:00
James Turnbull
2269472f3a
Updated a bunch of formatting in the docs/sources/use files
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-05-15 01:26:36 +02:00
Michael Crosby
6ff6aad9b8
Merge pull request #5809 from crosbymichael/move-cgroups
...
Move cgroups package into libcontainer
2014-05-14 16:06:32 -07:00
Michael Crosby
b22d10e3c5
Remove the cgroups maintainer file
...
We don't need this because it is covered by the libcontainer MAINTAINERS
file
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-14 16:01:45 -07:00
Michael Crosby
b0578d0ac7
Merge pull request #5772 from unclejack/improve_commit_performance
...
process directories in parallel in ChangesDirs
2014-05-14 15:49:11 -07:00
Michael Crosby
3b7a19def6
Move cgroups package into libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-14 15:21:44 -07:00
Tianon Gravi
8904dfe082
Merge pull request #5657 from tianon/sysvinit-should-start
...
Add "Should-Start" cgroupfs-mount and cgroup-lite to sysvinit-debian init script
2014-05-14 16:05:32 -06:00
Michael Crosby
76f09c2ecf
Merge pull request #5807 from crosbymichael/dev-symlinks
...
Setup standard /dev symlinks
2014-05-14 14:17:33 -07:00
Victor Vieux
49deffe6fe
Merge pull request #5806 from icecrime/5766-events_endless_newlines
...
Issue #5766 - Check channel closed state in /events loop
2014-05-14 14:09:26 -07:00
O.S. Tezer
343c24a5fa
Merge pull request #5805 from joelhandwell/patch-2
...
changed deprecated -name option to --name
2014-05-14 22:09:17 +01:00
O.S. Tezer
79be9f8d7f
Merge pull request #5804 from joelhandwell/patch-1
...
changed deprecated -rm option to --rm
2014-05-14 22:08:01 +01:00
unclejack
359f8aca29
process directories in parallel in ChangesDirs
...
This commit lowers the total time spent in ChangesDirs to half during a
commit.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-05-15 00:03:33 +03:00
Bernerd Schaefer
2bc34036b9
Setup standard /dev symlinks
...
After copying allowed device nodes, set up "/dev/fd", "/dev/stdin",
"/dev/stdout", and "/dev/stderr" symlinks.
Docker-DCO-1.1-Signed-off-by: Bernerd Schaefer <bj.schaefer@gmail.com > (github: bernerdschaefer)
[rebased by @crosbymichael]
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-14 13:59:13 -07:00
James Turnbull
f664e9a7d9
Added to small patch exemption to cover Markdown/syntax errors in documentation
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-05-14 22:43:54 +02:00
Arnaud Porterie
8699f53e6a
Check channel closed state in /events loop
...
When listener channel is closed, it becomes always available for
reading: select becomes an active loop which writes default-constructed
events (i.e: empty strings).
Fixes #5766 .
Docker-DCO-1.1-Signed-off-by: Arnaud Porterie <arnaud.porterie@gmail.com > (github: icecrime)
2014-05-14 22:35:04 +02:00
Guillaume J. Charmes
17a1f470ae
Merge pull request #5783 from LK4D4/fix_duplicate_ip_allocation_#5729
...
Fix duplicate ip allocation
2014-05-14 13:32:27 -07:00
Joel Handwell
2d622df835
changed deprecated -name option to --name
...
changed deprecated -name option to --name
2014-05-14 16:24:08 -04:00
Joel Handwell
137f4b326a
changed deprecated -rm option to --rm
...
changed deprecated -rm option to --rm
2014-05-14 16:22:38 -04:00
Michael Crosby
4af465fccf
Merge pull request #5720 from cyphar/5656-cp-absolute-paths
...
Ensure `docker cp` cannot traverse outside container rootfs
2014-05-14 11:46:11 -07:00
Victor Vieux
d066ceaa4f
Merge pull request #5752 from crosbymichael/fix-port-mapping-ps
...
Fix port mapping in ps display for public and private
2014-05-14 11:36:23 -07:00
Victor Vieux
bc22c9948c
Merge pull request #5756 from crosbymichael/move-units-to-pkg
...
Move duration and size to units pkg
2014-05-14 11:36:14 -07:00
Victor Vieux
c78b390b6c
Merge pull request #5780 from vbatts/vbatts-start_tarsum_test
...
tarsum: start a test for TarSum
2014-05-14 11:28:26 -07:00
James Turnbull
a50a46048b
Minor fixups to the Docs README
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-05-14 20:14:06 +02:00
James Turnbull
d9b1c1976f
Merge pull request #5787 from SvenDowideit/pr_out_add_a_mention_of_80_column_lines_and_reflow_the_document_to_hide_the_evidence
...
Add a mention of 80 column lines and reflow the document to hide the evidence.
2014-05-14 20:13:48 +02:00
Michael Crosby
de406b69f3
Merge pull request #5798 from unclejack/fix_startup_speed
...
don't update Suffixarray for every Register during startup
2014-05-14 11:13:02 -07:00
Michael Crosby
432e42e715
Merge pull request #5791 from bernerdschaefer/nsinit-exec-forwards-signals
...
"nsinit exec ..." forwards signals to container
2014-05-14 11:05:27 -07:00
Victor Vieux
3bf1b562e3
Merge pull request #5781 from creack/remove_bind_console
...
Remove the bind mount for dev/console which override the mknod/label
2014-05-14 10:57:21 -07:00
unclejack
fc82199d4f
Merge pull request #5758 from crosbymichael/add-cpuset
...
Add cpuset cpus support for docker
2014-05-14 20:57:12 +03:00
Victor Vieux
b561f0398a
Merge pull request #5794 from unclejack/speed_up_ps
...
don't call sort for every add in daemon/history
2014-05-14 10:48:08 -07:00
Vincent Batts
d153740d9c
tarsum: adding benchmarks
...
to cover a couple of use-cases:
* 1mb file, using no compression
* 1mb file, using compression
* 1024 1k files, using no compression
* 1024 1k files, using compression
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-05-14 11:48:17 -04:00
unclejack
5d5c89398c
update Suffixarray only once during daemon startup
...
This commit makes the Docker daemon call UpdateSuffixarray only after
it finishes registering all containers.
This lowers the amount of time required for the Docker daemon to start
up.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-05-14 17:58:37 +03:00
unclejack
219b7ae8b5
add UpdateSuffixarray and refactor TruncIndex
...
This commit refactors TruncIndex to make it possible to add container
ids to the TruncIndex without updating the Suffixarray.
This is useful during the Docker daemon's startup when we don't want to
update the Suffixarray for every container we add.
Add continues to function like before.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-05-14 17:57:59 +03:00
unclejack
e963179c79
don't call sort for every add in history
...
This moves the call to sort in daemon/history to a function to be
called explicitly when we're done adding elements to the list.
This speeds up `docker ps`.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-05-14 15:02:02 +03:00
Bernerd Schaefer
830c2d7fa3
"nsinit exec ..." forwards signals to container
...
Docker-DCO-1.1-Signed-off-by: Bernerd Schaefer <bj.schaefer@gmail.com > (github: bernerdschaefer)
2014-05-14 11:01:02 +02:00
James Turnbull
cb0f2a2823
Merge pull request #5785 from SvenDowideit/pr_out_subject_and_object_containers_can_be_confused
...
Subject and object containers can be confused
2014-05-14 07:56:31 +02:00
Alexandr Morozov
80fca061e7
Change ip allocation logic
...
Now IP reuses only after all IPs from network was allocated
Fixes #5729
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-05-14 06:43:10 +04:00
Alexandr Morozov
5128feb690
Refactoring collections/orderedintset and benchmarks for it
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-05-14 06:04:12 +04:00
Michael Crosby
adbe3096e8
Add cpuset cpus support for docker
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-13 18:17:12 -07:00
Michael Crosby
4de6810be9
Merge pull request #5786 from crosbymichael/cpuset-copy
...
Copy parents cpus and mems for cpuset
2014-05-13 18:16:47 -07:00
cyphar
0fb507dc23
daemon: *: refactored container resource path generation
...
This patch is a preventative patch, it fixes possible future
vulnerabilities regarding unsantised paths. Due to several recent
vulnerabilities, wherein the docker daemon could be fooled into
accessing data from the host (rather than a container), this patch
was created to try and mitigate future possible vulnerabilities in
the same vein.
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
2014-05-14 11:15:50 +10:00
cyphar
79ca77f3e8
integration-cli: cp: added tests for cp
...
This patch adds integration tests for the copying of resources
from a container, to ensure that regressions in the security of
resource copying can be easily discovered.
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
2014-05-14 11:14:59 +10:00
cyphar
bfc3a4192a
daemon: container: ensure cp cannot traverse outside container rootfs
...
This patch fixes the bug that allowed cp to copy files outside of
the containers rootfs, by passing a relative path (such as
../../../../../../../../etc/shadow). This is fixed by first converting
the path to an absolute path (relative to /) and then appending it
to the container's rootfs before continuing.
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
2014-05-14 11:14:59 +10:00
Michael Crosby
3de15bda7e
Copy parents cpus and mems for cpuset
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-13 18:01:31 -07:00
SvenDowideit
195f3a3f42
Add a mention of 80 column lines and reflow the document to hide the
...
evidence.
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-05-14 10:22:55 +10:00
SvenDowideit
af891a6751
Subject and object containers can be confused
...
and `create` is now a loaded word for some readers
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-05-14 07:43:41 +10:00
Vincent Batts
cfd1227e91
tarsum: test gofmt
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-05-13 15:14:32 -04:00
Vincent Batts
efa369a6ee
tarsum: adding the layer for "scratch" image
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-05-13 15:08:48 -04:00
Guillaume J. Charmes
ae85dd5458
Remove the bind mount for dev/console which override the mknod/label
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-05-13 11:59:27 -07:00
Vincent Batts
461f801f83
tarsum: start a test for TarSum
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-05-13 14:57:31 -04:00
Victor Vieux
f637eaca5d
Merge pull request #5778 from crosbymichael/check-symlink
...
Ensure libcontainer follows correct symlink in scope
2014-05-13 11:28:00 -07:00
Michael Crosby
ea7647099f
Add MAINTAINERS file to symlink pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-13 11:27:24 -07:00
Michael Crosby
ca040b1a37
Update code to handle new path to Follow Symlink func
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-13 10:54:08 -07:00
Michael Crosby
dcf81f95fd
Move Follow symlink to pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-13 10:35:57 -07:00
Alexander Larsson
b7c7b851dc
libcontainer: Ensure bind mount target files are inside rootfs
...
Before we create any files to bind-mount on, make sure they are
inside the container rootfs, handling for instance absolute symbolic
links inside the container.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-05-13 10:24:52 -07:00
Sven Dowideit
1d4caadfe2
Merge pull request #5769 from dankeder/master
...
Fix a typo in contrib/man/md/docker.1.md
2014-05-13 20:26:02 +10:00
Dan Keder
653328c6ce
Fix a typo in contrib/man/md/docker.1.md
2014-05-13 11:17:42 +02:00
Sven Dowideit
a70bffd382
Merge pull request #5745 from ojilles/patch-1
...
Cleaned up Network settings overview
2014-05-13 19:02:18 +10:00
unclejack
f1eabe436a
Merge pull request #5655 from alexlarsson/mount-run-dir
...
Always mount a /run tmpfs in the container
2014-05-13 11:51:14 +03:00
Solomon Hykes
ee4fa10fb0
Merge pull request #5753 from creack/fix-beam-32bit
...
[beam] Use direct iota instead of binary shift
2014-05-13 00:21:32 -07:00
James Turnbull
5ac3c6c4ed
Merge pull request #5757 from SvenDowideit/pr_out_was_checking_something_for_a_pr_and_noticed_some_quote_issues
...
Was checking something for a PR and noticed some quote issues
2014-05-13 06:37:12 +02:00
SvenDowideit
fe445a2447
tell the user not to run from OSX
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-05-13 12:51:00 +10:00
Michael Crosby
5b525feaed
Merge pull request #5707 from vieux/fix_event_removal
...
fix event removal
2014-05-12 18:59:42 -07:00
Victor Vieux
937f8f2d81
move acceptconnections as builtin
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-13 01:53:38 +00:00
Victor Vieux
f3736265fd
make listen buffer optional
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-13 01:51:41 +00:00
Victor Vieux
a0f799b6d4
Merge pull request #5759 from vieux/move_register_links_to_daemon
...
move RegisterLinks to daemon
2014-05-12 18:39:47 -07:00
Victor Vieux
100a92146e
move RegisterLinks to daemon
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-13 00:54:46 +00:00
SvenDowideit
b9c2d57d89
Was checking something for a PR and noticed some quote issues
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-05-13 10:36:19 +10:00
Sven Dowideit
3f6ec6ebba
Merge pull request #5747 from ojilles/patch-2
...
runmetrics update, linking to collectd plugin rather than just hinting
2014-05-13 10:21:34 +10:00
Michael Crosby
d33b4655c4
Move duration and size to units pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-12 17:05:07 -07:00
Michael Crosby
d54dec4d8b
Fix port mapping in ps display for public and private
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-12 15:26:23 -07:00
Guillaume J. Charmes
0d78799db7
Merge pull request #5751 from vieux/move_version
...
move version out of server
2014-05-12 15:25:40 -07:00
Victor Vieux
7894a70f8b
move version out of server
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-12 21:38:20 +00:00
Guillaume J. Charmes
bc77ec2b17
Merge pull request #5717 from philips/mkdir-in-daemon
...
fix(daemon): ensure the /var/lib/docker dir exists
2014-05-12 14:13:56 -07:00
Solomon Hykes
43e926cd9c
Merge pull request #5750 from vieux/vieux_server_maintainer
...
add vieux as server's MAINTAINERS
2014-05-12 13:56:30 -07:00
Victor Vieux
1d15c0b491
add vieux as server's MAINTAINERS
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-12 20:51:45 +00:00
Michael Crosby
aa1fc36a92
Merge pull request #5696 from cyphar/rev-ubuntu-dockerfile
...
Update Ubuntu release used for builds
2014-05-12 13:21:38 -07:00
Alexander Larsson
905795ece6
Always mount a /run tmpfs in the container
...
All modern distros set up /run to be a tmpfs, see for instance:
https://wiki.debian.org/ReleaseGoals/RunDirectory
Its a very useful place to store pid-files, sockets and other things
that only live at runtime and that should not be stored in the image.
This is also useful when running systemd inside a container, as it
will try to mount /run if not already mounted, which will fail for
non-privileged container.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-05-12 21:41:04 +02:00
Michael Crosby
30a40de205
Merge pull request #5748 from crosbymichael/libcontainer-bindmounts
...
libcontainer: Create dirs/files as needed for bind mounts
2014-05-12 12:27:18 -07:00
Michael Crosby
cc678a7078
Remove newline char in error message
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-12 12:24:30 -07:00
Michael Crosby
243eaac8b6
Merge pull request #5724 from tutumcloud/5718-lxcbugfix
...
Fix bug on LXC container start. Fixes #5718
2014-05-12 12:14:57 -07:00
Michael Crosby
16fe76e770
Merge pull request #5712 from vishh/fix_typo
...
Correct a libcontainer Mount Namespace setup comment.
2014-05-12 12:07:19 -07:00
Vishnu Kannan
fee1bbd79e
Correct a comment in libcontainer Mount Namespace setup.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
2014-05-12 19:01:36 +00:00
Jilles Oldenbeuving
79f234e049
runmetrics update, linking to collectd plugin rather than just hinting
2014-05-12 20:51:40 +02:00
Jason Hall
3e636446c3
Update google.md
...
Fix numbering resets after code sample blocks
2014-05-12 14:48:03 -04:00
Jilles Oldenbeuving
feb42d3f97
Cleaned up Network settings overview
2014-05-12 20:35:18 +02:00
unclejack
4c06506994
Merge pull request #5729 from fabiofalci/link_unlink_test
...
Integration test for link and unlink containers
2014-05-12 21:06:03 +03:00
Victor Vieux
34b7e352eb
Merge pull request #5741 from creack/remove_unused_file-2
...
Remove signal_freebsd (already in pkg/signal)
2014-05-12 10:47:45 -07:00
Thatcher
27a39bfd1a
Merge pull request #5621 from ostezer/docs-add-pardot
...
Add code for Pardot implementation to docs
2014-05-12 09:18:12 -07:00
O.S. Tezer
0f88dbd744
Merge pull request #5731 from SvenDowideit/reduce-cache-max-age
...
reduce cache time to 1 hours so future docs releases update the cloudfront caches faster
2014-05-12 17:05:55 +01:00
O.S. Tezer
8700d68b19
Merge pull request #5730 from SvenDowideit/fix-hostname-for-redirects
...
Give the Redirect a HostName - filled in from the s3 bucket name.
2014-05-12 15:03:03 +01:00
Alexander Larsson
70ef53f25e
libcontainer: Create dirs/files as needed for bind mounts
...
If you specify a bind mount in a place that doesn't have a file yet we
create that (and parent directories). This is needed because otherwise
you can't use volumes like e.g. /dev/log, as that gets covered by the
/dev tmpfs mounts.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-05-12 09:57:15 +02:00
Sven Dowideit
c1108f5d60
the last remaining raw.github.com URL's
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-05-12 14:50:41 +10:00
Sven Dowideit
1dec8fd03c
reduce cache time to 1 hours so future docs releases update the cloudfront caches faster
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-05-12 11:31:44 +10:00
Sven Dowideit
0d59cc080a
Give the Redirect a HostName - filled in from the s3 bucket name.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-05-12 10:31:27 +10:00
Fabio Falci
7cc27b2075
Integration test for link and unlink containers
...
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: fabiofalci)
2014-05-11 21:33:01 +01:00
Guillaume J. Charmes
62bfef59f7
Use int64 instead of int
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-05-11 06:23:53 -07:00
Vincent Mayers
a4a023580b
Add Licensing information to README
...
Docker-DCO-1.1-Signed-off-by: Vincent Mayers vince.mayers@gmail.com (github: vincentmayers)
[solomon@docker.com: rephrased commit message and transcribed signoff]
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-05-11 08:03:31 +00:00
Guillaume J. Charmes
3f8ffb461a
Remove signal_freebsd (already in pkg/signal)
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-05-11 01:03:12 -07:00
Fernando
752c57ae56
Fix bug on LXC container start. Fixes #5718
...
Docker-DCO-1.1-Signed-off-by: Fernando Mayo <fernando@tutum.co > (github: fermayo)
2014-05-10 18:05:02 -04:00
Solomon Hykes
5877ae2462
Merge pull request #5716 from shykes/pr_out_engine_receiver_and_sender_preserve_job_env
2014-05-09 19:47:32 -07:00
Solomon Hykes
4dc16ab546
Merge pull request #5432 from shykes/image-subsystem-1
2014-05-09 19:19:33 -07:00
Solomon Hykes
ff4ef50470
Start separating the image subsystem
...
This is a first step towards moving all code related to local
manipulation of images into a cleanly separated subsystem,
accessible via a stable set of commands in the engine API.
`graph.TagStore` now implements `engine.Installer`. For now, it
is installed by `Server.InitServer`, along with all other Server
commands. However this will change in future patches.
`graph.TagStore.Install` registers the following commands:
* `image_set` creates a new image and stores it locally.
* `image_get` returns information about an image stored locally.
* `image_tag` assigns a new name and tag to an existing image.
These commands are a pre-requisite for moving 'push' and 'pull'
out of `Server`.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-05-09 19:15:26 -07:00
Solomon Hykes
d6e666a87a
Merge pull request #5635 from vbatts/vbatts-registry_maintainers
2014-05-09 19:07:25 -07:00
cyphar
46a47f0dcb
Dockerfile: updated ubuntu release used for builds
...
This patch just revs the Ubuntu release used for builds from 13.10
to 14.04.
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
2014-05-10 11:38:12 +10:00
Brandon Philips
b4ccd7cbfb
fix(daemon): ensure the /var/lib/docker dir exists
...
The btrfs driver attempts to stat the /var/lib/docker directory to
ensure it exists. If it doesn't exist then it bails with an unhelpful
log line:
```
2014/05/10 00:51:30 no such file or directory
```
In 0.10 the directory was created but quickly digging through the logs I
can't tell what sort of re-ordering of code caused this regression.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-05-09 18:09:26 -07:00
Solomon Hykes
a1754c7e46
Engine: Receiver and Sender preserve Job.Env
...
When sending a new job to a `engine.Sender`, the corresponding
`engine.Receiver` will receive that job with its environment preserved.
Previously the job name, arguments and streams were preserved but the
env was lost.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-05-09 17:10:33 -07:00
Solomon Hykes
c7978c9809
Engine: Env.MultiMap, Env.InitMultiMap: import/export to other formats
...
* `Env.MultiMap` returns the contents of an Env as `map[string][]string`
* `Env.InitMultiMap` initializes the contents of an Env from a `map[string][]string`
This makes it easier to import and export an Env to other formats
(specifically `beam/data` messages)
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-05-09 17:06:32 -07:00
Solomon Hykes
2af030ab57
beam/data: Message.GetOne() returns the last value set at a key
...
This is a convenience for callers which are only interested in one value
per key. Similar to how HTTP headers allow multiple keys per value, but
are often used to store and retrieve only one value.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-05-09 17:01:27 -07:00
Solomon Hykes
9dc66f8822
Merge pull request #5713 from shykes/pr_out_engine_ensure_all_pipes_are_properly_closed_by_receiver_and_sender
2014-05-09 16:16:56 -07:00
Solomon Hykes
d61190169d
Engine: ensure all pipes are properly closed by Receiver and Sender
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
[michael@docker.com: fix stdin closing in engine.Job.Run]
[michael@docker.com: fix fd leak in engine.Receiver.Run]
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Docker-Tested-By: Solomon Hykes <solomon@docker.com>
Docker-Tested-by: Michael Crosby <michael@docker.com>
2014-05-09 16:12:21 -07:00
Solomon Hykes
a7e61a21c0
Merge pull request #5687 from shykes/pr_out_engine_fix_a_timeout_bug_in_sender_receiver
2014-05-09 15:50:53 -07:00
Solomon Hykes
bf25951837
Engine: slightly more stress-testing of Receiver/Sender to reproduce the hang problem
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-05-09 15:49:44 -07:00
Solomon Hykes
dfdc03b061
Engine: fix a timeout bug in Sender/Receiver
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-05-09 15:49:44 -07:00
Solomon Hykes
0aeff69e59
Fix stdin handling in engine.Sender and engine.Receiver
...
This introduces a superficial change to the Beam API:
* `beam.SendPipe` is renamed to the more accurate `beam.SendRPipe`
* `beam.SendWPipe` is introduced as a mirror to `SendRPipe`
There is no other change in the beam API.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-05-09 15:39:55 -07:00
Victor Vieux
670564d070
fix event removal
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-09 22:12:54 +00:00
Michael Crosby
da0686481c
Merge pull request #5709 from vieux/conflict_h_net
...
returns an error when using -h and --net
2014-05-09 14:53:46 -07:00
Victor Vieux
2899195540
returns an error when using -h and --net
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-09 21:42:22 +00:00
Jérôme Petazzoni
29f1efc940
Merge pull request #5463 from tianon/hack-dind-cgroup
...
Update hack/dind to mount cgroups on "/cgroup" instead of "/sys/fs/cgroup" for better compatibility
2014-05-09 13:54:52 -07:00
Victor Vieux
0f6fe22833
Merge pull request #5686 from crosbymichael/cast-to-closer
...
Cast Input and Output to io.Closer
2014-05-09 11:17:53 -07:00
Victor Vieux
e304e3a662
remove addString and replace Tail
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-09 18:09:59 +00:00
Aaron Huslage
5dfe0945c3
Fixing pre-commit-msg URL
...
URL referred to raw.github.com instead of raw.githubusercontent.com. Fixed.
Docker-DCO-1.1-Signed-off-by: Aaron Huslage <huslage@gmail.com > (github: huslage)
2014-05-09 13:56:20 -04:00
O.S. Tezer
d4c774de97
Merge pull request #5697 from mshytikov/fix/doc
...
Added value format description for VOLUME instruction in builder doc
2014-05-09 17:14:27 +01:00
Max Shytikov
b5a37127aa
Added value format description for VOLUME instruction
...
In the documentation was not mentioned explicitly that VOLUME value
shoud be a valid JSON array. Because of this I spent time to discovering
the problem with my image where I put `VOLUME ['/data']` (with single quotes).
The `['/data']` mount point was parsed and mounted whole as a string without
any errors and warnings.
Docker-DCO-1.1-Signed-off-by: Max Shytikov <mshytikov@gmail.com > (github: mshytikov)
2014-05-09 16:37:55 +02:00
Alexander Larsson
55cd7dd7f9
grapdriver: Skip tests on non-supported backends
...
For now this means the btrfs backend is skipped when run
inside make test. You can however run it manually if you want.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-05-09 14:48:39 +02:00
Alexander Larsson
4bdb8c03fc
graphdriver: Fail initialization if supported but got error
...
If a graphdriver fails initialization due to ErrNotSupported we ignore
that and keep trying the next. But if some driver has a different
error (for instance if you specified an unknown option for it) we fail
the daemon startup, printing the error, rather than falling back to an
unexected driver (typically vfs) which may not match what you have run
earlier.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-05-09 14:48:39 +02:00
Alexander Larsson
27744062aa
graphdriver: Add generic test framework for graph drivers
...
This adds daemon/graphdriver/graphtest/graphtest which has a few
generic tests for all graph drivers, and then uses these
from the btrs, devicemapper and vfs backends.
I've not yet added the aufs backend, because i can't test that here
atm. It should work though.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-05-09 14:48:39 +02:00
Alexander Larsson
84f19a09ac
vfs graphdriver: Make root dir mode 755
...
This matches the other backends.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-05-09 14:48:38 +02:00
Alexander Larsson
47c79870ea
devmapper: Properly restore mocked functions after test
...
Currently the tests that mocks or denies functions leave this state
around for the next test. This is no good if we want to actually
test the devicemapper code in later tests.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-05-09 14:48:38 +02:00
James Turnbull
79dc316a86
Merge pull request #5583 from ostezer/docs-ui-add-codeblock-scrolling
...
Introduce x-axe scrolling to code-blocks.
2014-05-09 10:31:52 +02:00
James Turnbull
12201e2ea3
Merge pull request #5599 from ostezer/docs-rewrite-examples-mongodb
...
Rewrite and update the MongoDB service article
2014-05-09 10:25:37 +02:00
O.S.Tezer
fd56723494
Rewrite and update the MongoDB service article
...
MongoDB article had some fundemental issues.
- Outdated Dockerfile
- Insufficient / unclear instructions
- Unnecessary comments
- Failed to explain the role of Docker.io
- Did not have a complete Dockerfile sample
- Lacked a "learn more" section / link to Trusted Builds
This update aims to address all these issues with a complete re-write.
It also:
- Corrects the label under which this article is/was listed on the menu
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
- First run at amending after the initial review process.
- Make the Dockerfile generic.
- Revision.
- Fixes
2014-05-09 09:09:52 +01:00
James Turnbull
2463849ecf
Merge pull request #5678 from MasonM/patch-2
...
Fix link to daemon/execdriver/lxc/lxc_template.go
2014-05-09 09:41:47 +02:00
James Turnbull
80b750be5d
Merge pull request #5689 from benatkin/doc-osx-setup-section-fix
...
make higher level heading specify that instructions are for manual installation
2014-05-09 09:35:24 +02:00
Solomon Hykes
d2a41b38c5
Merge pull request #5540 from unclejack/imports_cleanup
2014-05-09 00:30:14 -07:00
unclejack
4c2b9d7324
rename goruntime import to runtime
...
This renames the goruntime import of the runtime package back to
runtime.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-05-09 10:14:37 +03:00
Solomon Hykes
a6b7e94696
Merge pull request #5561 from bmurphy1976/bmurphy1976-table-tests
2014-05-09 00:00:19 -07:00
Solomon Hykes
1736b025ea
Merge pull request #5116 from LK4D4/chown_only_on_content_#5110
2014-05-08 23:16:22 -07:00
Benjamin Atkin
ca33d2589f
make higher level heading specify that instructions are for manual install
...
Docker-DCO-1.1-Signed-off-by: Benjamin Atkin <ben@benatkin.com > (github: benatkin)
2014-05-08 22:57:04 -07:00
Michael Crosby
170e4d2e19
Cast Input and Output to closer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-08 12:57:19 -07:00
O.S. Tezer
f5309a2a09
Merge pull request #5679 from tdaws/master
...
Fixed typo in docs - intro - working with docker - working with images. ...
2014-05-08 20:15:54 +01:00
Victor Vieux
8d3c5b7dca
Merge pull request #5680 from alexlarsson/dm-remove-spew
...
devmapper: Remove accidental debug spew
2014-05-08 10:32:11 -07:00
Alexander Larsson
bff0c4f3dc
devmapper: Remove accidental debug spew
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-05-08 19:25:47 +02:00
Michael Crosby
7673e3c589
Merge pull request #5673 from tianon/kcore-error
...
Update restrict.Restrict to both show the error message when failing to mount /dev/null over /proc/kcore, and to ignore "not exists" errors while doing so (for when CONFIG_PROC_KCORE=n in the kernel)
2014-05-08 10:20:19 -07:00
Tony Daws
ea049a2ebc
Fixed typo in docs - intro - working with docker - working with images. It read that you can use both images used by others and images used by others, in a run-on sentence.
2014-05-08 10:05:00 -07:00
Mason Malone
5d39175c22
Fix link to daemon/execdriver/lxc/lxc_template.go
2014-05-08 12:49:50 -04:00
Michael Crosby
718154b3b6
Merge pull request #5535 from vmarmol/add-maintainers-cgroup
...
Adding Rohit Jnagal and Victor Marmol to pkg/cgroups maintainers.
2014-05-08 09:48:31 -07:00
Alexander Larsson
3a1703a79f
Merge pull request #5404 from alexlarsson/dm-new-metadata
...
Make devicemapper backend able to support multiple processes
2014-05-08 14:31:17 +02:00
O.S. Tezer
e4f4ce83d2
Merge pull request #5659 from ryanaslett/master
...
Trivial Documentation Change: The Go template is a better pattern for documentation.
2014-05-08 10:59:35 +01:00
Tianon Gravi
d60301edb8
Update restrict.Restrict to both show the error message when failing to mount /dev/null over /proc/kcore, and to ignore "not exists" errors while doing so (for when CONFIG_PROC_KCORE=n in the kernel)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-05-08 01:03:45 -06:00
Bryan Murphy
fdccfaf72a
move Table to a separate file and add additional unit tests
...
Docker-DCO-1.1-Signed-off-by: Bryan Murphy <bmurphy1976@gmail.com > (github: bmurphy1976)
2014-05-08 02:31:23 +00:00
Victor Vieux
81041b3ba6
Merge pull request #5671 from crosbymichael/merge_release_v0.11.1
...
Merge release v0.11.1
2014-05-07 18:51:29 -07:00
Michael Crosby
0ed9bba1ee
Change version to v0.11.1-dev
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-07 18:48:38 -07:00
Michael Crosby
093aacb740
Merge branch 'release' into merge_release_v0.11.1
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-07 18:47:47 -07:00
Michael Crosby
5f3d6b8e7f
Merge pull request #5668 from crosbymichael/bump_v0.11.1
...
Bump to version v0.11.1
2014-05-07 18:47:46 -07:00
Michael Crosby
fb99f992c0
Bump to version v0.11.1
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-07 17:29:56 -07:00
Michael Crosby
6640f46f0e
Merge branch 'master' into bump_v0.11.1
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-07 17:27:57 -07:00
Guillaume J. Charmes
ed00ba84ac
Merge pull request #5667 from bitness/typo-fix
...
Fix error name typo (ErrInvalidWorikingDirectory)
2014-05-07 16:53:08 -07:00
Guillaume J. Charmes
c7712b350a
Merge pull request #5665 from vieux/fix_auth_issue
...
Fix auth issue
2014-05-07 16:36:07 -07:00
Lars R. Damerow
d3150e0927
Fix error name typo (ErrInvalidWorikingDirectory)
...
Docker-DCO-1.1-Signed-off-by: Lars R. Damerow <lars@grandstreet.us > (github: bitness)
2014-05-07 16:28:51 -07:00
Victor Vieux
2aff119baa
Revert "refactor build job to know only configFile"
...
This reverts commit b9731bccf2vieux@docker.com > (github: vieux)
2014-05-07 22:59:13 +00:00
Victor Vieux
331e77f9ed
Revert "rename configFile to auth in the job"
...
This reverts commit e9c3e39743vieux@docker.com > (github: vieux)
2014-05-07 22:58:09 +00:00
William Henry
7cd64f0344
Merge remote-tracking branch 'upstream/master'
2014-05-07 14:48:28 -06:00
Michael Crosby
93f5d539fe
Merge pull request #5660 from crosbymichael/merge_release_v0.11.0
...
Merge release to master v0.11.0
2014-05-07 11:42:49 -07:00
Michael Crosby
1ed63f1d16
Change version to v0.11.0-dev
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-07 11:38:02 -07:00
Michael Crosby
b68e0078c2
Merge branch 'release' into merge_release_v0.11.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-07 11:37:32 -07:00
Michael Crosby
57aa2f2ef4
Merge pull request #5640 from crosbymichael/bump_v0.11.0
...
Bump version to v0.11.0
2014-05-07 11:35:20 -07:00
Michael Crosby
15209c380c
Bump version to v0.11.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-07 09:59:55 -07:00
LK4D4
91b7d8ebd3
Change owner only on copied content
...
Fixes #5110
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-05-07 20:40:22 +04:00
Tianon Gravi
36d913078b
Add "Should-Start" cgroupfs-mount and cgroup-lite to sysvinit-debian init script
...
It's fine to list both here because "Should-Start" is a loose binding (ie, if the listed service exists, it'll be started first, but otherwise, this one will start without it).
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-05-07 09:46:41 -06:00
Tianon Gravi
ddd0470ed1
Merge pull request #5642 from jmccrohan/master
...
Update mkimage-debootstrap "ubuntuLatestLTS" to "trusty"
2014-05-07 09:45:22 -06:00
Jonathan McCrohan
9e64a4d862
mkimage-debootstrap: set ubuntuLatestLTS as Trusty
...
Ubuntu 14.04 LTS (Trusty Tahr) was released on Thu, 17 Apr 2014; Update
ubuntuLatestLTS accordingly.
Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com > (github: jmccrohan)
2014-05-07 08:26:24 +01:00
Ryan Aslett
7549199cc5
The Go template is a better pattern for documentation.
2014-05-07 00:21:02 -07:00
Sven Dowideit
bd9b27fe18
Merge pull request #5634 from vieux/improve_mflag_usage
...
Add support for \n in usages
2014-05-07 13:53:04 +10:00
Victor Vieux
275faf06e8
Merge pull request #4 from SvenDowideit/improve_mflag_usage_docs
...
update the docs for the new \n rendering
2014-05-06 19:54:47 -07:00
Michael Crosby
263d134fff
Merge branch 'master' into bump_v0.11.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-06 18:03:23 -07:00
Victor Vieux
41b2874b99
Merge pull request #5643 from crosbymichael/fix-native-pid
...
Set container pid for process in native driver
2014-05-06 18:02:55 -07:00
Michael Crosby
62e8ddb579
Set container pid for process in native driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-06 17:04:04 -07:00
Sven Dowideit
cfb232cff2
update the docs to reflect the nice \n handling
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-05-07 09:40:49 +10:00
Victor Vieux
b622da3cfe
improve some usages
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-06 21:32:12 +00:00
Victor Vieux
77098d5b5b
use tabwriter to display usage in mflag
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-06 21:31:21 +00:00
Sven Dowideit
d7166536e7
Merge pull request #5622 from SvenDowideit/net-host-docs
...
Update the run --net cli help to include the 'host' option
2014-05-07 07:11:41 +10:00
Michael Crosby
5c12a27838
Merge pull request #5631 from vmarmol/cpuacct-usage
...
Export cpuacct CPU usage in total cores over the sampled period.
2014-05-06 11:47:55 -07:00
Victor Vieux
8d07c2d1ae
Fix logo in README.md
2014-05-06 11:39:11 -07:00
Vincent Batts
6f32727844
registry: adding vbatts to the MAINTAINERS
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-05-06 14:31:47 -04:00
Victor Marmol
543e60eb60
Export cpuacct CPU usage in total cores over the sampled period.
...
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-05-06 16:56:39 +00:00
Michael Crosby
818648ff9f
Merge pull request #5630 from rjnagal/libcontainer-fixes
...
Check supplied hostname before using it.
2014-05-06 09:49:52 -07:00
Michael Crosby
7e3a1b6521
Merge pull request #5629 from vmarmol/fix-systemd-softlimit
...
Remove support for MemoryReservation in systemd systems.
2014-05-06 09:48:33 -07:00
Michael Crosby
d16fcc628e
Merge pull request #5627 from cyphar/integration-cli-fixes
...
Fixed completely broken integration-cli tests
2014-05-06 09:35:30 -07:00
Michael Crosby
5034b658e3
Merge pull request #5626 from cyphar/networkfs-etchosts-tests
...
Fixed broken tests for pkg/networkfs/etchosts
2014-05-06 09:31:06 -07:00
Victor Marmol
69d43b2674
Remove support for MemoryReservation in systemd systems. This has been
...
deperecated since systemd 208.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-05-06 15:53:38 +00:00
cyphar
924979259e
integration-cli: docker_cli_links: fixed broken tests
...
The tests weren't ... tested when last edited, this patch fixes
them so that they run and pass correctly.
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
2014-05-07 01:05:15 +10:00
cyphar
14f65ab83b
pkg: networkfs: etchosts: fixed tests
...
This patch fixes the fact that the tests for pkg/networkfs/etchosts
couldn't build due to syntax errors.
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
2014-05-07 00:42:22 +10:00
O.S. Tezer
ba6a732357
Merge pull request #5616 from nirvdrum/patch-2
...
Use the contraction for "it is."
2014-05-06 11:33:41 +01:00
Sven Dowideit
9eeff6d099
Update the run --net cli help to include the 'host' option
...
and then add that to the run and cli docs
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-05-06 20:26:44 +10:00
O.S.Tezer
02f95a089c
Add code for Pardot implementation to docs
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-05-06 09:53:19 +01:00
Solomon Hykes
95d81dada6
Merge pull request #5056 by Bryan Murphy <bmurphy1976@gmail.com>
...
"add linked containers to hosts file"
2014-05-05 20:04:01 -07:00
Solomon Hykes
dc605c8be7
Simplify integration test for link + hostname.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-05-05 19:51:47 -07:00
Bryan Murphy
53f38a14cd
add linked containers to hosts file
...
Docker-DCO-1.1-Signed-off-by: Bryan Murphy <bmurphy1976@gmail.com > (github: bmurphy1976)
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Tested-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-05-05 19:40:27 -07:00
Michael Crosby
cd81895091
Add alex as devmapper and btrfs maintainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-05 19:40:27 -07:00
Guillaume J. Charmes
839b06b121
Merge pull request #5601 from crosbymichael/alex-maintainer
...
Add alex as devmapper and btrfs maintainer
2014-05-05 17:10:05 -07:00
Kevin Menard
2b0f88383a
Use the correct "it's."
2014-05-05 20:08:35 -04:00
Guillaume J. Charmes
affacfab08
Merge pull request #5614 from crosbymichael/move-attach-to-daemon
...
Move Attach from container to daemon
2014-05-05 16:56:11 -07:00
Michael Crosby
41cfaa738c
Move Attach from container to daemon
...
This moves the Attach method from the container to the daemon. This
method mostly supports the http attach logic and does not have anything
to do with the running of a container.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-05 16:48:56 -07:00
Victor Vieux
b4ac4228f5
Merge pull request #5613 from vieux/better_error_handling
...
propagate errors write
2014-05-05 16:28:15 -07:00
Victor Vieux
55f3e72d7f
propagate errors write
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-05 23:23:14 +00:00
Guillaume J. Charmes
0b15944cb0
Merge pull request #5354 from alexlarsson/cgroups-systemd-fixes
...
cgroups: Update systemd to match fs backend
2014-05-05 16:00:56 -07:00
Sven Dowideit
df5827dd02
Merge pull request #5597 from jamtur01/docs-simplify-osx-install
...
Fixed the horrible OSX installation docs
2014-05-06 08:55:14 +10:00
Victor Vieux
0736eb6d16
Merge pull request #5609 from crosbymichael/move-env-gen
2014-05-05 15:52:47 -07:00
Michael Crosby
ab58dd5a44
Merge pull request #5611 from vieux/networkfs_pkgs
...
add 2 networkfs pkgs
2014-05-05 15:52:14 -07:00
Victor Vieux
3744452ecf
add resolvconf
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-05 22:55:32 +00:00
Victor Vieux
a1a029f6d7
add etchosts
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-05 22:43:38 +00:00
Victor Vieux
eadf004fcb
Merge pull request #5600 from unclejack/sha512_registry_support
...
import sha512 to make sha512 ssl certs work
2014-05-05 15:27:11 -07:00
Michael Crosby
4994b0fe54
Move envconfig generation to lxc driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-05 14:45:14 -07:00
Victor Vieux
222605b5fb
Merge pull request #5608 from crosbymichael/net-flag-refactor
...
HOTFIX Update after namespace refactor
2014-05-05 13:58:09 -07:00
Michael Crosby
01fec73ba4
Update after namespace refactor
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-05 13:56:18 -07:00
Guillaume J. Charmes
70fef1460a
Merge pull request #4441 from crosbymichael/add-net-flag
...
Add --net flag to docker run and allow host network stack
2014-05-05 13:54:55 -07:00
Michael Crosby
2165a4993b
Merge pull request #5602 from crosbymichael/libcontainer-enable
...
Improve libcontainer namespace and cap format
2014-05-05 13:50:08 -07:00
Victor Vieux
51933bd5e1
Merge pull request #5575 from vieux/pr-5428
2014-05-05 13:48:36 -07:00
Victor Vieux
7c3a06634b
Merge pull request #5538 from shykes/pr_out_engine_catchall_handler_is_shadowed_by_specific_handlers
2014-05-05 13:48:11 -07:00
Victor Vieux
07db13509b
Merge pull request #5596 from dotcloud/contrib-fix
...
Post-commit hook URL fix
2014-05-05 13:44:48 -07:00
Michael Crosby
99be235332
Merge pull request #5400 from bmatsuo/5398-fix-pkg/graphdb-osx
2014-05-05 13:41:43 -07:00
James Turnbull
13c1865541
Merge pull request #5604 from nirvdrum/patch-1
...
It's its.
2014-05-05 21:49:47 +02:00
Tianon Gravi
168452f9b0
Merge pull request #5580 from tianon/update-vendor-versions
...
Update vendored deps that have a proper version number to use said specific versions
2014-05-05 13:45:03 -06:00
Kevin Menard
b25208ee3e
It's its.
2014-05-05 15:43:11 -04:00
Michael Crosby
db5f6b4aa0
Improve libcontainer namespace and cap format
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-05 12:34:21 -07:00
Michael Crosby
34e09afa24
Merge pull request #5544 from vieux/cleanup_api_client
...
Cleanup api client
2014-05-05 11:16:57 -07:00
Rohit Jnagal
412324cfbe
Check supplied hostname before using it.
...
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
2014-05-05 18:12:25 +00:00
Alexander Larsson
5b094530c0
cgroups: Update systemd to match fs backend
...
This updates systemd.Apply to match the fs backend by:
* Always join blockio controller (for stats)
* Support CpusetCpus
* Support MemorySwap
Also, it removes the generic UnitProperties in favour of a single
option to set the slice.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-05-05 20:06:44 +02:00
Michael Crosby
f2d7c77c63
Add alex as devmapper and btrfs maintainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-05 10:47:55 -07:00
Michael Crosby
e3d6898da1
Merge pull request #5591 from alexlarsson/fix-expose-parsing
...
nat: Fix --expose protocol parsing
2014-05-05 10:32:26 -07:00
unclejack
7da186c3e5
import sha512 to make sha512 ssl certs work
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-05-05 20:29:20 +03:00
Guillaume J. Charmes
5f301191cf
Merge pull request #5496 from unclejack/check_if_root
...
check if the daemon is run as root on startup
2014-05-05 10:13:17 -07:00
Victor Vieux
f369278725
Merge pull request #5569 from vieux/add__ping_to_the_API
...
Add ping to the api
2014-05-05 10:09:31 -07:00
Michael Crosby
0b187b909b
Address code review feedback
...
Also make sure we copy the joining containers hosts and resolv.conf with
the hostname if we are joining it's network stack.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-05 10:08:59 -07:00
Michael Crosby
c1c6b3ccd9
Add docs for --net flag
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-05 10:08:59 -07:00
Michael Crosby
5ca6532011
Update host networking with hostname and files
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-05 10:08:59 -07:00
Michael Crosby
a785882b29
Setup host networking for lxc and native
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-05 10:08:59 -07:00
Michael Crosby
2c2cc051d8
Update --net flags and container mode
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-05 10:08:59 -07:00
Johan Euphrosine
7118416aee
runconfig/parse: add test for parseNetMode
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-05-05 10:08:59 -07:00
Johan Euphrosine
a60159f3b1
runconfig: add -net container:name option
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-05-05 10:08:59 -07:00
Tianon Gravi
d103f0186a
Merge pull request #5562 from rhatdan/master
...
Fix docker man page to reference selinux-enable flag
2014-05-05 10:34:49 -06:00
James Turnbull
c34bb099e5
Fixed the horrible OSX installation docs
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-05-05 17:02:03 +02:00
James Turnbull
30d458c534
Merge pull request #5592 from SvenDowideit/docs-simplify-osx-install
...
Several OSX install reader issues fixed
2014-05-05 16:46:03 +02:00
Aaron Huslage
10766e1fb4
Post-commit hook URL fix
...
Updating CONTRIBUTING to include the correct URL for the post-commit hook.
Docker-DCO-1.1-Signed-off-by: Aaron Huslage <huslage@gmail.com > (github: huslage)
2014-05-05 10:28:52 -04:00
Sven Dowideit
56d71ae79b
Several reader issues fixed
...
- Fix boot2docker url
- move HomeBrew instructions to a separate section
- fix docker client 5-liner to work (its still ugly)
- fix and update program output
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-05-05 22:52:12 +10:00
Dan Walsh
e625bad3d7
Fix docker man page to reference selinux-enable flag
...
Docker-DCO-1.1-Signed-off-by: Daniel Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-05-05 08:41:21 -04:00
O.S. Tezer
e9fd8e285e
Merge pull request #5587 from SvenDowideit/docs-examples-style-guide
...
Rearrange the existing info a little, and add example style guide
2014-05-05 13:36:47 +01:00
Sven Dowideit
46755dfc1a
Rearrange the existing info a little, and add example style guide
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-05-05 22:18:12 +10:00
Alexander Larsson
a304dcef00
nat: Fix --expose protocol parsing
...
A command like:
docker run --expose 5353/tcp -P fedora sleep 10
Currently fails with:
Error: Cannot start container 5c558de5f0bd85ff14e13e3691aefbe531346297a27d4b3562732baa8785b34a: unknown protocol
This is because nat.SplitProtoPort() confuses the order of the port and
proto in 5353/tcp, assuming the protocol is first. However, in all other
places in docker the protocol is last, so the fix is just to swap these.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-05-05 12:54:10 +02:00
Sven Dowideit
3230889d24
Merge pull request #5585 from lukemarsden/patch-1
...
git clone should use https URL in devenvironment.md
2014-05-05 08:48:13 +10:00
lukemarsden
6799d14cb8
Update devenvironment.md
...
`git clone` should use `https` URL.
2014-05-04 17:52:48 +01:00
O.S. Tezer
9488832c6d
Merge pull request #5579 from jamtur01/linkdashs
...
Fixed a couple of single dashes in links document
2014-05-04 13:28:46 +01:00
O.S.Tezer
dcae8c157b
Introduce x-axe scrolling to code-blocks.
...
This improvement introduces x-axe scrolling to code-blocks by
overriding certain default bootstrap word-wrapping constraints.
This PR closes: https://github.com/dotcloud/docker/issues/5279
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-05-04 13:25:03 +01:00
Tianon Gravi
8d7ed2cae4
Update vendored deps that have a proper version number to use said specific versions
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-05-03 20:34:21 -06:00
James Turnbull
bfac0b24ed
Fixed a couple of single dashes in links document
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-05-04 03:16:21 +02:00
O.S. Tezer
54e20b8f7b
Merge pull request #5578 from msulima/patch-1
...
hello_world.md - $container_id variable case sensitivity
2014-05-03 12:53:14 +01:00
O.S. Tezer
f33298024b
Merge pull request #5568 from felixrabe/patch-6
...
cli.md: More typos
2014-05-03 12:50:57 +01:00
O.S. Tezer
49af92a7a9
Merge pull request #5572 from felixrabe/patch-5
...
run.md: Close braces
2014-05-03 12:42:04 +01:00
O.S. Tezer
d0c97d5bd2
Merge pull request #5564 from felixrabe/patch-4
...
cli.md: sudo at the right place
2014-05-03 12:36:31 +01:00
Sven Dowideit
b2268d1ac0
Merge pull request #5551 from felixrabe/patch-1
...
cli.md: Fix up Markdown formatting by adding one `
2014-05-03 21:02:25 +10:00
Sven Dowideit
a911f42d1e
Merge pull request #5570 from felixrabe/patch-3
...
run.md: Convert some backticks to apo's
2014-05-03 20:39:01 +10:00
Mateusz Sulima
dca1c0073f
hello_world.md - $container_id variable case sensitivity
...
If you run the tutorial step-by-step, following error occurs:
```$ sudo docker logs $container_id
Usage: docker logs CONTAINER
Fetch the logs of a container
-f, --follow=false: Follow log output```
This is obviously because bash variables are case-sensitive, so it mustn't be `CONTAINER_ID` above.
Docker-DCO-1.1-Signed-off-by: Mateusz Sulima <sulima.mateusz@email.com > (github: github_handle)
2014-05-03 12:22:33 +02:00
Victor Vieux
328d65dcff
remove fixme
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-03 00:54:52 +00:00
Solomon Hykes
c4089ad80b
Move 'search' to the registry subsystem
...
This continues the effort to separate all registry logic from the
deprecated `Server` object.
* 'search' is exposed by `github.com/dotcloud/docker/registry/Service`
* Added proper documentation of Search while I was at it
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-05-03 00:37:32 +00:00
Solomon Hykes
3d605683b3
Move 'auth' to the registry subsystem
...
This is the first step towards separating the registry subsystem from
the deprecated `Server` object.
* New service `github.com/dotcloud/docker/registry/Service`
* The service is installed by default in `builtins`
* The service only exposes `auth` for now...
* ...Soon to be followed by `pull`, `push` and `search`.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-05-03 00:37:06 +00:00
Felix Rabe
4a3b0e8d5d
run.md: Close braces
...
Docker-DCO-1.1-Signed-off-by: Felix Rabe <felix@rabe.io > (github: felixrabe)
2014-05-03 02:20:59 +02:00
Michael Crosby
3a1f0dedc7
Merge pull request #5556 from crosbymichael/no-restrict-lxc
...
Don't restrict lxc because of apparmor
2014-05-02 17:20:27 -07:00
Felix Rabe
205bd91fca
run.md: Convert some backticks to apo's
2014-05-03 02:11:00 +02:00
Victor Vieux
5bb430197e
Merge pull request #5063 from vieux/force_rmi_stopped_container
...
docker rmi -f works with stopped containers + revamped error messages
2014-05-02 16:41:13 -07:00
Victor Vieux
1c48dfebb9
Merge pull request #5537 from shykes/pr_out_api_server_better_error_checking_to_avoid_unnecessary_panics
2014-05-02 16:05:07 -07:00
Solomon Hykes
f37ce76bf6
api/server: better error checking to avoid unnecessary panics
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-05-02 16:03:37 -07:00
Felix Rabe
015a2abafa
cli.md: More typos
...
I've seen one other missing space that I addressed in another PR already.
I don't know whether that is a common occurrence in the docs.
About the second diff chunk, it looks like some copy-paste mistake to me.
Docker-DCO-1.1-Signed-off-by: Felix Rabe <felix@rabe.io > (github: felixrabe)
2014-05-03 00:52:48 +02:00
O.S. Tezer
cefb0d1277
Merge pull request #5563 from felixrabe/patch-3
...
cli.md: Add space
2014-05-02 23:33:48 +01:00
O.S. Tezer
069400a7ac
Merge pull request #5566 from felixrabe/patch-5
...
cli.md: Add another sudo
2014-05-02 23:32:33 +01:00
Solomon Hykes
3b73c26194
Engine: empty job names are illegal, catchall or not
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-05-02 15:25:33 -07:00
Solomon Hykes
de75af9fe2
engine: catchall handler is shadowed by specific handlers
...
This allows using `Engine.Register` and `Engine.RegisterCatchall` on the
same engine without the catchall hiding all other handlers.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-05-02 15:25:32 -07:00
Guillaume J. Charmes
103d028132
Merge pull request #5560 from gabrtv/deregister-containers-earlier
...
De-register containers before removing driver and containerGraph references
2014-05-02 15:20:51 -07:00
Victor Vieux
a0cef41061
Merge pull request #5567 from creack/remove_unused_file
2014-05-02 15:08:42 -07:00
Victor Vieux
c65de2c020
return write error
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-02 22:03:59 +00:00
Felix Rabe
e318af6fb0
cli.md: sudo at the right place
...
Docker-DCO-1.1-Signed-off-by: Felix Rabe <felix@rabe.io > (github: felixrabe)
2014-05-02 23:58:05 +02:00
Victor Vieux
3c422fe5bf
add doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-02 21:51:20 +00:00
Jérôme Petazzoni
b3ff1c55e3
Merge pull request #5462 from tianon/hack-dind-style
...
Update hack/dind to match the rest of our scripts
2014-05-02 14:43:56 -07:00
Victor Vieux
cf0076b92d
add _ping endpoint
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-02 21:43:51 +00:00
Guillaume J. Charmes
8913ec4912
Remove unused daemon/sorter.go
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-05-02 14:16:05 -07:00
Michael Crosby
ac7b2b888d
Merge pull request #5565 from creack/fix_devpts
...
Month devpts before mounting subdirs
2014-05-02 14:14:46 -07:00
Felix Rabe
4706a1ad76
cli.md: Add another sudo
2014-05-02 23:13:28 +02:00
Felix Rabe
12a4b376fd
cli.md: Add space
2014-05-02 22:56:35 +02:00
Guillaume J. Charmes
a7ccbfd5f1
Month devpts before mounting subdirs
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-05-02 13:55:45 -07:00
Victor Vieux
45be6f6dff
fix https
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-02 19:49:12 +00:00
Gabriel Monroy
9f152aacf8
deregister containers before removing driver and containerGraph references
...
This is required to address a race condition described in #5553 ,
where a container can be partially deleted -- for example, the
root filesystem but not the init filesystem -- which makes
it impossible to delete the container without re-adding the
missing filesystems manually.
This behavior has been witnessed when rebooting boxes that
are configured to remove containers on shutdown in parallel
with stopping the Docker daemon.
Docker-DCO-1.1-Signed-off-by: Gabriel Monroy <gabriel@opdemand.com > (github: gabrtv)
2014-05-02 13:27:17 -06:00
Michael Crosby
4d521f479b
Merge pull request #5507 from shykes/dind-maintainer
...
Make Jerome Petazzoni a maintainer for dind
2014-05-02 11:25:41 -07:00
Michael Crosby
59fe77bfa6
Don't restrict lxc because of apparmor
...
We don't have the flexibility to do extra things with lxc because it is
a black box and most fo the magic happens before we get a chance to
interact with it in dockerinit.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-02 11:14:24 -07:00
Guillaume J. Charmes
1c5a3123cc
Merge pull request #5529 from crosbymichael/restrict-proc
...
Mount /proc and /sys read-only, except in privileged containers
2014-05-02 10:52:53 -07:00
Victor Vieux
8c9192cd76
move hijack to it's own file
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-02 17:45:58 +00:00
Felix Rabe
877ad96d89
cli.md: Fix up Markdown formatting by adding one `
2014-05-02 16:53:59 +02:00
Solomon Hykes
b372c19b38
Merge pull request #5501 from discordianfish/add-commit-message-bp
2014-05-01 23:47:31 -07:00
Solomon Hykes
f4b60a385c
Merge pull request #5536 from vmarmol/add-maintainers-libcontainer
2014-05-01 23:42:50 -07:00
Michael Crosby
76fa7d588a
Apply apparmor before restrictions
...
There is not need for the remount hack, we use aa_change_onexec so the
apparmor profile is not applied until we exec the users app.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-01 19:09:12 -07:00
James Turnbull
b263495f6a
Merge pull request #5541 from SvenDowideit/docs-generate-all-api-docs
...
Force the older API docs to be generated.
2014-05-01 20:58:12 -04:00
Sven Dowideit
41db175626
Force the older API docs to be generated.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-05-02 10:46:41 +10:00
Victor Vieux
314bd02d2c
remove when httputil.NewClientConn when not in hijack
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-02 00:25:10 +00:00
Sven Dowideit
148e081ded
Merge pull request #5521 from SvenDowideit/doc-auto-section
...
make sure the intermediate index.html files are generated consistently
2014-05-02 10:13:18 +10:00
Sven Dowideit
5a8ffe7ef1
make sure the intermediate index.html files are generated consistently
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-05-02 10:08:25 +10:00
O.S. Tezer
ccbc4f24d6
Merge pull request #5517 from SvenDowideit/5267-make-archived-docs-hidden-but-linkable
...
Bring back archived remote API versions
2014-05-02 02:56:03 +03:00
Sven Dowideit
de49e7c0a6
Bring back archived remote API versions
...
- git mv archived/* .
- put the links back into the summary document
- reduce the header depth by 1 so the TOC lists each API version
- update the mkdocs.yaml to render the archived API docs, but not add
them to the menu/nav
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-05-02 09:47:33 +10:00
James Turnbull
edab1bd5e5
Merge pull request #5524 from ostezer/docs-fix-codeblocks
...
Improve code/comment/output markings & display consistency
2014-05-01 19:39:06 -04:00
Victor Marmol
71e3757174
Adding Rohit Jnagal and Victor Marmol to pkg/libcontainer maintainers.
...
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-05-01 15:51:38 -07:00
Victor Marmol
91b5fe8502
Adding Rohit Jnagal and Victor Marmol to pkg/cgroups maintainers.
...
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-05-01 15:48:16 -07:00
Michael Crosby
24e0df8136
Fix /proc/kcore mount of /dev/null
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-01 15:26:58 -07:00
Michael Crosby
3f74bdd93f
Mount attr and task as rw for selinux support
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-01 15:26:58 -07:00
Michael Crosby
f5139233b9
Update restrictions for better handling of mounts
...
This also cleans up some of the left over restriction paths code from
before.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-01 15:26:58 -07:00
Michael Crosby
83982e8b1d
Update to enable cross compile
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-01 15:26:58 -07:00
Jérôme Petazzoni
1c4202a614
Mount /proc and /sys read-only, except in privileged containers.
...
It has been pointed out that some files in /proc and /sys can be used
to break out of containers. However, if those filesystems are mounted
read-only, most of the known exploits are mitigated, since they rely
on writing some file in those filesystems.
This does not replace security modules (like SELinux or AppArmor), it
is just another layer of security. Likewise, it doesn't mean that the
other mitigations (shadowing parts of /proc or /sys with bind mounts)
are useless. Those measures are still useful. As such, the shadowing
of /proc/kcore is still enabled with both LXC and native drivers.
Special care has to be taken with /proc/1/attr, which still needs to
be mounted read-write in order to enable the AppArmor profile. It is
bind-mounted from a private read-write mount of procfs.
All that enforcement is done in dockerinit. The code doing the real
work is in libcontainer. The init function for the LXC driver calls
the function from libcontainer to avoid code duplication.
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com > (github: jpetazzo)
2014-05-01 15:26:58 -07:00
Michael Crosby
559dc9a66a
Merge pull request #5534 from vieux/fix_apparmor_inside_container
...
Fix apparmor inside container
2014-05-01 15:25:40 -07:00
Victor Vieux
de191e8632
skip apparmor with dind
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-01 22:22:08 +00:00
Victor Vieux
ae686c0486
Revert "add apparmor to the Dockerfile"
...
This reverts commit fa1e390cadvieux@docker.com > (github: vieux)
2014-05-01 21:49:53 +00:00
Tianon Gravi
8296125b32
Merge pull request #5532 from vieux/add_apparmor_dockerfile
...
Add apparmor to the Dockerfile to fix dind issues
2014-05-01 15:00:48 -06:00
Victor Vieux
fa1e390cad
add apparmor to the Dockerfile
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-01 20:51:16 +00:00
Michael Crosby
20bcb80f40
Merge pull request #5457 from tiborvass/5423-bridge-ip
...
Fix bridge ip comparison
2014-05-01 11:56:47 -07:00
Michael Crosby
ab0518bfe8
Merge pull request #5528 from crosbymichael/drop-capsyslog
...
drop CAP_SYSLOG capability
2014-05-01 11:52:08 -07:00
Eiichi Tsukata
cac0cea03f
drop CAP_SYSLOG capability
...
Kernel capabilities for privileged syslog operations are currently splitted into
CAP_SYS_ADMIN and CAP_SYSLOG since the following commit:
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=ce6ada35bdf710d16582cc4869c26722547e6f11
This patch drops CAP_SYSLOG to prevent containers from messing with
host's syslog (e.g. `dmesg -c` clears up host's printk ring buffer).
Closes #5491
Docker-DCO-1.1-Signed-off-by: Eiichi Tsukata <devel@etsukata.com > (github: Etsukata)
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-01 11:43:55 -07:00
Guillaume J. Charmes
fe4a25546a
Merge pull request #5515 from crosbymichael/refactor-libcontainer2
...
Remove CommandFactory and NsInit interface
2014-05-01 11:41:54 -07:00
Solomon Hykes
10a50fcd8f
Merge pull request #5526 from shykes/pr_out_beam_add_simple_framing_system_for_unixconn
2014-05-01 11:06:14 -07:00
Alexander Larsson
24f9187a04
beam: Add simple framing system for UnixConn
...
This is needed for Send/Recieve to correctly handle borders between
the messages.
The framing uses a single 32bit uint32 length for each frame, of which
the high bit is used to indicate whether the message contains a file
descriptor or not. This is enough to separate out each message sent
and to decide to which message each file descriptors belongs, even
though multiple Sends may be coalesced into a single read, and/or one
Send can be split into multiple writes.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-05-01 11:06:01 -07:00
Guillaume J. Charmes
c42db412b6
Merge pull request #5092 from LK4D4/timestamp_for_docker_logs_#1165
...
Timestamps for docker logs.
2014-05-01 10:32:34 -07:00
Alexandr Morozov
d1297feef8
Timestamps for docker logs.
...
Fixes #1165
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-05-01 20:40:36 +04:00
O.S.Tezer
f87a97f7df
Improve code/comment/output markings & display consistency
...
This PR aims to increase the consistency across the docs for
code blocks and code/comment/output markings.
Rule followed here is "what's visible on the screen should be reflected"
Issue:
- Docs had various code blocks showing: comments, commands & outputs.
- All three of these items were inconsistently marked.
Some examples as to how this PR aims to introduce improvements:
1. Removed `> ` from in front of the "outputs". Eg,
` > REPOSITORY TAG ID CREATED` replaced with:
` REPOSITORY TAG ID CREATED`.
2. Introduced `$` for commands. Eg,
` sudo chkconfig docker on` replaced with:
` $ sudo chkconfig docker on`
3. Comments:
` > # ` replaced with:
` # `.
> Please note:
> Due to a vast amount of items reviewed and changed for this PR, there
> might be some individually incorrect replacements OR patterns of incorrect
> replacements. This PR needs to be reviewed and if there is anything missing,
> it should be improved or amended.
Closes:
https://github.com/dotcloud/docker/issues/5286
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-05-01 17:52:01 +03:00
O.S. Tezer
51a39563fa
Merge pull request #5519 from SvenDowideit/remove-rst-docs
...
remove rst/sphinx documentation
2014-05-01 16:33:54 +03:00
O.S. Tezer
c52bb90d03
Merge pull request #5516 from SvenDowideit/docs-meta-rendering
...
add page_description and page_keywords md meta to mkdocs html template
2014-05-01 16:16:48 +03:00
Sven Dowideit
adf04681b4
remove rst/sphinx documentation
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-05-01 15:31:58 +10:00
Sven Dowideit
8ae53ef167
add page_description and page_keywords md meta to mkdocs html template
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-05-01 12:41:57 +10:00
Victor Vieux
9da75eb4df
Merge pull request #5514 from vbatts/vbatts-save_typo
...
docker save: typo reference image, not container
2014-04-30 19:00:22 -07:00
Michael Crosby
d0bee79394
Remove container.json from readme
...
No need to duplicate this information when we already have a
container.json file in the root of libcontainer
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-30 18:52:15 -07:00
Vincent Batts
93f8e277de
docker save: typo reference image, not container
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-04-30 21:51:03 -04:00
Michael Crosby
da0d6dbd7b
Make native driver use Exec func with different CreateCommand
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-30 18:49:24 -07:00
Michael Crosby
aa9705f832
Fix execin with environment and Enabled support
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-30 18:24:47 -07:00
Michael Crosby
60e4276f5a
Integrate new structure into docker's native driver
...
This duplicates some of the Exec code but I think it it worth it because
the native driver is more straight forward and does not have the
complexity have handling the type issues for now.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-30 18:20:01 -07:00
Sven Dowideit
b06ad88ca0
Don't add yourself to the AUTHORs file - its generated
...
Last time I discussed this with @tianon, the AUTHORS was being
regenerated regularly, so we could remove this step.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-05-01 11:15:07 +10:00
Michael Crosby
176c49d7a9
Remove command factory and NsInit interface from libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-30 17:55:15 -07:00
Michael Crosby
b6b0dfdba7
Export more functions from libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-30 17:18:07 -07:00
Michael Crosby
aecb9c39ab
Split term files to make it easier to manage
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-30 17:04:24 -07:00
Michael Crosby
a3e96abb5a
Export syncpipe fields
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-30 17:02:45 -07:00
Guillaume J. Charmes
26ac05c8bc
Merge pull request #5511 from crosbymichael/refactor-libcontainer
...
Refactor: remove statewriter type and all callback for process start
2014-04-30 16:50:57 -07:00
Guillaume J. Charmes
be013c7820
Merge pull request #5512 from crosbymichael/set-freezer
...
Add ability to set cgroups freezer
2014-04-30 16:50:01 -07:00
Michael Crosby
5f6fda8cfd
Add ability to set cgroups freezer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-30 16:07:12 -07:00
Michael Crosby
f110401437
Remove statewriter interface, export more libcontainer funcs
...
This temp. expands the Exec method's signature but adds a more robust
way to know when the container's process is actually released and begins
to run. The network interfaces are not guaranteed to be up yet but this
provides a more accurate view with a single callback at this time.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-30 15:52:40 -07:00
Michael Crosby
cd8cec854b
Export SetupUser
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-30 15:27:59 -07:00
Michael Crosby
162dafbcd5
Remove logger from nsinit struct
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-30 15:24:18 -07:00
Michael Crosby
bfedf247a4
Merge pull request #5498 from tianon/better-apparmor-missing-error
2014-04-30 15:16:43 -07:00
Guillaume J. Charmes
2a711d16e0
Merge pull request #5448 from crosbymichael/selinux-defaults
...
Add selinux label support for processes and mount
2014-04-30 14:14:39 -07:00
Michael Crosby
2fc5bed61d
Merge pull request #5506 from crosbymichael/add-system-maintainer
...
Add system maintainers
2014-04-30 14:14:21 -07:00
Tibor Vass
986c647d5a
Fix bridge ip comparison
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-04-30 12:36:16 -07:00
Michael Crosby
e88ef454b7
Merge pull request #5464 from tianon/close-leftover-fds
2014-04-30 12:27:52 -07:00
Solomon Hykes
1fd919bbf4
Make Jerome Petazzoni a maintainer for dind
...
In the spirit of getting more contributors to maintain their
components.. I nominate @jpetazzo ot maintain dind (he's the original
author).
@jpetazzo I don't expect this to be too much load, but it's a good and
symbolic start :)
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-30 12:20:52 -07:00
Michael Crosby
6203d8b462
Add system maintainers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-30 12:01:06 -07:00
Victor Vieux
f5e5777e63
Merge pull request #5502 from tianon/remove-contrib-zfs
...
Remove contrib/zfs directory
2014-04-30 11:03:13 -07:00
Bryan Matsuo
99284a24e7
FIXES #5398 : pkg/graphdb build only dependent on cgo tag
...
Docker-DCO-1.1-Signed-off-by: Bryan Matsuo <bryan.matsuo@gmail.com > (github: bmatsuo)
2014-04-30 11:57:10 -06:00
Tianon Gravi
0037dc8d60
Remove contrib/zfs directory
...
A WIP pull request or issue for discussion would be a better avenue for collaboration and discussion of a ZFS backend.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-30 11:56:14 -06:00
Victor Vieux
e8f8f1c729
Merge pull request #5500 from tianon/fix-maintainers-format
...
Fix various MAINTAINERS format inconsistencies
2014-04-30 10:55:45 -07:00
Johannes 'fish' Ziemke
5f00372af2
Add notes about git commit messages
...
This improves readability of commits a lot and is easy to
follow. I think most people follow those rules already. They are based
on http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org > (github: discordianfish)
2014-04-30 19:28:26 +02:00
Tianon Gravi
defecac279
Fix various MAINTAINERS format inconsistencies
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-30 11:22:11 -06:00
Bryan Matsuo
8caef610b2
update AUTHORS
...
Docker-DCO-1.1-Signed-off-by: Bryan Matsuo <bryan.matsuo@gmail.com > (github: bmatsuo)
2014-04-30 11:08:57 -06:00
unclejack
4fac4d2149
check if the daemon is run as root on startup
...
This commit makes Docker throw an error if the daemon isn't started as
root.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-04-30 14:13:39 +03:00
Solomon Hykes
0c5375146a
Merge branch 'pr-5353'
2014-04-30 02:10:53 -07:00
Alexander Larsson
e802b69146
beam: Add more tests to unix_test.go
...
These are failing, and indicate things that need to be fixed. The
primarily problem is the lack of framing between beam messages.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
[solomon@docker.com: rebased on master]
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-04-30 02:10:09 -07:00
Victor Marmol
494c789ac3
Add new test-unit make rule which only runs the unit tests. Renames test
...
bundle to test-unit.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-04-30 02:10:09 -07:00
Sven Dowideit
9e2e26c69a
for want of a comma, the kingdom was lost
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-30 02:10:09 -07:00
Tianon Gravi
a1a9baf926
Update pkg/apparmor to provide a better error message when apparmor_parser cannot be found
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-29 23:19:21 -06:00
Tianon Gravi
70b5652984
Merge pull request #5484 from vmarmol/add-test-unit
...
Add new test-unit make rule which only runs the unit tests
2014-04-29 23:15:16 -06:00
James Turnbull
48388b8178
Merge pull request #5487 from SvenDowideit/docs-fix-invalid-json
...
for want of a comma, the kingdom was lost
2014-04-29 22:28:59 -04:00
Solomon Hykes
20e9f61971
Merge pull request #5320 from JackDanger/jackdanger/typo-doc-fix
2014-04-29 17:41:16 -07:00
Sven Dowideit
ebaff50bd2
for want of a comma, the kingdom was lost
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-30 10:12:21 +10:00
Victor Marmol
a39f3c9200
Add new test-unit make rule which only runs the unit tests. Renames test
...
bundle to test-unit.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-04-29 23:26:27 +00:00
Tianon Gravi
d5d62ff955
Close extraneous file descriptors in containers
...
Without this patch, containers inherit the open file descriptors of the daemon, so my "exec 42>&2" allows us to "echo >&42 some nasty error with some bad advice" directly into the daemon log. :)
Also, "hack/dind" was already doing this due to issues caused by the inheritance, so I'm removing that hack too since this patch obsoletes it by generalizing it for all containers.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-29 16:45:28 -06:00
Tianon Gravi
a96cac4d7d
Merge pull request #5477 from vmarmol/add-testdirs
...
Add a TESTDIRS variable to the test bundle to control which directories are unit tested
2014-04-29 16:40:40 -06:00
O.S. Tezer
34a3d41d17
Merge pull request #5440 from ostezer/docs-improve-code-block-rendering
...
Docs/CSS: Amend code block rendering.
2014-04-30 00:45:04 +03:00
Guillaume J. Charmes
2c85468753
Merge pull request #5460 from tianon/no-pull-scratch
...
Use "docker load" to create "scratch" in hack/make/test-integration-cli (instead of implicitly pulling it from the index)
2014-04-29 14:37:06 -07:00
O.S. Tezer
473b7a6c93
Merge pull request #5478 from amangoel/patch-1
...
Update working-with-docker.md
2014-04-30 00:00:14 +03:00
Victor Marmol
6e05c420c9
Add a TESTDIRS variable to the test bundle to allow for the running of a
...
single go directory worth of tests.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-04-29 20:55:04 +00:00
amangoel
83a5f2a192
Update working-with-docker.md
2014-04-29 13:49:36 -07:00
O.S. Tezer
1bc0f82406
Merge pull request #5475 from srijs/patch-1
...
docs: DisableNetwork -> NetworkDisabled
2014-04-29 23:43:28 +03:00
Michael Crosby
bf59e67232
Merge pull request #5476 from rjnagal/libcontainer-fixes
...
Cleanup cgroups on Set failures
2014-04-29 12:27:31 -07:00
Sam Rijs
9651ff46bf
docs: DisableNetwork -> NetworkDisabled
...
Docker-DCO-1.1-Signed-off-by: Samuel Reis <srijs@airpost.net > (github: srijs)
2014-04-29 21:18:26 +02:00
Victor Vieux
9d4771760a
Merge pull request #5474 from crosbymichael/use-proper-scheme
...
Use proper scheme with static registry
2014-04-29 12:04:49 -07:00
Rohit Jnagal
070747a213
Cleanup existing controllers when cleanup fails mid-way.
...
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
2014-04-29 18:59:20 +00:00
Victor Vieux
8a5060dba4
Merge pull request #4607 from vbatts/vbatts-static_registry
...
static registry support
2014-04-29 11:22:44 -07:00
Michael Crosby
0c7143b323
Add mountlabel to dev
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-29 03:41:44 -07:00
Michael Crosby
1a5ffef6c6
Do not return labels when in privileged mode
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-29 03:40:06 -07:00
Michael Crosby
64d0f7e39b
Add cli flag to docs for selinux support
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-29 03:40:06 -07:00
Michael Crosby
46e05ed2d9
Update process labels to be set at create not start
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-29 03:40:05 -07:00
Michael Crosby
ae00649305
Update devicemapper to pass mount flag
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-29 03:40:05 -07:00
Dan Walsh
12934ef3a4
Fix SELinux errors caused by multi-threading
...
Occasionally the selinux_test program will fail because we are setting file
context based on the Process ID but not the TID. THis change will always
use the TID to set SELinux labels.
Docker-DCO-1.1-Signed-off-by: Daniel Walsh <dwalsh@redhat.com > (github: rhatdan)
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: crosbymichael)
2014-04-29 03:40:05 -07:00
Dan Walsh
b7942ec2ca
This patch reworks the SELinux patch to be only run on demand by the daemon
...
Added --selinux-enable switch to daemon to enable SELinux labeling.
The daemon will now generate a new unique random SELinux label when a
container starts, and remove it when the container is removed. The MCS
labels will be stored in the daemon memory. The labels of containers will
be stored in the container.json file.
When the daemon restarts on boot or if done by an admin, it will read all containers json files and reserve the MCS labels.
A potential problem would be conflicts if you setup thousands of containers,
current scheme would handle ~500,000 containers.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: crosbymichael)
2014-04-29 03:40:05 -07:00
Michael Crosby
f0e6e135a8
Initial work on selinux patch
...
This has every container using the docker daemon's pid for the processes
label so it does not work correctly.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-29 03:40:05 -07:00
O.S. Tezer
797a4151a0
Merge pull request #5458 from SvenDowideit/add-redirects-for-docker-io-pr-5414
...
add redirects from index/ -> docker-io/ and for the docker-io_api too
2014-04-29 12:37:22 +03:00
Michael Crosby
44d54ba0c2
Use proper scheme with static registry
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-29 02:01:07 -07:00
Sven Dowideit
48dbee0824
modernise the MAINTAINER process documentation to line up with what I understand it to be
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-29 15:28:04 +10:00
Tianon Gravi
659305085f
Update hack/dind to mount cgroups on "/cgroup" instead of "/sys/fs/cgroup" for better compatibility
...
Fixes #5122
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-28 23:17:36 -06:00
Tianon Gravi
b1fe1797f3
Update hack/dind to match the rest of our scripts
...
No functional changes here, just coding style and maintainability.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-28 23:16:40 -06:00
Tianon Gravi
83999e70f4
Merge pull request #5433 from SvenDowideit/remove-sphinx-validation-from-build
...
Remove Travis Sphinx validation
2014-04-28 22:59:53 -06:00
Tianon Gravi
a7f21570b6
Merge pull request #5459 from shykes/remove-bootcamp
...
Remove obsolete 'bootcamp' project.
2014-04-28 22:59:20 -06:00
Tianon Gravi
c8381d6722
Use "docker load" to create "scratch" in hack/make/test-integration-cli (instead of implicitly pulling it from the index)
...
Creating the "docker save" tarball for "scratch" is pretty simple. I've also extrapolated the "docker build -t busybox ." logic into a separate "hack/make/.ensure-busybox" file so that it can eventually be reused easier.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-28 22:26:25 -06:00
Solomon Hykes
46492ee65a
Remove obsolete 'bootcamp' project.
...
It was a nice idea to recruit more maintainers but we never found the
time to do it properly...
I am still interested in any ideas to make it easier to start
contributing!
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-28 21:25:26 -07:00
Tianon Gravi
e4114e6b94
Update some whitespace in hack/make/test-integration-cli for consistency
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-28 22:22:31 -06:00
Sven Dowideit
17fbe3de38
remove the sphinx validation - we'll add a MarkDown one when we have it
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-29 13:43:13 +10:00
Sven Dowideit
53c35412f9
Merge pull request #5438 from ostezer/docs-expand-viewport
...
Docs/CSS fix: Allow viewport expand to user's preference
2014-04-29 13:35:10 +10:00
Sven Dowideit
33f36177e9
add redirects from index/ -> docker-io/ and for the docker-io_api too
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-29 13:33:22 +10:00
Sven Dowideit
6c4e5ee826
Merge pull request #5414 from jamtur01/privreg
...
Addressed regression of private repository documentation.
2014-04-29 13:28:21 +10:00
James Turnbull
81d6c0f106
Merge pull request #5439 from ostezer/docs-mkdocs-theme-maintainer-update
...
Docs/theme/MAINTAINERS: Modify/Update list of MAINTAINERS
2014-04-28 23:12:10 -04:00
James Turnbull
548cadd0a2
Merge pull request #5441 from ostezer/docs-fix-notes-warnings-bg
...
Docs/CSS: Fix Notes/Warnings blocks' BG colour to improve its state.
2014-04-28 23:09:13 -04:00
James Turnbull
6b5fd2daf7
Merge pull request #5443 from ncdc/commit-api-doc-fix
...
Docs fix: correct /commit info
2014-04-28 23:09:04 -04:00
Michael Crosby
69d56acd45
Merge pull request #5455 from rjnagal/cgroup-stats
...
Add throttling stats for cpu cgroup
2014-04-28 17:53:37 -07:00
Rohit Jnagal
d724242297
Another test to check for invalid stats.
...
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
2014-04-29 00:32:05 +00:00
Michael Crosby
934bd15565
Merge pull request #5389 from tiborvass/5152-symlink-in-volume
...
Fixes #5152 : symlink in volume path
2014-04-28 17:27:18 -07:00
Rohit Jnagal
61f156d521
Add cpu throttling stats.
...
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
2014-04-29 00:18:18 +00:00
Kato Kazuyoshi
21b42dfcfd
UTIME_OMIT is only available on Linux
...
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-04-29 09:08:33 +09:00
Tianon Gravi
0932488402
Merge pull request #5450 from tianon/update-deb-cgroup-dep
...
Update the "cgroup-lite" dep in our deb package from "Suggests" to "Recommends" and add "cgroupfs-mount" as another alternative
2014-04-28 17:49:36 -06:00
Michael Crosby
5b3f7851d8
Merge pull request #5451 from vmarmol/add-memory-stats
...
Adding a unit test for stats in pkg/cgroup/fs/memory.go
2014-04-28 16:38:34 -07:00
Victor Vieux
eb6a1c9f49
Merge pull request #5449 from tianon/remove-libcontainer-root-special-case
...
Remove "root" and "" special cases in libcontainer
2014-04-28 16:29:08 -07:00
Michael Crosby
fbc7a069f2
Merge pull request #5392 from rjnagal/libcontainer-fixes
...
Minor libcontainer fixes
2014-04-28 16:26:17 -07:00
Tianon Gravi
314818e7ba
Update the "cgroup-lite" dep in our deb package from "Suggests" to "Recommends" and add "cgroupfs-mount" as another alternative
...
I tested to verify that if neither package is available (for example, on Debian Wheezy), apt still continues installing properly.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-28 17:08:03 -06:00
Rohit Jnagal
c44c51e3ce
Merge branch 'master' into libcontainer-fixes
...
Conflicts:
pkg/libcontainer/README.md
pkg/libcontainer/container.json
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
2014-04-28 23:04:04 +00:00
Victor Marmol
76f95294a3
Adding a unit test for pkg/cgroup/fs/memory.go
...
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-04-28 22:58:25 +00:00
Tianon Gravi
d98069030d
Remove "root" and "" special cases in libcontainer
...
These are unnecessary since the user package handles these cases properly already (as evidenced by the LXC backend not having these special cases).
I also updated the errors returned to match the other libcontainer error messages in this same file.
Also, switching from Setresuid to Setuid directly isn't a problem, because the "setuid" system call will automatically do that if our own effective UID is root currently: (from `man 2 setuid`)
setuid() sets the effective user ID of the calling process. If the
effective UID of the caller is root, the real UID and saved set-user-
ID are also set.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-28 16:46:03 -06:00
Hobofan
6893689336
reapply Cmd value even if CmdAdd returns early
...
Docker-DCO-1.1-Signed-off-by: Maximilian Goisser <goisser94@gmail.com > (github: hobofan)
2014-04-29 00:27:32 +02:00
Victor Vieux
af72ca199d
Merge pull request #5136 from cpuguy83/5080_fix_empty_volume_perms
...
Fixes permissions on volumes when dir in container is empty
2014-04-28 14:36:02 -07:00
Brian Goff
ff7b52abd3
Fixes permissions on volumes when dir in container is empty
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-04-28 16:57:28 -04:00
Tibor Vass
e9a42a45bf
Fixes #5152 : symlink in volume path
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-04-28 13:18:12 -07:00
James Turnbull
a8871b93b9
Addressed regression of private repository documentation.
...
This adds back in the references to private repositories and
provides some refactoring to the Working with repositories
documentation including updating references to the "Central"
registry to Docker.io.
It also:
* Fixes some links and references to Central Index
* Fixes anchors in other files to updated titles in Working with Repositories.
* Renamed Central Index in the remaining places.
* Updated terms documentation to reflect Docker.io
* Updated some Docker Index naming to be consistent.
* Updates menu labels and hyperlinks.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-28 16:08:55 -04:00
Solomon Hykes
d8332f433f
Merge pull request #5422 from shykes/engine-spawn
...
engine/spawn: run an engine in a subprocess, remote-controlled by Beam
2014-04-28 12:56:02 -07:00
Michael Crosby
b386f2f558
Merge pull request #5412 from vmarmol/add-blkio-test
...
Adding a test for blkio stats.
2014-04-28 12:50:20 -07:00
Michael Crosby
3c5bac0348
Merge pull request #5394 from vmarmol/add-croup-memory-stats
...
Add memory usage and max usage stats.
2014-04-28 12:44:34 -07:00
Victor Vieux
68d8d9a62d
update message
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-04-28 19:03:31 +00:00
Victor Vieux
78421b3768
docker rmi -f works with stopped containers + revamped error messages
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-04-28 19:02:04 +00:00
Andy Goldstein
bba1dd046d
Docs fix: correct /commit info
...
Correct documentation for POST /commit to reflect that the container's
configuration is supplied in the request body, and not as a query
parameter.
Also correct a small typo in the example JSON for create container.
Docker-DCO-1.1-Signed-off-by: Andy Goldstein <agoldste@redhat.com > (github: ncdc)
2014-04-28 13:38:58 -04:00
Solomon Hykes
8fac9a345b
Merge pull request #5431 from shykes/engine-len
...
engine.Len returns the number of keys in an env
2014-04-28 10:16:49 -07:00
O.S.Tezer
abf3baf4eb
Docs/CSS: Fix Notes/Warnings blocks' BG colour to improve its state.
...
Docs' BG was original "#fff" and blocks such as code blocks or
warning-notes blocks were coloured in #F2F2F2.
In order to make it easier to read everything, the BG colour was
changed to #fff. However, the switch missed to convert other blocks'
BG colour.
This commit aims to re-introduce the correct contrast by changing the
BG colour of warning/notes block to #fff.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-28 19:02:50 +03:00
O.S.Tezer
f334dbe82d
Docs/CSS: Amend code block rendering.
...
This commit aims to improve the rendering of code blocks by
reducing the padding, matching the font-size with the rest of the
documentation text and finally, by changing the background colour
back to white from its current gray-ish state which matches the
background colour and making it really hard to spot the code.
Note: The BG colouring issue is due to converting the main BG
to gray whilst missing to change parts that where gray to white, i.e.,
not making the complete switch.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-28 18:58:15 +03:00
O.S.Tezer
442b70c65a
Docs/theme/MAINTAINERS: Modify/Update list of MAINTAINERS
...
So far it has been mostly my duty to create and maintain docs' design/theme.
This commit adds myself to the list of maintainers by modifying
the MAINTAINERS file under the docs/theme directory.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-28 18:36:40 +03:00
O.S.Tezer
b6699111db
Docs/CSS fix: Aallow viewport expand to user's preference
...
This commit removes the "max-width" property of DOM "containers";
Thus letting the viewport to expand to fill the available space.
This commit aims to bring pleasure to Docker docs' readers' eyes,
And to make them happy by letting them profit more from their large
monitors. (or use more efficiently their smaller ones).
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-28 18:30:31 +03:00
unclejack
425b315695
Merge pull request #5199 from shin-/registry_mirrors_support
...
Added support for multiple endpoints in X-Docker-Endpoints header
2014-04-28 17:56:57 +03:00
James Turnbull
4155874443
Merge pull request #4576 from Soulou/4549-doc-kill-signal-param
...
Add missing 'signal' parameter for kill endpoint
2014-04-28 04:39:25 -04:00
Solomon Hykes
9b23178f58
engine.Len returns the number of keys in an env
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-28 00:37:42 -07:00
Solomon Hykes
b4b83ef8ae
engine/spawn: run an engine in a subprocess, remote-controlled by Beam
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-27 14:11:46 -07:00
Solomon Hykes
9236e088eb
Fix bug in engine.Sender
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-27 14:11:45 -07:00
Solomon Hykes
62f4c88443
Merge pull request #5374 from shykes/beam-engine
...
Remote communication between engines using beam
2014-04-27 14:10:59 -07:00
O.S. Tezer
44c69c1d87
Merge pull request #5425 from jlhawn/io-auth-accounts-api-docs
...
Merged.
2014-04-27 21:40:03 +03:00
Josh Hawn
c6060a3b25
Added back OAuth and Accounts API docs pages
...
Removed a now unused endpoint from the accounts API.
Updated some of the accounts links to point to www.docker.io
as the account signup and resend-email-confirmation links should
no longer point to the index.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2014-04-27 11:17:48 -07:00
Soulou
91deb591c8
[Documentation - API] Add missing 'signal' parameter for /containers/:id/kill endpoint
...
Docker-DCO-1.1-Signed-off-by: Leo Unbekandt <leo.unbekandt@appsdeck.eu > (github: Soulou)
2014-04-27 18:10:30 +01:00
Solomon Hykes
e83fc70d36
Freeze ./integration and explain where to contribute new tests
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-26 18:55:39 -07:00
Sven Dowideit
40882cc0b6
Merge pull request #5417 from jamtur01/readme3
...
Fixed double backtick to single backtick formatting issue in README
2014-04-27 11:48:52 +10:00
Sven Dowideit
91cd60efd8
Merge pull request #5416 from jamtur01/dockerize
...
Fixed Dockerise to Dockerize
2014-04-27 11:48:27 +10:00
James Turnbull
723d314f09
Replaced all double backticks in README with singles
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-04-26 10:12:09 -04:00
James Turnbull
df018bc801
Fixed Dockerise to Dockerize
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-04-26 09:48:07 -04:00
Sven Dowideit
3b279d0218
Merge pull request #5415 from jamtur01/readme2
...
Updated Docs README
2014-04-26 23:36:41 +10:00
James Turnbull
7744f63159
Updated Docs README
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-04-26 08:10:19 -04:00
Victor Marmol
f4055ee2a4
Adding a test for blkio stats.
...
Also adds a test utility we can use for other cgroup tests.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-04-26 07:29:13 +00:00
unclejack
44140f7909
Merge pull request #5411 from crosbymichael/lockdown
...
Update default restrictions for exec drivers
2014-04-26 03:27:56 +03:00
Solomon Hykes
4701f8ee60
Merge pull request #5365 from crosbymichael/job-status
...
Add exported status code from a job
2014-04-25 17:27:07 -07:00
Solomon Hykes
7e3624a498
engine: 'rengine' is a small command-line utility to debug remote engine
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-25 17:23:47 -07:00
Solomon Hykes
b63b98ee27
engine.Sender and engine.Receiver support stdin
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-25 17:23:47 -07:00
Solomon Hykes
3c1d5ca33e
Remote communication between engines using beam
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-25 17:23:47 -07:00
Solomon Hykes
68d3e75750
engine: allow registering a "catchall" handler which receives all commands
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-25 17:23:16 -07:00
Solomon Hykes
9422451ac3
engine.Installer: a standard interface for "installable" services
...
Installer is a standard interface for objects which can "install"
themselves an engine by registering handlers.
This can be used as an entrypoint for external plugins etc.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-25 17:23:16 -07:00
Vincent Batts
7790a77b6a
static_registry: update the test for the new struct
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-04-25 20:01:25 -04:00
Rohit Jnagal
8cdb720d26
Updated sample config to be usable. We should change the namespace
...
config to not need "value" later.
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
2014-04-25 21:10:23 +00:00
unclejack
077b7d0359
Merge pull request #5342 from danielnorberg/avoid-suicide
...
avoid suicide
2014-04-25 21:44:45 +03:00
Alexander Larsson
6d631968fa
devmapper: Store metadata in one file per device
...
This allows multiple instances of the backend in different containers
to access devices (although generally only one can modify/create them).
Any old metadata is converted on the first run.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-25 15:21:56 +02:00
James Turnbull
ed48608147
Merge pull request #5401 from SvenDowideit/docs-api-eg-formating
...
small api doc formatting fixup
2014-04-25 09:11:46 -04:00
Alexander Larsson
f26203cf54
devmapper: Simplify thin pool device id allocation
...
Instead of globally keeping track of the free device ids we just
start from 0 each run and handle EEXIST error and try the next one.
This way we don't need any global state for the device ids, which
means we can read device metadata lazily. This is important for
multi-process use of the backend.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-25 14:26:27 +02:00
Alexander Larsson
586a511cb5
devmapper: Move error detection to devmapper.go
...
This moves the EBUSY detection to devmapper.go, and then returns
a real ErrBusy that deviceset uses.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-25 14:26:27 +02:00
Alexander Larsson
8116b86e05
devmapper: Maks createSnapDevice a function, not a method
...
No idea why this was a method. Maybe a cut and paste bug.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-25 14:26:27 +02:00
Sven Dowideit
c7bd1f4e64
small api doc formatting fixup
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-25 20:36:31 +10:00
Rohit Jnagal
24f978094d
Updated sample config and README to match the default template for
...
native execdriver.
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
2014-04-25 06:02:30 +00:00
Victor Marmol
ad924959a9
Add memory usage and max usage stats.
...
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-04-25 02:51:28 +00:00
Rohit Jnagal
580c2620e7
Improved README formatting.
...
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
2014-04-25 01:23:48 +00:00
Rohit Jnagal
569b234135
Add enabled option to namespaces and capabilities spec in
...
container.json. Although we don't yet check for enabled everywhere.
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
2014-04-25 01:10:11 +00:00
Rohit Jnagal
0aacca3ae6
Fix typos in nsinit logs.
...
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
2014-04-25 00:20:14 +00:00
Rohit Jnagal
14b2a9de87
Fix container.json sample to be loadable by nsinit.
...
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
2014-04-25 00:17:45 +00:00
James Turnbull
a368c0dd50
Merge pull request #5355 from SvenDowideit/doc-ubuntu-14-04-lts
...
initial version of installation on ubuntu 14.04 LTS
2014-04-24 20:06:08 -04:00
Sven Dowideit
b3bea07d56
Merge pull request #5371 from ostezer/docs-add-docs-versioning-files-to-gitignore
...
Docs: Add docs new version files created by `make docs` to .gitignore
2014-04-25 09:08:43 +10:00
Sven Dowideit
1083b6d2ec
Merge pull request #5372 from SvenDowideit/docs-tweaks-to-socket-options
...
Docs tweaks to socket options
2014-04-25 09:08:22 +10:00
Sven Dowideit
7f64210e9e
Merge pull request #5378 from ostezer/docs-fix-stray-url-from-warning
...
Fix stray url from beta-docs warning (remove aws bucket URI)
2014-04-25 09:07:58 +10:00
Guillaume J. Charmes
85540f6aa0
Merge pull request #5373 from vmarmol/master
...
Separating cgroup Memory and MemoryReservation.
2014-04-24 14:28:40 -07:00
Michael Crosby
8af84c5e23
Merge pull request #5335 from alexlarsson/remove-ghost
...
container: Remove Ghost state
2014-04-24 11:55:05 -07:00
Victor Marmol
f188b9f623
Separating cgroup Memory and MemoryReservation.
...
This will allow for these to be set independently. Keep the current Docker behavior where Memory and MemoryReservation are set to the value of Memory.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-04-24 11:09:38 -07:00
Michael Crosby
d5c9f61ecc
Ignore isnot exists errors for proc paths
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:20 -07:00
Michael Crosby
fa5cabf9fe
Update init for new apparmor import path
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:20 -07:00
Michael Crosby
90678b3133
Update create with apparmor import
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:20 -07:00
Michael Crosby
2d31aeb911
Update container.json and readme
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:20 -07:00
Michael Crosby
2d6c367434
Increment native driver version with these changes
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:20 -07:00
Michael Crosby
7a0b361066
Move capabilities into security pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:20 -07:00
Michael Crosby
156987c118
Move mounts into types.go
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:20 -07:00
Michael Crosby
a949d39f19
Move rest of console functions to pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:20 -07:00
Michael Crosby
05b611574f
Refactor mounts into pkg to make changes easier
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:20 -07:00
Michael Crosby
de3d51b0a8
Move console into its own package
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:20 -07:00
Michael Crosby
5ba1242bdc
Mount over dev and only copy allowed nodes in
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:20 -07:00
Michael Crosby
81e5026a6a
No not mount sysfs by default for non privilged containers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:20 -07:00
Michael Crosby
0779a8c328
Add lxc support for restricting proc
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:20 -07:00
Michael Crosby
60a90970bc
Add restrictions to proc in libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:19 -07:00
Michael Crosby
d26ea78e42
Move apparmor into security sub dir
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:19 -07:00
Michael Crosby
4ed165210f
Merge pull request #5381 from rjnagal/master
...
Add support for cpu hardcapping to cgroups.
2014-04-24 10:04:17 -07:00
Guillaume J. Charmes
56b779c321
Merge pull request #5356 from alexlarsson/devmapper-no-mount-in-create
...
devicemapper: Don't mount in Create()
2014-04-24 08:19:59 -07:00
Rohit Jnagal
264dc8a46b
Add support for cpu hardcapping to cgroups.
...
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
2014-04-24 14:43:02 +00:00
O.S.Tezer
5e5230cb19
Fix stray url from beta-docs warning (remove aws bucket URI)
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-24 16:29:12 +03:00
Sven Dowideit
da8f6ffdeb
initial version of installation on ubuntu 14.04 LTS
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-04-24 22:59:59 +10:00
O.S. Tezer
df20a0e7a3
Merge pull request #5377 from SvenDowideit/fix-terms-links
...
Merged.
2014-04-24 15:42:10 +03:00
Sven Dowideit
ada86fc5b7
Looking into some broken links, I noticed that we don't need to use
...
relative paths, and also fixed some broken images.
There are still more todo - next PR I think :)
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-24 22:20:04 +10:00
O.S.Tezer
c932667cd2
Docs auto-conversion fixes and MD marking and structure improvements.
...
- Remove redundant chars and all errors caused by RST->MD conversion.
e.g. [/#, /\, \<, />, etc.]
- Fix broken inter-document links
- Fix outbound links no-longer active or changed
- Fix lists
- Fix code blocks
- Correct apostrophes
- Replace redundant inline note marks for code with code marks
- Fix broken image links
- Remove non-functional title links
- Correct broken cross-docs links
- Improve readability
Note: This PR does not try to fix/amend:
- Grammatical errors
- Lexical errors
- Linguistic-logic errors etc.
It just aims to fix main structural or conversion errors to serve as
a base for further amendments that will cover others including but
not limited to those mentioned above.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Update:
- Fix backtick issues
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-04-24 22:19:32 +10:00
O.S.Tezer
d9f9021e9b
Docs: Add docs new version files created by make docs to .gitignore
...
Files are:
- docs/AWS_S3_BUCKET
- docs/GIT_BRANCH
- docs/VERSION
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Update:
- Remove unnecessary last blankline
2014-04-24 13:33:00 +03:00
James Turnbull
83b388c979
Merge pull request #5362 from sindhus/patch-2
...
Update link to interactive tutorial
2014-04-24 00:22:04 -04:00
Sven Dowideit
b2c87fe08b
add a reference to multiple -H options, and update the other example of -H option
...
and copy changes to the cli.md file
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-24 11:24:58 +10:00
Mike MacCana
e62efb266f
- unix://path/to/socket should read unix:///path/to/socket like the rest of the documentation (a slash was missing)
...
- Mention that [] options may be specified multiple times on the Usage page
Docker-DCO-1.1-Signed-off-by: Mike MacCana <mike.maccana@gmail.com > (github: mikemaccana)
Docker-DCO-1.1-Signed-off-by: Mike MacCana <mike.maccana@gmail.com > (github: SvenDowideit)
2014-04-24 11:11:51 +10:00
Sven Dowideit
0ade0af27e
Merge pull request #5349 from ipbabble/manpages
...
Manpages - fixes and merged tianon/docker man1-assumption branch
2014-04-24 09:43:42 +10:00
Solomon Hykes
0fe48b0e59
Merge pull request #5345 from shykes/engine-installer
...
engine.Installer: a standard interface for "installable" services
2014-04-23 16:16:55 -07:00
Guillaume J. Charmes
baf6cf9056
Merge pull request #5347 from crosbymichael/engine-root
...
Remove root dir from engine
2014-04-23 13:53:08 -07:00
Michael Crosby
f90029611f
Add exported status code from a job
...
This allows the job's status code to be consumed externally so that we
can use it as an exit code or saving to a state file.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-23 13:47:56 -07:00
Sindhu S
81477a204f
Update link to interactive tutorial
2014-04-24 01:59:52 +05:30
Sindhu S
6e6b8b69cd
Update link to interactive tutorial
2014-04-24 01:02:54 +05:30
Michael Crosby
7100ace42b
Remove error from engine.New()
...
Without creating a root there is no way for the engine to return an
error from the new function.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-23 11:54:35 -07:00
Tianon Gravi
6b0f0af0e9
Merge pull request #5336 from tianon/slightly-more-organized-check-config
...
Move "possible config locations" list to the top of check-config.sh
2014-04-23 11:21:08 -06:00
Daniel Norberg
b3ddc31b95
avoid suicide
...
container.Kill() might read a pid of 0 from
container.State.Pid due to losing a race with
container.monitor() calling
container.State.SetStopped(). Sending a SIGKILL to
pid 0 is undesirable as "If pid equals 0, then sig
is sent to every process in the process group of
the calling process."
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com > (github: danielnorberg)
2014-04-23 11:06:59 -04:00
James Turnbull
03aacc4b91
Merge pull request #5351 from SvenDowideit/docs-conditional-beta-warning
...
Docs conditional beta warning
2014-04-23 08:55:08 -04:00
Alexander Larsson
73d9ede12c
devicemapper: Don't mount in Create()
...
We used to mount in Create() to be able to create a few files that
needs to be in each device. However, this mount is problematic for
selinux, as we need to set the mount label at mount-time, and it
is not known at the time of Create().
This change just moves the file creation to first Get() call and
drops the mount from Create(). Additionally, this lets us remove
some complexities we had to avoid an extra unmount+mount cycle.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-23 13:50:53 +02:00
Sven Dowideit
f436c744da
Merge pull request #5337 from tianon/man1-assumption
...
Update contributed man page file names and compilation script
2014-04-23 21:10:01 +10:00
Sven Dowideit
dc982d3053
make the non-release doc warning conditional and add version info
...
use the beta-warning area to tell the user what VERSION of docker, git
branch, and links to the official release version docs are.
requires / extends PR #5272
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-23 21:07:12 +10:00
O.S.Tezer
9d38fd0eef
Development docs warning for beta-docs.docker.io
...
Update: Fix alignment issues of the "warning" block.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Docker-DCO-1.1-Signed-off-by: O.S.Tezer <ostezer@gmail.com > (github: SvenDowideit)
2014-04-23 21:07:11 +10:00
O.S. Tezer
a99d0c7136
Merge pull request #5352 from rmoriz/patch-1
...
Merged.
2014-04-23 12:42:41 +03:00
Roland Moriz
086b3208ea
fixed broken link to chef community site
2014-04-23 09:17:57 +02:00
William Henry
a6fd2c237e
Fixed some missing ']' and the TAG
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
Changes to be committed:
modified: contrib/man/md/docker-build.1.md
2014-04-22 22:35:59 -06:00
William Henry
687653e599
Merge branch 'man1-assumption' of https://github.com/tianon/docker into manpages
2014-04-22 22:21:39 -06:00
William Henry
a5b4a90748
Fixed an missing '-' on the "--rm"
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
Changes to be committed:
modified: contrib/man/md/docker-build.md
2014-04-22 22:17:33 -06:00
William Henry
70654160e6
Merge branch 'master' of https://github.com/dotcloud/docker
2014-04-22 22:14:04 -06:00
Michael Crosby
87e8d7754e
Update tests with engine root removal
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-22 19:24:47 -07:00
Tianon Gravi
96588fb85d
Merge pull request #5346 from SvenDowideit/dont-alocate-port-for-docs-release
...
Remove port allocation from `make docs-release`
2014-04-22 20:15:18 -06:00
Michael Crosby
672edfe807
Remove the concept of a root dir out of engine
...
This makes the engine more general purpose so that we can
use it and the job routing functionality for reexec'ing our binary
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Conflicts:
integration/runtime_test.go
2014-04-22 19:04:03 -07:00
Sven Dowideit
e0af429a2a
don't try allocating a port to upload a docs release to s3
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-23 11:59:16 +10:00
Victor Vieux
817494d009
Merge pull request #5343 from shykes/beamsh
...
beam + beam/data + dockerscript
2014-04-22 17:01:05 -07:00
Solomon Hykes
4353f25e10
engine.Installer: a standard interface for "installable" services
...
Installer is a standard interface for objects which can "install"
themselves an engine by registering handlers.
This can be used as an entrypoint for external plugins etc.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 16:51:06 -07:00
Solomon Hykes
bf51f36d8f
Fix Go formatting in beam and dockerscript
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 16:16:29 -07:00
Solomon Hykes
0bf2109121
pkg/dockerscript: add MAINTAINERS file
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:24 -07:00
Solomon Hykes
bc6303f15d
beam/examples/beamsh: 'chdir' changes the current directory
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:24 -07:00
Solomon Hykes
6ce4d2c842
beam/examples/beamsh: 'exec' can communicate with its child via beam.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:24 -07:00
Solomon Hykes
271ba18043
beam/examples/beamsh: use beam.Router to simplify 'multiprint' and fix job passthrough
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:23 -07:00
Solomon Hykes
0d08d36bf5
beam: new routing functions Route.KeyEquals, Route.KeyIncludes, Route.NoKey
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:23 -07:00
Solomon Hykes
30424f4e3a
beam/examples/beamsh: use beam.Router to simplify 'trace'
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:23 -07:00
Solomon Hykes
d3df4b5baf
beam/examples/beamsh: move builtins to a separate file for readability
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:23 -07:00
Solomon Hykes
0822d67b2d
beam/examples/beamsh: simplify commands by always creating and sending stdout and stderr for them
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:23 -07:00
Solomon Hykes
63fd2ec0f7
beam/examples/beamsh: use beam.Router to simplify 'logger'
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:23 -07:00
Solomon Hykes
9206b18818
beam/examples/beamsh: use beam.Router to simplify the 'stdio' command
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:23 -07:00
Solomon Hykes
8f5435e80c
beam: Router can route beam messages with a convenient set of rules and handlers
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:23 -07:00
Solomon Hykes
40b4f86eab
beam/examples/beamsh: move example scripts to scripts/
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:22 -07:00
Alexander Larsson
1fb0bf1b3b
beam: Fix double close of fds in SendUnix
...
Instead of calling syscall.Close() on the fds in sendUnix() we call
Close() on the *os.File in Send(). Otherwise the fd will be closed, but
the *os.File will continue to live, and when it is finalized the
fd will be closed (which by then may be reused and can be anything).
This also adds a note to Send() the the file is closed.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-22 15:50:22 -07:00
Solomon Hykes
a88d8d678b
beam: more unit tests
...
This adds testing to SendConn.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:22 -07:00
Solomon Hykes
06df94d55b
beam/examples/beamsh: add scripts to reproduce various bugs
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:22 -07:00
Solomon Hykes
d0ca66dded
beam/examples/beamsh: fix 'print' to be pass-through
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:22 -07:00
Solomon Hykes
b97375fc29
beam/examples/beamsh: rename 'log' to 'logger' to avoid conflict with stdout/stderr
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:22 -07:00
Solomon Hykes
a2b88b4915
beam/examples/beamsh: 'prompt' asks the user for a value and sends it.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:22 -07:00
Solomon Hykes
ed62ca5b2f
beam/examples/beamsh: commands are messages.
...
Commands in the pipeline should either implement or pass-through command messages.
This amounts to a proof-of-concept implementation of the "pipeline"
design of Docker plugins.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:22 -07:00
Solomon Hykes
2f4b8b7e8d
beam/examples/beamsh: cosmetic fix in Fatalf
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:22 -07:00
Solomon Hykes
4f92ffb500
beam: replace SendPair() with the simpler SendConn()
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:21 -07:00
Solomon Hykes
5833e78887
beam/examples/beamsh: miniserver.ds demo
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:21 -07:00
Solomon Hykes
70d3262161
beam: improve the API with Sender/Receiver interfaces and utilities: Copy/SendPipe/SendPair
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:21 -07:00
Alexander Larsson
b0228d94be
beam: Make extracted Fds CloseOnExec
...
Grab forklock to make sure no forks accidentally inherit the new fds
before they are made CLOEXEC There is a slight race condition between
ReadMsgUnix returns and when we grap the lock, so this is not
perfect. Unfortunately There is no way to pass MSG_CMSG_CLOEXEC to
recvmsg() nor any way to implement non-blocking i/o in go, so this is
hard to fix.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-22 15:50:21 -07:00
Solomon Hykes
207e604bad
beam/examples/beamsh: add a few example dockerscripts
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:21 -07:00
Solomon Hykes
29ddf2be1e
beam/examples/beamsh: simplify code by using sendWPipe utility
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:21 -07:00
Solomon Hykes
1dc449e11d
beam/examples/beamsh: move code around for readability
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:21 -07:00
Solomon Hykes
3a2b31a30b
beam/examples/beamsh: 'exec' adds 'fromcmd' field to its output
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:21 -07:00
Solomon Hykes
7534f7a34b
beam/examples/beamsh: simple 'log' command tees streams to a local directory
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:21 -07:00
Solomon Hykes
4f5b94d369
beam/examples/beamsh: 'render' and 'beamsh -x'
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:20 -07:00
Solomon Hykes
4ebe7aab91
beam/examples/beamsh: run commands in an implicit context of pre-loaded 'plugins'
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:20 -07:00
Solomon Hykes
cd85af06fe
beam/examples/beamsh: convenience commands 'devnull', 'echo' and 'stdio'
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:20 -07:00
Solomon Hykes
6d9cdbf24f
beam/examples/beamsh: 'emit' supports key=value syntax to compose arbitrary objects
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:20 -07:00
Solomon Hykes
2b81fb8424
dockerscript: '=' is not a special character
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:20 -07:00
Solomon Hykes
6e0a156d90
beam/examples/beamsh: support for background commands with '&' terminator
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:20 -07:00
Solomon Hykes
08686f1d21
beam/data: Message.Parse creates a message from shell-style 'key=value' arguments
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:20 -07:00
Solomon Hykes
ffe19414b1
dockerscript: support '#' line comments
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:20 -07:00
Solomon Hykes
e1c8dbba97
beam/examples/beamsh: scripts can be passed as filenames
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:20 -07:00
Solomon Hykes
222fc87ade
beam/examples/beamsh: remote communication over beam (experimental).
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:20 -07:00
Solomon Hykes
371f6fc63d
beam/examples/beamsh: 'in' chdirs to a directory. 'pass' does simple passthrough
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:19 -07:00
Solomon Hykes
6d5c75a224
beam/examples/beamsh: 'beamsend' command serializes all messages and sends them over a network connection
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:19 -07:00
Solomon Hykes
5ddf673851
beam/examples/beamsh: 'exec' command correctly closes stdout and stderr when the process exists
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:19 -07:00
Solomon Hykes
e512fef425
beam/examples/beamsh: don't print discarded messages in Devnull
...
This avoids false alarms when process exits without printing. Devnull
doesn't require synchronization.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:19 -07:00
Solomon Hykes
34c5724b89
beam/examples/beamsh: more useful debugging
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:19 -07:00
Solomon Hykes
a5bc75d406
beam/data: expose EncodeString for convenience access to the underlying netstring primitive
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:19 -07:00
Solomon Hykes
fb1af1f0bc
beam/examples/beamsh: utility function 'fileToConn'
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:19 -07:00
Solomon Hykes
74b90c25d9
beam/examples/beamsh: 'connect' command
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:19 -07:00
Solomon Hykes
dff9854305
beam/examples/beamsh: 'exec' and 'listen' commands
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:19 -07:00
Solomon Hykes
3686d50429
beam/examples/beamsh: prettier devnull
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:18 -07:00
Solomon Hykes
c9b8e0fcac
beam/data: prettier Message.Pretty()
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:18 -07:00
Solomon Hykes
d7a2ae8e13
beam/examples/beamsh: prettier 'trace' command
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:18 -07:00
Solomon Hykes
eca6fecb59
beam/data: convenience Message.Pretty() function
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:18 -07:00
Solomon Hykes
d4920b3fff
beam/examples/beamsh: basic implementation of the pipeline design, with static handlers for now.
...
In the pipeline design, several beam commands can be run concurrently,
with their respective inputs and outputs connected in such a way that
beam messages flow from the first to last. This is similar to the way
a unix shell executes commands in a pipeline: instead of STDIN and
STDOUT, each beam command has a "BEAMIN" and "BEAMOUT".
Since beam allows for richer communication than plain byte streams, beam
pipelines can express more powerful computation, while retaining the
fundamental elegance and ease of use of unix-style composition.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:18 -07:00
Solomon Hykes
ec288895e5
beam/examples/beamsh: better debugging messages
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:18 -07:00
Solomon Hykes
ab2010cfd3
beam/examples/beamsh: simple 'exec' command
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:18 -07:00
Solomon Hykes
5689792171
beam/examples/beamsh: catch introspection calls from jobs for proper nesting
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:18 -07:00
Solomon Hykes
bcd31405cf
beam: fix FD leaks in SendPipe
...
This fixes file descriptor leaks in the SendPipe function.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:18 -07:00
Solomon Hykes
1737063904
beam: more hooks for interactive debugging
...
This inserts low-level hooks for interactive step-by-step debugging.
Hooks are triggered by setting the *TEST* environment variable.
This is particularly useful for tracking down file descriptor leaks,
double-closing, or other issues which are difficult to debug with
the usual toolbox.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:17 -07:00
Solomon Hykes
6072dec9e7
beam/examples/beamsh: first try at nested execution
...
The "wiring" is broken because engine does not keep a reference for handling introspection calls.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:17 -07:00
Solomon Hykes
8697490740
beam/examples/beamsh: fix a bug in the log command
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:17 -07:00
Solomon Hykes
488fe61354
beam/data: convenience Message.Get
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:17 -07:00
Solomon Hykes
460c98d92d
beam/examples/beamsh: use beam/data
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:17 -07:00
Solomon Hykes
5bcf2a736c
beam/data: Message.Bytes() convenience method
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:17 -07:00
Solomon Hykes
99dda11d45
beam/data: fix a bug in encoding of multi-value maps
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:17 -07:00
Solomon Hykes
276fb1918d
beam/data: convenience Message type for chained manipulation
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:17 -07:00
Solomon Hykes
916372c76f
Beam: remove leftover debugging messages
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:17 -07:00
Solomon Hykes
cb66e8c136
beam/examples/beamsh: hide debug messages in examples/beamsh by default
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:17 -07:00
Solomon Hykes
97a2c0ebe6
beam/data: a simple format for sending structured data over beam
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:16 -07:00
Solomon Hykes
771e493457
beam/examples/beamsh: more bells and whistles for demos
...
* Automatically switch to interactive mode when stdin is a terminal
* Basic implementation of "responses"
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:16 -07:00
Solomon Hykes
851c1b05d0
Beam: fix bug in beamsh which 'swapped' FDs because of underlying implementation of net.FileConn
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:16 -07:00
Solomon Hykes
4481e80636
pkg/dockerscript: <!> is not a special character
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:16 -07:00
Solomon Hykes
07c03944ff
Beam: don't close the attachment FD when closing superfluous FDs
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:16 -07:00
Solomon Hykes
8875cdf561
Beam: debugging hooks for easy step-by-step inspection of the FD table
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:16 -07:00
Solomon Hykes
f586dcf307
beam/examples/beamsh: use 'log' command to pass stdout
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:16 -07:00
Solomon Hykes
d00a6b7648
beam/examples/beamsh: basic execution of commands, with in-process beam and dummy handlers
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:16 -07:00
Solomon Hykes
f0933a91b0
pkg/dockerscript: remove debug messages
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:16 -07:00
Solomon Hykes
5c14c3ada5
pkg/dockerscript: '.' is not a special character
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:15 -07:00
Solomon Hykes
f94a18677a
Beam: Send: pass the underlying error unchanged to allow io.EOF detection
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:15 -07:00
Solomon Hykes
11f2531da6
pkg/dockerscript: expose a simple, clean API with a single Parse method
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:15 -07:00
Solomon Hykes
7f00a3b665
beam/examples/beamsh: correctly parse nested commands
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:15 -07:00
Solomon Hykes
fd890136a9
dockerscript: patch text/scanner to use a shell-like syntax instead of the default go-like syntax
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:15 -07:00
Solomon Hykes
cd8ddacdc7
pkg/dockerscript: a simple shell-like syntax to express docker operations
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:15 -07:00
Solomon Hykes
be470f2497
Beam: beamsh is a mini-shell which runs processes and communicates with them over beam
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:15 -07:00
Solomon Hykes
0e42c7d889
Beam: basic test harness for the unix socket implementation.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:15 -07:00
Solomon Hykes
59853c188d
Beam: USocketPair returns a *net.UnixConn socket pair for convenience.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:15 -07:00
Solomon Hykes
c401c43cae
Beam: fix file descriptor leaks
...
* Close all file descriptors successfully sent as attachment
* Close duplicate file descriptors created by net.FileCon and net.UnixConn.File
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:15 -07:00
Solomon Hykes
b637e5f04a
Beam: change the prototype of SendPipe() to return a *net.UnixSocket
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:14 -07:00
Solomon Hykes
188c2ef806
Beam: allow sending messages without attachments.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:14 -07:00
Solomon Hykes
3960da04c8
Beam: convenience functions Listen and Connect
...
These convenience functions expose a familiar face to the unknown and bizarre world of beam networking.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:14 -07:00
Solomon Hykes
5957e6b385
Beam: a simple stream-oriented communication protocol for distributed systems.
...
This patch includes a stripped down implementation with a bare minimum
unix socket transport. It relies on fd passing for stream multiplexing.
The purpose of this first patch is to allow implementation of dynamic
linking, which will allow advanced service discovery.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:14 -07:00
Tianon Gravi
f763075c74
Update contributed man page file names and compilation script for the eventual possibility of non-man1 man pages (hopefully a Dockerfile.5.md, for example)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-22 06:43:08 -06:00
Tianon Gravi
2c4cebe916
Move "possible config locations" list to the top of check-config.sh
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-22 06:26:44 -06:00
Alexander Larsson
cf997aa905
container: Remove Ghost state
...
container.Register() checks both IsRunning() and IsGhost(), but at
this point IsGhost() is always true if IsRunning() is true. For a
newly created container both are false, and for a restored-from-disk
container Daemon.load() sets Ghost to true if IsRunning is true. So we
just drop the IsGhost check.
This was the last call to IsGhost, so we remove It and all other
traces of the ghost state.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-22 09:49:53 +02:00
Sven Dowideit
ba11de9efa
Merge pull request #5205 from ipbabble/manpages
...
Completed the manual paged in Markdown. rm old man pages.
2014-04-22 14:48:53 +10:00
Guillaume J. Charmes
e630d9ea24
Merge pull request #5331 from shykes/cleanup-maintainers
...
Clean up MAINTAINERS files
2014-04-21 18:18:39 -07:00
Solomon Hykes
19e6614eeb
Clean up MAINTAINERS files
...
* Remove out of date "vacation mode"
* Fix my email address
* Remove infrastructure maintainers to reflect reality (core maintainers
are currently maintaining their own infrastructure).
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-21 18:17:13 -07:00
Solomon Hykes
7b1337a17f
Merge pull request #5334 from shykes/freeze-server
...
Freeze server/server.go for deprecation
2014-04-21 18:16:40 -07:00
Solomon Hykes
8bcbc9fe99
Freeze server/server.go for deprecation
...
* Add notice in server/server.go explaining not to add stuff there, and
what to do instead.
* Make myself a sole maintainer of server/ to avoid concurrent edits
while refactoring.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-21 17:51:41 -07:00
O.S. Tezer
e828d91197
Merge pull request #5323 from Lance0312/docs-missing-blank-lines
...
Merged.
2014-04-22 02:55:44 +03:00
Guillaume J. Charmes
7816712457
Merge pull request #5328 from crosbymichael/refactor-cgroups
...
Refactor cgroups into subsystems and support metrics
2014-04-21 14:06:17 -07:00
William Henry
ac8c705c95
Changed Image to image.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
Changes to be committed:
modified: contrib/man/md/README.md
2014-04-21 14:37:08 -06:00
William Henry
73257a72ea
Further edtis based on comments.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
Changes to be committed:
modified: contrib/man/md/README.md
modified: contrib/man/md/docker-build.md
modified: contrib/man/md/docker-cp.md
modified: contrib/man/md/docker-logs.md
modified: contrib/man/md/docker-push.md
2014-04-21 14:28:25 -06:00
unclejack
c0d5eac120
Merge pull request #5223 from crosbymichael/load-profile
...
Use apparmor parser directly
2014-04-21 21:50:59 +03:00
William Henry
bbde4298a5
Edits based on Sven's comments.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
Changes to be committed:
modified: contrib/man/md/docker-build.md
modified: contrib/man/md/docker-commit.md
2014-04-21 11:55:06 -06:00
William Henry
7922e67870
Fixed a sentence for ostezer.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
modified: contrib/man/md/README.md
2014-04-21 10:42:46 -07:00
William Henry
95c311c8b4
Made some edits and removed the alternative, manual generation instructions.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
Changes to be committed:
modified: contrib/man/md/README.md
2014-04-21 10:42:46 -07:00
William Henry
1b2b783b52
Edits based on ostezer's feedback.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
2014-04-21 10:42:46 -07:00
Tianon Gravi
e55ed741c2
Update hack/make/ubuntu to use the new markdown-based manpages
...
This also removes all the old man pages, .gitignores their directory, and updates the md2man-all.sh script to be easier to read and more friendly to being called within hack/make/ubuntu.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-21 10:42:46 -07:00
William Henry
67a73917c1
Added a tag to FROM fedora (fedora:20)
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
2014-04-21 10:42:46 -07:00
William Henry
0a0dd11632
Created all manual pages in Markdown. Container for conversion.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
All Docker commands have a Markdown page.
Dockerfile used to build a Fedora based pandoc container.
md2man-all.sh is used inside the container.
README.sh includes an explaination on how to build the fedora/pandoc
image and how to run the container directly.
Changes to be committed:
new file: contrib/man/md/Dockerfile
new file: contrib/man/md/README.md
new file: contrib/man/md/docker-attach.md
new file: contrib/man/md/docker-build.md
new file: contrib/man/md/docker-commit.md
new file: contrib/man/md/docker-cp.md
new file: contrib/man/md/docker-diff.md
new file: contrib/man/md/docker-events.md
new file: contrib/man/md/docker-export.md
new file: contrib/man/md/docker-history.md
new file: contrib/man/md/docker-images.md
new file: contrib/man/md/docker-import.md
new file: contrib/man/md/docker-info.md
new file: contrib/man/md/docker-inspect.md
new file: contrib/man/md/docker-kill.md
new file: contrib/man/md/docker-load.md
new file: contrib/man/md/docker-login.md
new file: contrib/man/md/docker-logs.md
new file: contrib/man/md/docker-port.md
new file: contrib/man/md/docker-ps.md
new file: contrib/man/md/docker-pull.md
new file: contrib/man/md/docker-push.md
new file: contrib/man/md/docker-restart.md
new file: contrib/man/md/docker-rm.md
new file: contrib/man/md/docker-rmi.md
new file: contrib/man/md/docker-run.md
new file: contrib/man/md/docker-save.md
new file: contrib/man/md/docker-search.md
new file: contrib/man/md/docker-start.md
new file: contrib/man/md/docker-stop.md
new file: contrib/man/md/docker-tag.md
new file: contrib/man/md/docker-top.md
new file: contrib/man/md/docker-wait.md
new file: contrib/man/md/docker.md
new file: contrib/man/md/md2man-all.sh
2014-04-21 10:42:46 -07:00
Guillaume J. Charmes
3c50cb44d1
Merge pull request #5232 from kzys/freebsd-graph
...
Fix graph and pkg/graphdb on FreeBSD
2014-04-21 10:39:50 -07:00
Guillaume J. Charmes
813cebc64f
Merge branch 'master' into load-profile
...
Conflicts:
daemon/execdriver/native/create.go
daemon/execdriver/native/driver.go
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-21 10:32:13 -07:00
Guillaume J. Charmes
ac814ee3c7
Make sure @proc is defined
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-21 10:28:04 -07:00
Michael Crosby
004cf556e8
Use cgo to get systems clock ticks for metrics
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-21 10:26:22 -07:00
O.S. Tezer
d4ca165827
Merge pull request #5321 from SvenDowideit/osx-install-mkdir-local
...
Merged.
2014-04-21 19:12:36 +03:00
Michael Crosby
f59be989dc
Refactor stat parsing to use only 8 fields
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-20 20:45:08 -07:00
Michael Crosby
9cd6a6d614
Merge pull request #24 from ehazlett/cgroups-stats
...
more work on cpu stats
2014-04-20 21:11:11 -07:00
Evan Hazlett
2f24b5a9dc
work on cpu stats
...
Docker-DCO-1.1-Signed-off-by: Evan Hazlett <ejhazlett@gmail.com > (github: ehazlett)
2014-04-21 00:07:05 -04:00
Michael Crosby
bce49dff0d
Add freezer stats
...
This one is a problem because the most useful stat is a string and not a
float like verything else. We may have to change the return type
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-20 18:35:33 -07:00
Michael Crosby
3bfe13de2c
Reuse cpuacct stats for cpu subsystem
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-20 18:20:44 -07:00
Michael Crosby
37248039e1
Fix parsing of blkio files
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-20 18:18:17 -07:00
Michael Crosby
7f12260fd1
Add external function to get cgroup stats
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-20 17:36:20 -07:00
Michael Crosby
9b65f16355
Refactor stats and add them to all subsystems
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-20 12:02:39 -07:00
Michael Crosby
86e34ce59f
Squashed commit of the following:
...
commit 75af1649b063abbc5d662fd2f8bc4ff62c927687
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 01:32:42 2014 -0400
more refactor
commit 43b36d0f15d634497127bcb17dacaa70ae92e903
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 01:11:49 2014 -0400
refactored cgroup param parsing to util func
commit e3738b0168a075bd92ec828879b0e46bdbbe3845
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 00:57:19 2014 -0400
dat error checking
commit 57872bcc59403ecd308cfe97c78f73d6ca58d165
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 00:43:25 2014 -0400
proper use of fmt.Errorf
commit 43dad6acc0cb21aac2b04ce074699879898ee820
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 00:36:45 2014 -0400
proper placement of defer
commit b7f20b934b2bc92cd39397dbc608b77bff28493c
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 00:34:39 2014 -0400
defers, error checking, panic avoidance
commit 7a9a6ff267f8806dfe6676486f73fe89b72968fb
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 00:22:00 2014 -0400
data param to use container info instead of host
commit 0e0cf7309be1644687160d6519db792b23cd26e9
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 00:11:29 2014 -0400
added stats for cpuacct, memory, and blkio
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-20 11:34:28 -07:00
Lance Chen
b87cb76976
Add missing blank lines in between list items
...
Lists with paragraphs as items need blank lines in between
items to generate correct layout.
Docker-DCO-1.1-Signed-off-by: Lance Chen <cyen0312@gmail.com > (github: Lance0312)
2014-04-21 01:32:00 +08:00
Sven Dowideit
b26821e5c0
on a fresh OSX, /usr/local/bin doesn't exist
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-20 22:56:22 +10:00
Jack Danger Canty
611a1d711b
typo fix: 'methid' -> 'method'
2014-04-19 23:25:48 -07:00
Tianon Gravi
231f53fd9b
Merge pull request #5213 from tianon/missing-ps-requirement
...
Add missing "ps" requirement to PACKAGERS.md
2014-04-19 21:24:30 -06:00
Tianon Gravi
cb2ce9089c
Merge pull request #5313 from Lance0312/arch-fd-link
...
Fix borken /dev/fd in mkimage-arch.sh
2014-04-19 21:23:18 -06:00
Sven Dowideit
f10bb364be
Merge pull request #5312 from ostezer/docs-illusion-confusion
...
Urgent fix for crazy docs error on volumes.
2014-04-20 12:02:47 +10:00
Tianon Gravi
f2f33d7096
Merge pull request #5249 from tianon/make-validate
...
Add "validate" Makefile target
2014-04-19 11:35:14 -06:00
O.S.Tezer
97daf9864d
Urgent fix for crazy docs error on volumes.
...
Elaborate on the volumes example to prevent confusion.
Update: Amend the example so it is executable by the reader.
This includes fixing the erring "/var/logs" statement with "/var/log".
Update: Fix sentence structuring to better suit the 80chrs. limit.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-19 19:35:00 +03:00
Sven Dowideit
1c75602890
Merge pull request #5309 from ostezer/docs-fix-apostrophe
...
Introducing spīritus lēnis to fix code highlighting issues due to apostrophe.
2014-04-19 20:39:27 +10:00
Sven Dowideit
c7f5799120
Merge pull request #5311 from ostezer/docs-fix-footer-links
...
Fix footer links. They are pointing to the wrong direzione.
2014-04-19 20:38:44 +10:00
Lance Chen
e6b794e542
Fix broken /dev/fd in mkimage-arch.sh
...
Exactly the same problem as dotcloud/docker#2356
Docker-DCO-1.1-Signed-off-by: Lance Chen <cyen0312@gmail.com > (github: Lance0312)
2014-04-19 16:04:35 +08:00
Michael Crosby
7fdeda8717
Add remove method to subsystems
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 22:17:31 -07:00
Michael Crosby
e92f2fd395
Break down groups into subsystems
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 22:10:30 -07:00
Michael Crosby
06db0604e5
Move raw cgroups into fs package (filesystem)
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 21:34:26 -07:00
Michael Crosby
ec43ec50b4
Move systemd code into pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 21:30:08 -07:00
Michael Crosby
42fb2973c6
Refactor cgroups file locations
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 21:14:58 -07:00
O.S.Tezer
a96106b5f1
Fix footer links. They are pointing to the wrong direzione.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-19 04:13:52 +03:00
Solomon Hykes
4c720d4de7
Merge pull request #4166 from shykes/engine-logging
...
Engine: optional Logging field to disable custom logging in engine.
2014-04-18 18:05:00 -07:00
O.S.Tezer
2d6324e06a
Introducing spīritus lēnis to fix code highlighting issues due to apostrophe.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-19 03:35:45 +03:00
Sven Dowideit
87014c0328
Merge pull request #5307 from ostezer/docs-amend-notes-warnings
...
Mark notes and warnings, fix broken link renderings within.
2014-04-19 08:48:55 +10:00
O.S.Tezer
7935850005
Mark notes and warnings, fix broken link renderings within.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-18 23:31:38 +03:00
Victor Vieux
5b6b91aa2c
Merge pull request #5264 from unclejack/change_inode_map
...
change inode map to struct from bool
2014-04-18 11:48:23 -07:00
unclejack
2931979a5d
Merge pull request #5304 from vieux/convert_rm_tests
...
convert so rm tests to integration-cli
2014-04-18 21:11:18 +03:00
unclejack
c25704e31b
Merge pull request #5296 from crosbymichael/move-integration-tests
...
Move integration tests
2014-04-18 21:01:33 +03:00
Victor Vieux
fcbc717f9a
convert so rm tests to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-04-18 17:40:12 +00:00
unclejack
c2df189ea5
Merge pull request #5236 from crosbymichael/remove-ghost-networking
...
Remove ghost networking
2014-04-18 20:38:12 +03:00
shin-
720f344704
Added support for multiple endpoints in X-Docker-Endpoints header
...
Docker-DCO-1.1-Signed-off-by: Joffrey F <joffrey@docker.com > (github: shin-)
2014-04-18 17:42:54 +02:00
O.S. Tezer
3eea3e0714
Merge pull request #5298 from SvenDowideit/remove-auto-markdown-conversion
...
Merged.
2014-04-18 14:13:36 +03:00
Sven Dowideit
d4a00c7494
the markdown docs are now master, but I may do a manual conversion a few more times when older PR's are merged
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-18 16:34:53 +10:00
Michael Crosby
58e011595e
Remove worthless iptables test
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 03:22:53 +00:00
Michael Crosby
296fcf331f
Port privileged tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 03:20:17 +00:00
Michael Crosby
caad45d0ed
Port networking tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 03:12:27 +00:00
Michael Crosby
47510bd6eb
Port environment test
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 02:53:08 +00:00
Michael Crosby
e2ed4b9077
Port user tests and concurrent tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 02:47:39 +00:00
James Turnbull
6df19aa78e
Merge pull request #5275 from ostezer/docs-add-back-ga-code
...
Add back the GA code block.
2014-04-17 22:44:48 -04:00
Sven Dowideit
a0cfcbf648
Merge pull request #5274 from ostezer/docs-add-edit-on-github-link
...
Amendments providing the "Edit on GitHub" link for docs on master.
2014-04-18 12:43:24 +10:00
Sven Dowideit
81d9d92436
Merge pull request #5265 from ostezer/docs-fix-mobile-menu-click
...
Fix & improvements for mobile (& desktop) menu & submenu behaviour & issues.
2014-04-18 12:42:35 +10:00
James Turnbull
ac697e5f52
Merge pull request #5257 from ostezer/docs-fix-toc-click
...
Fix for TOC "click/expand" & "scroll position" problem on mobile.
2014-04-17 22:42:15 -04:00
Michael Crosby
03993eb534
Port volumes and exit code tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 02:34:10 +00:00
Michael Crosby
6beb858fb0
Update commit test in cli
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 02:24:19 +00:00
Michael Crosby
72f49e554f
Port multiple attach test to cli tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 02:14:00 +00:00
Michael Crosby
76a19bb3a9
Add test verify container ID
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 01:58:20 +00:00
Sven Dowideit
b84de10b85
Merge pull request #5292 from ostezer/docs-fix-mkdocs-yaaaayml-file
...
Make things awesomer by amending mkdocs.yml
2014-04-18 09:57:38 +10:00
O.S.Tezer
f3bf61fad4
Make things awesomer by amending mkdocs.yml
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-18 02:51:04 +03:00
Michael Crosby
eceeebc22d
Remove IsGhost checks around networking
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-17 23:49:59 +00:00
Sven Dowideit
6934f0fa9e
Merge pull request #5269 from ostezer/docs-improve-index-docs
...
Improve (&restructure) Docker Index docs on the Docker docs.
2014-04-18 09:25:54 +10:00
Sven Dowideit
fb2110b465
Merge pull request #5287 from jamtur01/tickets/5283
...
Fixed #5283 - literal leftover from cutover
2014-04-18 09:04:16 +10:00
Sven Dowideit
bb02624145
Merge pull request #5284 from jamtur01/tickets/5282
...
Fixed #5282 - deprecated -name syntax
2014-04-18 09:03:55 +10:00
James Turnbull
2f3cb370df
Fixed #5283 - literal leftover from cutover
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-04-17 18:58:02 -04:00
O.S. Tezer
ad8db1aa22
Merge pull request #5261 from ostezer/fix-inline-links
...
Fix for broken in-document links which got scrambled during conversion.
2014-04-18 01:49:18 +03:00
Sven Dowideit
f34383ac7e
Merge pull request #5260 from ostezer/docs-remove-manual-tocs
...
Remove manually written TOCs from archived docs.
2014-04-18 08:43:27 +10:00
James Turnbull
a75758fcf6
Fixed #5282 - deprecated -name syntax
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-04-17 18:43:06 -04:00
O.S.Tezer
baa4f39551
Add back the GA code block.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-18 01:42:23 +03:00
Victor Vieux
58595475ea
Merge pull request #5273 from alexlarsson/rename-runtime-to-daemon
...
Rename runtime/* to daemon/*
2014-04-17 14:56:43 -07:00
O.S.Tezer
05d7271f91
Amendments providing the "Edit on GitHub" link for docs on master.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-18 00:53:39 +03:00
Alexander Larsson
359b7df5d2
Rename runtime/* to daemon/*
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-17 14:43:01 -07:00
O.S.Tezer
cb6bcfd6bc
Improve (&restructure) Docker Index docs on the Docker docs.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-17 23:13:59 +03:00
O.S.Tezer
7f62f470f3
Fix & improvements for mobile (& desktop) menu & submenu behaviour & issues.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-17 20:35:08 +03:00
unclejack
d072f316e3
change inode map to struct from bool
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-04-17 20:08:14 +03:00
O.S.Tezer
1ff66d27b5
Fix for broken in-document links which got scrambled during conversion.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-17 18:09:08 +03:00
O.S.Tezer
24a42b1370
Remove manually written TOCs from archived docs.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-17 17:47:34 +03:00
O.S.Tezer
205e85da32
Fix for TOC "click/expand" & "scroll position" problem on mobile.
...
Fixes:
- Click/expand
- Scroll pos.
- TOC table scroll-down arrow.
- TOC title scrolls to top.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-17 15:48:03 +03:00
Sven Dowideit
57cbe8b106
Merge pull request #5230 from huslage/master
...
Replacing ASCII art image with real diagram
2014-04-17 12:47:48 +10:00
Michael Crosby
8e67197267
Merge pull request #5248 from unclejack/more_info_testtop
...
provide more information when TestTop tests fail
2014-04-16 18:54:04 -07:00
Sven Dowideit
65fb2e77eb
simplify the docs branch process for now
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-17 11:11:32 +10:00
Tianon Gravi
7de1557b2e
Add "validate" Makefile target
...
This was supposed to be part of my previous PR, but somehow got missed.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-16 18:56:02 -06:00
unclejack
3ac90aeed5
provide more information when TestTop tests fail
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-04-17 03:39:15 +03:00
Victor Vieux
925dfdb18a
Merge pull request #5246 from crosbymichael/fix-mount
...
Fix unmount when host volume is removed
2014-04-16 17:28:37 -07:00
Victor Vieux
ef114930cd
Merge pull request #5215 from danmcp/fix_typos
...
Fixing typos
2014-04-16 16:44:16 -07:00
unclejack
2d6f537bb3
Merge pull request #5234 from crosbymichael/refactor-container-start
...
Refactor container start
2014-04-17 02:20:35 +03:00
unclejack
66480d67fb
Merge pull request #5243 from creack/hairpin_nat_test
...
Add integration test for hairpin nat
2014-04-17 01:44:56 +03:00
O.S. Tezer
b92c86764a
Merge pull request #5245 from SvenDowideit/more-working-with
...
this topic nolonger crashes the build
2014-04-17 01:44:50 +03:00
Sven Dowideit
4ba7b28006
this topic nolonger crashes the build
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-17 08:43:07 +10:00
Sven Dowideit
f85d03327d
Merge pull request #5233 from ostezer/docs-fix-scroll-header-margin
...
Fix headers staying under the menu when clicked-to-scroll.
2014-04-17 08:40:55 +10:00
Sven Dowideit
2f3cccfcbd
Merge pull request #5231 from ostezer/fix-breadcrumbs
...
Amend breadcrumbs to link to the section indexes, i.e., home/:section/
2014-04-17 08:40:40 +10:00
Kato Kazuyoshi
92ea101bc4
SQLite is also available in FreeBSD
...
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-04-17 07:19:30 +09:00
Guillaume J. Charmes
1775ed8c75
Add integration test for hairpin nat
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-16 14:50:11 -07:00
O.S.Tezer
882862b095
Fix headers staying under the menu when clicked-to-scroll.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-16 19:38:08 +03:00
Kato Kazuyoshi
e1e512e2da
This permission should be interpreted as octal, not decimal
...
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-04-17 00:48:27 +09:00
Aaron Huslage
75d97a4d2f
Replacing ASCII art image with real diagram
...
Docker-DCO-1.1-Signed-off-by: Aaron Huslage <huslage@gmail.com > (github: huslage)
2014-04-16 11:24:07 -04:00
O.S.Tezer
b74fa75872
Amend breadcrumbs to link to the section indexes, i.e., home/section/
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-16 18:20:29 +03:00
O.S. Tezer
24c4c3e0e9
Merge pull request #5227 from SvenDowideit/fix-conversion-urls-securityblog
...
rst->md conversion fix
2014-04-16 13:11:29 +03:00
Sven Dowideit
ce7d251d52
rst->md conversion fix
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-16 14:43:52 +10:00
Solomon Hykes
9b6c40cf69
Merge pull request #5204 from ostezer/new-maintainer
...
Adding myself to the MAINTAINERS
2014-04-15 21:19:39 -07:00
Tianon Gravi
2e78ab91ec
Add missing "ps" requirement to PACKAGERS.md
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-15 21:55:48 -06:00
Sven Dowideit
8e35bb256d
Merge pull request #5224 from dhrp/tp-titles-colors
...
Changed heading colors and some alignments (no longer center and justification in left column)
2014-04-16 13:07:52 +10:00
Thatcher Peskens
4d3e448a33
Changed heading colors and some alignments (no longer center and justification in left column)
...
Docker-DCO-1.1-Signed-off-by: Thatcher Peskens <thatcher@docker.com > (github: dhrp)
2014-04-15 19:15:13 -07:00
Sven Dowideit
b9f66049fa
Merge pull request #5219 from dotcloud/master-doc-markdown
...
now, with shiney markdown
2014-04-16 11:05:29 +10:00
Sven Dowideit
ac999a9cb2
now, with shiney markdown
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-16 11:04:14 +10:00
Sven Dowideit
a777ebcee6
move the documentation to markdown
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-04-16 11:04:01 +10:00
Sven Dowideit
ede9ea37c3
Merge pull request #5206 from SvenDowideit/stage-markdown
...
move the documentation to markdown
2014-04-16 10:08:57 +10:00
Sven Dowideit
936a03bfdd
move the documentation to markdown
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: )
2014-04-16 00:02:10 +00:00
Dan McPherson
dceea17805
Fixing typos
...
Docker-DCO-1.1-Signed-off-by: Dan McPherson <dmcphers@redhat.com > (github: danmcp)
2014-04-15 18:06:48 -04:00
O.S.Tezer
32d8b5da50
Adding myself to the MAINTAINERS file.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-16 00:33:14 +03:00
unclejack
80f6b01132
Merge pull request #5211 from crosbymichael/update-cgroup-defaults
...
Ignore not exist errors for joining default subsystems
2014-04-15 22:55:26 +03:00
Tianon Gravi
994b7eaeb7
Merge pull request #5201 from tianon/build-busybox
...
Fetch the "busybox" image source so we can build locally instead of pulling during the integration tests
2014-04-15 09:47:05 -06:00
Kato Kazuyoshi
3754fdd7ca
Support FreeBSD on pkg/mount
...
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-04-15 23:16:51 +09:00
Tianon Gravi
de167a7514
Merge pull request #5181 from uggedal/mkimage-alpine
...
contrib: mkimage script for alpine linux
2014-04-15 08:09:42 -06:00
unclejack
8b54e57fa8
Merge pull request #5202 from vieux/allow_dot_repo
...
Allow dot in repo name
2014-04-15 13:58:33 +03:00
Eivind Uggedal
6a2bdc6eb7
contrib: mkimage script for alpine linux
...
Docker-DCO-1.1-Signed-off-by: Eivind Uggedal <eivind@uggedal.com > (github: uggedal)
2014-04-15 07:59:42 +00:00
Victor Vieux
d61fce9af7
allow dot in repo name
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-04-14 23:15:38 +00:00
Kato Kazuyoshi
ca7a0e6d6e
FreeBSD's nullfs doesn't support file mount
...
FreeBSD doesn't have "bind" mount, but nullfs might be a similar feature.
However nullfs can mount only directories.
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-04-15 05:40:23 +09:00
Kato Kazuyoshi
a7e181c857
Add a test for mount.GetMounts
...
Because mount.parseInfoFile is only available on Linux
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-04-15 05:40:23 +09:00
Tianon Gravi
7bb72fa080
Fetch the "busybox" image source so we can build locally instead of pulling during the integration tests
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-14 13:35:54 -06:00
Guillaume J. Charmes
e5ad715e59
Merge pull request #5158 from vieux/refactor_build_only_configFile
...
refactor build job to know only configFile
2014-04-14 10:59:48 -07:00
Guillaume J. Charmes
19ffc5e92f
Merge pull request #5075 from tianon/update-check-config
...
Update check-config.sh with more kernel configs and more reliable cgroup hierarchy/subsystem check
2014-04-14 10:58:00 -07:00
Victor Vieux
5fc1b4d2cd
Merge pull request #5132 from crosbymichael/fix-cgroup-hiar
...
Setup cgroups for supported subsystems
2014-04-14 10:56:15 -07:00
Guillaume J. Charmes
f98ed28c1d
Merge pull request #4878 from kzys/freebsd-utimes
...
Support FreeBSD on pkg/system/utimes_*.go
2014-04-14 10:39:25 -07:00
Michael Crosby
413190e159
Merge pull request #5172 from pnasrat/5166-large-image-graph-restore
...
Enable construction of TruncIndex from id array.
2014-04-14 10:31:16 -07:00
Victor Vieux
e9c3e39743
rename configFile to auth in the job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-04-14 17:15:22 +00:00
unclejack
0037dee02c
Merge pull request #5160 from kzys/fs-symlink
...
Fix utils.FollowSymlinkInScope's infinite loops bug
2014-04-14 20:12:39 +03:00
O.S. Tezer
b255d96694
Merge pull request #4828 from almoehi/patch-1
...
Added reactive-docker to list of remote API clients
2014-04-14 19:06:59 +03:00
Michael Crosby
39103e72a3
Fix unmount when host volume is removed
...
Fixes #5244
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-14 12:43:01 +00:00
Michael Crosby
9bd7d09871
Remove ArgsAsString because its a util function
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-14 07:08:54 +00:00
Michael Crosby
35a88f2c29
Fix resolvconf logic
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-14 06:58:04 +00:00
Michael Crosby
71b241cbfe
Remove container.When method
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-14 06:54:40 +00:00
Michael Crosby
c99ba05c84
Refactor container start to make it more manageable
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-14 06:46:34 +00:00
Michael Crosby
f00ca72baa
Move network settings into separate file
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-14 06:15:31 +00:00
Michael Crosby
3061a6a2ab
Generate imports based on what is avaliable
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-14 05:22:45 +00:00
Paul Nasrat
84a76f2796
Add benchmark tests for TruncIndex.
...
Compare add vs new.
Some historical data in PR #5172 .
Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com > (github: pnasrat)
2014-04-13 22:36:15 -04:00
Michael Crosby
184728e7bc
Ignore not exist errors for joining default subsystems
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-14 00:07:48 +00:00
Michael Crosby
6c26a87901
Ignore is not exist error
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-14 00:03:35 +00:00
Michael Crosby
052cc5a637
Move apparmor to top level pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-13 23:33:25 +00:00
Michael Crosby
5f4bc4f916
Use apparmor_parser directly
...
The current load script does alot of things. If it does not find the
parser loaded on the system it will just exit 0 and not load the
profile. We think it should fail loudly if it cannot load the profile
and apparmor is enabled on the system.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-13 23:31:10 +00:00
Tianon Gravi
2d20c92d29
Merge pull request #5176 from unclejack/check_before_pulling
...
cli integ: don't fetch busybox if it exists
2014-04-13 09:28:30 -06:00
unclejack
449f92f11e
cli integ: don't fetch busybox if it exists
...
Don't make calls to the registry if the image exists already.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-04-13 15:06:15 +03:00
O.S. Tezer
370b935b49
Merge pull request #5177 from jbbarth/docs-add-common-errors-for-test-suite
...
Docs: add some example log lines that indicate a lack of memory when running the test suite
2014-04-12 21:03:24 +03:00
O.S. Tezer
1f7e97e951
Merge pull request #5178 from jbbarth/docs-improve-ubuntulinux-accounting-section
...
Docs: improve installation/ubuntulinux memory and swap accounting section
2014-04-12 20:32:26 +03:00
Jean-Baptiste Barth
0a0e49d406
Docs: improve installation/ubuntulinux memory and swap accounting section
...
Docker-DCO-1.1-Signed-off-by: Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com > (github: jbbarth)
2014-04-12 10:57:19 +00:00
Jean-Baptiste Barth
26845ef1ae
Docs: add some example log lines that indicate a lack of memory when running the test suite
...
Docker-DCO-1.1-Signed-off-by: Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com > (github: jbbarth)
2014-04-12 02:09:06 +00:00
Kato Kazuyoshi
0f72486346
Fix utils.FollowSymlinkInScope's infinite loop bug
...
fs_test.go doesn't finish if Docker's code is placed under a directory
which has symlinks between / and the directory.
For example, the below doesn't finish before the change.
/home -> usr/home
FollowSymlinkInScope("/home/bob/foo/bar", "/home/bob/foo")
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-04-12 07:37:18 +09:00
Kato Kazuyoshi
e3e078ca2f
Add the test to reproduce the issue even in "make test"
...
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-04-12 07:37:17 +09:00
Paul Nasrat
4f169c2db5
Enable construction of TruncIndex from id array.
...
Fixes #5166
Current graph.restore is essentially O(n^2 log n) due to how
suffixarray creation works.
Rather than create/append/create new this supports creation from a seed
array of ids.
Functional testing shows this eliminates the hang on Creating image
graph reported on list.
Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com > (github: pnasrat)
2014-04-11 16:39:58 -04:00
Alexander Larsson
4ddfffcab3
Join memory and cpu cgroup in systemd too
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: crosbymichael)
2014-04-11 17:29:40 +00:00
Michael Crosby
505184d2dc
Join cpuacct, freezer, perf_event, and blkio groups
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-11 17:28:27 +00:00
Michael Crosby
031fcb31d3
Setup cgroups for all subsystems
...
Fixes #5117
Fixes #5118
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-11 17:28:27 +00:00
James Turnbull
931f065560
Merge pull request #5164 from jsimonelis/patch-2
...
terms update: FQIN must include a tag
2014-04-11 06:47:28 -07:00
Justin Simonelis
69fbf8e31f
terms update: FQIN must include a tag
...
change: A fully qualified image name must include a tag.
Recommitting changes for PR: https://github.com/dotcloud/docker/pull/5145
since SvenDowideit suggested I would need to sign my commit for it to be accepted.
Docker-DCO-1.1-Signed-off-by: Justin Simonelis <justin.p.simonelis@gmail.com > (github: jsimonelis)
2014-04-11 08:51:50 -04:00
Victor Vieux
b9731bccf2
refactor build job to know only configFile
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-04-10 22:29:03 +00:00
Tianon Gravi
28e7e81479
Merge pull request #5072 from tianon/hack-set-e-consistently
...
Update bundlescripts to use "set -e" consistently
2014-04-10 13:37:36 -06:00
Tianon Gravi
feae37c171
Merge pull request #5071 from tianon/minor-man-formatting-consistency
...
Fix a few minor man formatting consistency issues
2014-04-10 13:13:37 -06:00
Victor Vieux
f66082a443
Merge pull request #5093 from danielnorberg/do-not-create-bridge
...
net: do not create -b/--bridge specified bridge
2014-04-10 11:17:02 -07:00
Victor Vieux
bcc3857fa0
Merge pull request #4990 from vbatts/vbatts-server_show_info
...
docker daemon: show info about the server
2014-04-10 11:14:09 -07:00
Victor Vieux
b8c10d8af2
Merge pull request #5143 from kzys/ns-nil
...
Avoid "invalid memory address or nil pointer dereference" panic
2014-04-10 11:07:35 -07:00
O.S. Tezer
a521388863
Merge pull request #4821 from jimenez/3903-add_event_end_timestamp-feature
...
Adding timestamp end to events endpoint. Modifying api docs.
2014-04-10 20:54:53 +03:00
Victor Vieux
897bf5439d
Merge pull request #5140 from unclejack/build_immediate_cleanup
...
delete containers during build after every step
2014-04-10 10:49:13 -07:00
Isabel Jimenez
66dd4ea4e2
Adding timestamp end to events endpoint. Modifying api docs.
...
Docker-DCO-1.1-Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com > (github: jimenez)
2014-04-10 10:43:21 -07:00
Daniel Norberg
d4746d3ea0
bridge driver: clean up error returns
...
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com > (github: danielnorberg)
2014-04-10 11:26:48 -04:00
Daniel Norberg
336199a877
net: do not create -b/--bridge specified bridge
...
If the bridge specified using -b/--bridge doesn't
exist, fail instead of attempting to create it.
This is consistent with the docker documentation
on -b/--bridge: "Attach containers to a pre
existing network bridge".
It is also less surprising in an environment where
the operator expected the bridge to be properly
set up before docker starts and expects docker to
fail fast if the bridge was not up instead of
masking this error and coming up in some
potentially broken state.
With this patch, docker still creates docker0 if
needed and no bridge was explicitly specified.
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com > (github: danielnorberg)
2014-04-10 11:11:17 -04:00
Guillaume J. Charmes
7dd9c208fd
Merge pull request #5069 from tianon/hack-make-ubuntu-man
...
Add contrib/man to our generated deb
2014-04-10 08:04:04 -07:00
Guillaume J. Charmes
4a88e111d0
Merge pull request #5087 from vbatts/vbatts-save_permissions
...
docker save: fix filemode permissions
2014-04-10 08:00:37 -07:00
Guillaume J. Charmes
042a50a8fe
Merge pull request #5131 from crosbymichael/shm-mode
...
Change shm mode to 1777
2014-04-10 07:50:32 -07:00
Guillaume J. Charmes
5b242c95da
Merge pull request #5115 from alexlarsson/fix-libcontainer-network-rhel6
...
Fix libcontainer network support on rhel6
2014-04-10 07:45:12 -07:00
Guillaume J. Charmes
ec9190cdd2
Merge pull request #5133 from crosbymichael/revert-hairpin
...
Revert "Support hairpin NAT without going through docker server"
2014-04-10 07:06:35 -07:00
James Turnbull
49e87d1932
Merge pull request #5050 from SvenDowideit/add-some-words-to-cli
...
add some more text to the cli docs
2014-04-10 07:05:19 -07:00
James Turnbull
0bc479c48b
Merge pull request #5109 from jonathanpa/master
...
Update mac.rst to add homebrew instructions.
2014-04-10 06:42:54 -07:00
Kato Kazuyoshi
c5226d94fa
Avoid "invalid memory address or nil pointer dereference" panic
...
libcontainer.GetNamespace returns nil on FreeBSD because
libcontainer.namespaceList is empty. In this case, Namespaces#Get should
return nil instead of being panic.
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-04-10 22:07:29 +09:00
Sven Dowideit
e625cee28d
add some more text to the cli docs
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-10 12:52:46 +00:00
unclejack
7931be5cba
delete containers during build after every step
...
This commit changes the way docker build cleans up containers.
Containers get cleaned up right away after they've been committed and
they've become an image.
When the build fails, only the last container of the failing step is
left behind.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-04-10 14:46:42 +03:00
Jonathan Pares
057d347eaf
Update mac.rst to add homebrew instructions.
...
Explain how to install boot2docker and docker by using homebrew.
Docker-DCO-1.1-Signed-off-by: Jonathan Pares <jonathanpa@users.noreply.github.com > (github: jonathanpa)
2014-04-10 09:48:36 +02:00
Michael Crosby
14e1a2345d
Merge pull request #5134 from tianon/fix-mtab-symlink-error
...
Fix spurious mtab symlink error when /etc doesn't exist yet
2014-04-09 17:54:29 -07:00
Victor Vieux
8d25eef5ef
Merge pull request #5127 from crosbymichael/update-apparmor
...
Check for apparmor enabled on host to populate profile
2014-04-09 17:04:13 -07:00
Kato Kazuyoshi
1c90a4dd9a
Support FreeBSD on pkg/system/utimes_*.go
...
Implement system.LUtimesNano and system.UtimesNano. The latter might be
removed in future because it's basically same as os.Chtimes. That's why
the test is mainly focusing LUtimesNano.
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-04-10 07:34:37 +09:00
Kato Kazuyoshi
66baf56601
Unlike GNU find, FreeBSD's find needs a path before an expression
...
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-04-10 07:13:41 +09:00
Kato Kazuyoshi
18bea2495d
Use LLVM Clang explicitly on FreeBSD
...
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-04-10 07:13:41 +09:00
Tianon Gravi
b298960aed
Update bundlescripts to use "set -e" consistently
...
"set -e" is already inherited here from make.sh, but explicit is always better than implicit (hence the "set -e" in the first place!)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-09 12:11:06 -06:00
Victor Vieux
7c37cae17d
Merge pull request #5102 from shykes/api-cleanup-tests
...
Make remote API unit tests easier to read and write
2014-04-09 10:27:03 -07:00
Tianon Gravi
3d9cd1e5f1
Fix spurious mtab symlink error when /etc doesn't exist yet
...
symlink /proc/mounts /var/lib/docker/btrfs/subvolumes/1763d6602b8b871f0a79754f1cb0a31b3928bb95de5232b1b8c15c60fa1017f6-init/etc/mtab: no such file or directory
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-09 11:13:54 -06:00
James Turnbull
407b11c26b
Merge pull request #5104 from crosbymichael/update-dns-vf-docs
...
Update dns and volumes-from docs
2014-04-09 06:55:52 -07:00
Alexander Larsson
59c1b2880b
Fix libcontainer network support on rhel6
...
It seems that netlink in older kernels, including RHEL6, does not
support RTM_SETLINK with IFLA_MASTER. It just silently ignores it, reporting
no error, causing netlink.NetworkSetMaster() to not do anything yet
return no error.
We fix this by introducing and using AddToBridge() in a very similar manner
to CreateBridge(), which use the old ioctls directly.
This fixes https://github.com/dotcloud/docker/issues/4668
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-09 15:44:18 +02:00
Michael Crosby
63c303eecd
Revert "Support hairpin NAT without going through docker server"
...
This reverts commit b39d02b611michael@crosbymichael.com > (github: crosbymichael)
2014-04-09 11:55:08 +00:00
Michael Crosby
986cf931c3
Change shm mode to 1777
...
Fixes #5126
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-09 10:53:32 +00:00
Michael Crosby
87f0d63fb2
Check for apparmor enabled on host to populate profile
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-09 10:22:17 +00:00
Michael Crosby
a43a600a2c
Update dns and volumes-from docs
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-08 19:17:30 -07:00
Tianon Gravi
566d49c9ca
Merge pull request #5022 from tianon/make-validate
...
Add "make validate" for both local and CI gofmt and DCO verification
2014-04-08 19:17:30 -06:00
Solomon Hykes
1e6f21dc9e
Make remote API unit tests easier to read and write
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-08 18:14:47 -07:00
Guillaume J. Charmes
b602d6ca40
Merge pull request #5101 from unclejack/merge_release_v0.10.0
...
Merge release v0.10.0
2014-04-08 16:09:47 -07:00
unclejack
e8aa24c71a
Change version to v0.10.0
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-04-09 02:02:19 +03:00
unclejack
e128a606e3
Merge pull request #5079 from unclejack/bump_v0.10.0
...
Bump version to v0.10.0
2014-04-09 01:56:01 +03:00
unclejack
dc9c28f51d
Bump version to v0.10.0
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-04-09 00:49:33 +03:00
Victor Vieux
5fbc47f253
Merge pull request #5090 from crosbymichael/remove-vf
...
Remove volumesfrom from the config
2014-04-08 14:46:07 -07:00
Michael Crosby
b4f2821e6d
Make volumes-from a slice instead of string split
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-08 21:45:06 +00:00
Michael Crosby
af9746412b
Move volumesfrom to hostconfig
...
This also migrates the volumes from integration tests into the new cli
integration test framework.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-08 21:45:06 +00:00
Guillaume J. Charmes
a10c17ad11
Merge pull request #5095 from crosbymichael/remove-ghost-test
...
Remove restart ghost test
2014-04-08 14:40:42 -07:00
Michael Crosby
9839688db3
Merge pull request #5089 from creack/replace_existing_docker_apparmor_profile
...
Backup current docker apparmor profile and replace it with the new one
2014-04-08 14:36:11 -07:00
Solomon Hykes
b28ef0e984
Merge pull request #5096 from vieux/remove_double_warning
...
remove double deprecation warning
2014-04-08 14:23:11 -07:00
Victor Vieux
9260c06f7a
remove double deprecation warning
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-04-08 20:58:19 +00:00
Michael Crosby
77a04357a1
Remove restart ghost test
...
We do not allow ghosts anymore and this test does not add any value
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-08 20:56:30 +00:00
Solomon Hykes
795d6b8b15
Merge pull request #5066 from crosbymichael/remove-dns-conf
...
Move DNS options to hostconfig
2014-04-08 13:44:26 -07:00
Michael Crosby
00e080fef6
Merge pull request #5088 from shykes/deprecate-commit-run
...
Early deprecation warning for 'docker commit --run'
2014-04-08 12:32:11 -07:00
Tianon Gravi
c6046b40f0
Merge pull request #5091 from jamtur01/fedora_install
...
Add Fedora installation to install.sh
2014-04-08 13:15:00 -06:00
Solomon Hykes
168f8aba74
Early deprecation warning for 'docker commit --run'
...
Warn users of the planned deprecation of 'docker commit --run', and hide
it from the docs and usage message. The option continues to work.
Note that an alternative to 'commit --run' is being implemented but is
not yet available. We are printing the warning anyway because on
the basis that it never hurts to give more advance warning.
The 'commit --run' flag is a leftover from the very early days of Docker,
and has several problems:
1) It is very user unfriendly. You have to pass a literal json dict
which is poorly documented and changes regularly (see PortSpecs vs
ExposedPorts). The merge behavior is not clear and also changes
regularly. it's not possible to unset a value.
2) It overlaps with the Dockerfile syntax. There are 2 ways to set
a default command, expose a port or change an env variable. Some
things can be done in a Dockerfile but not in --run. Some things
can be done in --run but not in a Dockerfile. It would be better
to push a single syntax, allow using it both in a file and via
the command line, and make improvements in a single place.
3) It exposes data structures which should not be publicly exposed.
There are several planned improvements to Docker which require moving
around the content and schema of the various Config, Image and Container
structures. The less of those we expose in public interfaces, the easier
it is to move things around without a reverse compatibility nightmare.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-08 12:10:47 -07:00
James Turnbull
a2aa902ec1
Removed extra whitespace
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-04-08 12:07:27 -07:00
James Turnbull
fa5223dab5
Added Fedora installation method
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-04-08 12:07:16 -07:00
Tianon Gravi
2204a27df0
Merge pull request #5073 from tianon/update-release-bundles
...
Update RELEASE_BUNDLES to include integration tests
2014-04-08 13:05:00 -06:00
Tianon Gravi
cc1328d376
Merge pull request #5076 from tianon/update-hack-make-test-integration-cli
...
Update test-integration-cli bundlescript for consistency with other bundlescripts and slightly more verbose logging of which commands were executed
2014-04-08 12:59:08 -06:00
Victor Vieux
29fd62f396
Merge pull request #5083 from shin-/4343-http_401_private_push_error
...
Added specific error message when hitting 401 over HTTP on push
2014-04-08 11:19:17 -07:00
Guillaume J. Charmes
4f828d67f0
Backup current docker apparmor profile and replace it with the new one
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-08 11:09:31 -07:00
Michael Crosby
a056a9ca22
Merge pull request #5085 from tianon/more-readable-crossplatforms-list
...
Update DOCKER_CROSSPLATFORMS to be more readable
2014-04-08 11:08:57 -07:00
unclejack
1bcb9ce69e
Merge pull request #5068 from tianon/fix-abs-volume-check
...
Fix edge case in bind mount absolute path detection
2014-04-08 20:03:52 +03:00
Vincent Batts
0a6d42e208
docker save: fix filemode permissions
...
currently the files created are not readable. This makes the files and
directories permissions more sane.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-04-08 12:39:25 -04:00
Tianon Gravi
cf655ca98d
Update DOCKER_CROSSPLATFORMS to be more readable
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-08 09:42:47 -06:00
shin-
8b2bcd9a4b
Added specific error message when hitting 401 over HTTP on push
...
Docker-DCO-1.1-Signed-off-by: Joffrey F <joffrey@docker.com > (github: shin-)
2014-04-08 17:07:29 +02:00
almoehi
a67f350442
Added reactive-docker to list of remote API clients
...
Docker-DCO-1.1-Signed-off-by: H. Rapp <webmaster@3kolor.com > (github: almoehi)
2014-04-08 11:47:15 +02:00
Tianon Gravi
4c3eb7db67
Update test-integration-cli bundlescript for consistency with other bundlescripts and slightly more verbose logging of which commands were executed
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-07 23:10:40 -06:00
Tianon Gravi
5737c2eb98
Update check-config.sh with more kernel configs and more reliable cgroup hierarchy/subsystem check
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-07 22:53:42 -06:00
Guillaume J. Charmes
8cfbc44661
Merge pull request #5049 from Supermathie/aa-fix
...
apparmor: docker-default: Include base abstraction
2014-04-07 21:34:01 -07:00
James Turnbull
fdfd4530fc
Merge pull request #5074 from SvenDowideit/simplify-builder-headings
...
use the docs sidebar to be the TOC means that level 2 headings are the most important
2014-04-07 21:28:02 -07:00
Sven Dowideit
e6a64af966
use the docs sidebar to be the TOC means that level 2 headings are the most important
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-08 14:25:57 +10:00
Tianon Gravi
886eb85dec
Update RELEASE_BUNDLES to include integration tests
...
Previously, running just "hack/release.sh" only ran the unit tests. This updates that to run the unit tests, then the integration tests, then build the binaries, then run the cli integration tests (so we're literally testing the binary we're about to release, which is super freaking cool IMO <3).
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-07 22:22:03 -06:00
Tianon Gravi
7908725e3f
Fix a few minor man formatting consistency issues
...
Some flags ended with a colon, some didn't. For man pages, the prevailing normal practice is not to end the flags lines with colons.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-07 21:38:30 -06:00
Tianon Gravi
ab248675aa
Add contrib/man to our generated deb
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-07 21:32:17 -06:00
Tianon Gravi
603088be92
Fix edge case in bind mount absolute path detection
...
`filepath.Abs` does more than just `filepath.IsAbs` - namely, `filepath.Clean`, which resolves things like `.../.` or `.../../...`, and causes even an absolute path like `/some/path/../absolute` to fail (or, in my case, `/path/to/docker/.`)
Just using `filepath.IsAbs` directly is a much cheaper check, too. :)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-07 21:20:03 -06:00
O.S. Tezer
be3a5a2e37
Merge pull request #5029 from ipbabble/manpages
...
Added man pages for several docker commands.
2014-04-08 05:51:20 +03:00
Guillaume J. Charmes
1d2126be6c
Merge pull request #5025 from dstine/readme-fix
...
fixed two readme typos
2014-04-07 19:31:16 -07:00
Michael Crosby
919dbbe44d
Move DNS options to hostconfig
...
The local resolver warning needed to be moved at daemon start because it
was only show for the first container started anyways before having a
default value set.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-07 19:12:22 -07:00
Dan Stine
9c4d10b9a9
fixed three more typos
2014-04-07 22:09:15 -04:00
Michael Crosby
6bf7104271
Merge pull request #5064 from crosbymichael/remount-bind-mount
...
Ensure that ro mounts are remounted
2014-04-07 19:04:25 -07:00
Sven Dowideit
02c5a87b40
Merge pull request #4997 from jpetazzo/apt-should-always-use-https
...
Use https://get.docker.io/ubuntu consistently
2014-04-08 11:24:07 +10:00
Michael Crosby
b6042f252d
Ensure that ro mounts are remounted
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-07 18:23:22 -07:00
William Henry
da8231a26b
Added man pages for several docker commands.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
new file: contrib/man/man1/docker-attach.1
new file: contrib/man/man1/docker-build.1
new file: contrib/man/man1/docker-images.1
new file: contrib/man/man1/docker-info.1
new file: contrib/man/man1/docker-inspect.1
new file: contrib/man/man1/docker-rm.1
new file: contrib/man/man1/docker-rmi.1
new file: contrib/man/man1/docker-run.1
new file: contrib/man/man1/docker-tag.1
new file: contrib/man/man1/docker.1
2014-04-07 19:15:28 -06:00
Sven Dowideit
6e0d8ce8c3
Merge pull request #4715 from sebsto/patch-1
...
Include instruction for AMI 2014.03
2014-04-08 11:02:54 +10:00
Victor Vieux
8c3eb900de
Merge pull request #5058 from crosbymichael/remove-opts
...
Remove -o cli flag and DriverConfig from HostConfig
2014-04-07 16:45:54 -07:00
Michael Crosby
028d44d126
Remove and unexport selinux functions
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-07 14:59:44 -07:00
Michael Crosby
82f37b874e
Ensure that selinux is disabled by default
...
This also includes some portability changes so that the package can be
imported with the top level runtime.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-07 14:44:53 -07:00
Michael Crosby
aaf018017c
Add more label checks for selinux enabled
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-07 14:44:53 -07:00
Michael Crosby
b1e98e06dc
Remove selinux build tag
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-07 14:44:52 -07:00
Michael Crosby
ffebcb660f
Move -o cli flag and DriverConfig from HostConfig
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-07 14:44:52 -07:00
Solomon Hykes
ea2fba5ce0
Engine: optional Logging field to disable custom logging in engine.
...
* The default behavior is preserved
* This disables the use of the `TEST` environment variable in engine.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-07 21:41:25 +00:00
unclejack
d8fc3eecf5
Merge pull request #5010 from shykes/cli-tests
...
Convert a legacy integration test to a clean v2 CLI integration test.
2014-04-08 00:34:58 +03:00
Solomon Hykes
30f22ee9e3
Convert a legacy integration test to a clean v2 CLI integration test.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-07 20:34:21 +00:00
unclejack
902f88ea15
Merge pull request #5057 from crosbymichael/refactor-runtime-create
...
Refactor runtime create and history
2014-04-07 23:24:46 +03:00
Michael Crosby
1277885420
Clean runtime create and make it simple
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-07 12:20:23 -07:00
James Turnbull
7fddec4a65
Merge pull request #4764 from SvenDowideit/use-docker-tgz
...
Use docker tgz file to download on OSX
2014-04-07 11:54:27 -07:00
Jérôme Petazzoni
dc7fefc16b
Use https://get.docker.io/ubuntu consistently
...
The install script (on https://get.docker.io/ ) installs an APT sources.list
entry referencing an HTTPS repository, and takes care of installing the
apt-transport-https package. However, the Debian/Ubuntu specific installation
script (on https://get.docker.io/ubuntu ) used an HTTPS repository but without
installing that package, causing the installation to fail on some platforms.
This will use HTTPS everywhere, and updates the documentation accordingly.
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com > (github: jpetazzo)
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com > (github: jpetazzo)
2014-04-07 11:32:12 -07:00
Michael Crosby
c987aa09d8
Move history to separate file
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-07 11:01:35 -07:00
Victor Vieux
2fde8dfb83
Merge pull request #5040 from crosbymichael/remove-context-from-config
...
Remove context from config
2014-04-07 10:48:15 -07:00
Victor Vieux
73a22fc6b3
Merge pull request #5039 from kzys/freebsd-timestamp
...
Don't assume the file system has sub-second precision timestamp
2014-04-07 10:28:22 -07:00
unclejack
2f292a97de
Merge pull request #5038 from kzys/remove-archive-stat
...
Remove archive/stat_unsupported.go because it is not used
2014-04-07 19:50:31 +03:00
unclejack
1a3eb4967b
Merge pull request #5051 from SvenDowideit/build-rm-help
...
intermediate image layers are used for more than the build
2014-04-07 18:59:41 +03:00
Sven Dowideit
87ea27e80b
intermediate image layers are used for more than the build
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-07 18:37:52 +10:00
Michael Brown
726206f2aa
apparmor: pull in variables from tunables/global
...
The variables that were defined at the top of the apparmor profile are best
pulled in via the <tunables/global> include.
Docker-DCO-1.1-Signed-off-by: Michael Brown <michael.brown@discourse.org > (github: Supermathie)
2014-04-07 03:04:27 -04:00
Michael Brown
320b3e0d21
apparmor: abstractions/base expects pid variable
...
Add 'pid' variable pointing to 'self' to allow parsing of profile to succeed
Docker-DCO-1.1-Signed-off-by: Michael Brown <michael.brown@discourse.org > (github: Supermathie)
2014-04-07 02:47:43 -04:00
Michael Brown
e35c23311f
apparmor: docker-default: Include base abstraction
...
Encountered problems on 14.04 relating to signals between container
processes being blocked by apparmor. The base abstraction contains
appropriate rules to allow this communication.
Docker-DCO-1.1-Signed-off-by: Michael Brown <michael.brown@discourse.org > (github: Supermathie)
2014-04-07 02:19:38 -04:00
Sven Dowideit
a4b4448009
Merge pull request #4799 from tianon/no-more-inotifywait
...
Remove the inotifywait hack from our upstart host-integration example
2014-04-06 08:34:50 +10:00
Kato Kazuyoshi
794b5de749
Don't assume the file system has sub-second precision timestamp
...
For example, FreeBSD doesn't have that
(see http://lists.freebsd.org/pipermail/freebsd-fs/2012-February/013677.html ).
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-04-05 10:30:37 +09:00
Kato Kazuyoshi
da8aa712d2
Remove archive/stat_unsupported.go because it is not used
...
LUtimesNano and all other functions were implemented on pkg/system after
d6114c0da0kato.kazuyoshi@gmail.com > (github: kzys)
2014-04-05 10:09:04 +09:00
Victor Vieux
36af2936af
Merge pull request #5031 from crosbymichael/revert-env
...
Revert env changes
2014-04-04 13:19:08 -07:00
unclejack
0fb76839ad
Merge pull request #5027 from unclejack/cli_integration_add_docker_options
...
Cli integration: add docker options & fix the wait at the end
2014-04-04 22:07:31 +03:00
Michael Crosby
07887f65de
Revert "remove hack in version"
...
This reverts commit b2b9334f27michael@crosbymichael.com > (github: crosbymichael)
2014-04-04 11:38:03 -07:00
Michael Crosby
4c6cf9e27f
Use setjson hack again for version
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-04 11:37:08 -07:00
Michael Crosby
95e6fd819b
Revert "engine: fix engine.Env.Encode() to stop auto-guessing types."
...
This reverts commit 76057addb2michael@crosbymichael.com > (github: crosbymichael)
2014-04-04 11:29:56 -07:00
Victor Vieux
a97305e4c0
Merge pull request #5008 from unclejack/sync_cli_integration_ops
...
cli integration: sync container & image deletion
2014-04-04 11:16:08 -07:00
unclejack
22152ccc47
cli integration: fix wait race
...
The wait at the end of cli integration script could end up failing if
the process had already exited. This was making it look like the tests
have failed.
This change fixes the problem.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-04-04 19:06:55 +03:00
unclejack
62b08f557d
cli integration: allow driver selection via vars
...
This makes it possible to choose the graphdriver and the execdriver
which is going to be used for the cli integration tests.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-04-04 19:03:07 +03:00
Dan Stine
bea71245c8
fixed two readme typos
2014-04-04 08:12:17 -04:00
Tianon Gravi
919fe7a3a1
Remove the old Travis-specific files that are no longer necessary
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-04 00:46:47 -06:00
Tianon Gravi
81370b5b0f
Add new validate-dco and validate-gofmt bundlescripts for DCO and gofmt validation
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-04 00:41:33 -06:00
Sven Dowideit
031e288075
Merge pull request #4996 from rajatpandit/patch-2
...
Update nodejs_web_app.rst
2014-04-04 14:41:32 +10:00
Sven Dowideit
b811ac523a
Merge pull request #4995 from rajatpandit/patch-1
...
Update nodejs_web_app.rst
2014-04-04 14:40:55 +10:00
unclejack
65eeb0fce0
Merge pull request #4968 from tianon/enhanced-check-config
...
Add more color and cgroupfs hierarchy verification to check-config.sh
2014-04-04 04:49:05 +03:00
unclejack
a255849129
Merge pull request #5002 from crosbymichael/rhatdan-selinux
...
Improve selinux label handling
2014-04-04 04:43:16 +03:00
unclejack
e09274476f
cli integration: sync container & image deletion
...
This makes container and image removal in the tests run synchronously.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-04-04 03:22:32 +03:00
Michael Crosby
09aa28eca0
Merge pull request #5005 from shykes/deprecate-insert
...
Deprecate 'docker insert'
2014-04-03 17:16:25 -07:00
Victor Vieux
468cb80c59
Merge pull request #5006 from vieux/remove_dirty_hack
...
remove hack in version
2014-04-03 17:09:56 -07:00
Victor Vieux
b2b9334f27
remove hack in version
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-04-04 00:08:51 +00:00
Victor Vieux
dbd1e304f5
Merge pull request #5004 from shykes/api-unit-tests
...
Replace integration tests with unit tests for the remote API
2014-04-03 17:06:05 -07:00
Victor Vieux
9f68b934d3
Merge pull request #5001 from shykes/deprecate-images-viz-tree
...
Deprecate 'docker images --tree' and 'docker images --viz'
2014-04-03 17:05:59 -07:00
Solomon Hykes
2cb560988b
api/server: convert TestGetInfo from an integration test to a unit test.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-04 00:02:44 +00:00
Solomon Hykes
76057addb2
engine: fix engine.Env.Encode() to stop auto-guessing types.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-03 23:53:42 +00:00
Solomon Hykes
c8f437aee0
api/server: replace an integration test with a unit test using engine mocking.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-03 23:53:39 +00:00
Solomon Hykes
615ac8feb2
Deprecate 'docker insert'
...
'docker insert' is an old command which predates 'docker build'. We no
longer recommend using it, it is not actively maintained, and can be
replaced with the combination of 'docker build' and 'ADD'.
This removes the command from usage and documentation, and prints a
warning when it is called.
The command still works but it will be removed in a future version.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-03 23:52:09 +00:00
Victor Vieux
a278656330
Merge pull request #4991 from ruphin/fix_name_typo
...
Fix typo in names-generator
2014-04-03 16:24:14 -07:00
Goffert van Gool
6cf1378601
Fix typo in names-generator
...
Docker-DCO-1.1-Signed-off-by: Goffert van Gool <ruphin@ruphin.net > (github: ruphin)
2014-04-04 00:57:43 +02:00
unclejack
55729ab4cb
Merge pull request #5000 from shykes/skip-login-tests
...
Skip login tests because of external dependency to a hosted service.
2014-04-04 01:11:09 +03:00
Michael Crosby
afc56e8d6d
Merge pull request #4993 from crosbymichael/remove-loopback-setup
...
Remove loopback setup for native driver
2014-04-03 15:09:09 -07:00
Solomon Hykes
7c3b955b90
Deprecate 'docker images --tree' and 'docker images --viz'
...
* The commands are no longer listed or documented.
* The commands still work but print a deprecation warning.
* The commands should be removed in a future version.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-03 22:03:23 +00:00
Solomon Hykes
887eeb2b02
Skip login tests because of external dependency to a hosted service.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-03 21:55:33 +00:00
Guillaume J. Charmes
9e29d65aad
Merge pull request #4994 from crosbymichael/remove-start-test
...
Remove racy test causing tests to stall
2014-04-03 14:49:35 -07:00
Rajat Pandit
32d6041cc3
Update nodejs_web_app.rst
2014-04-03 21:05:50 +01:00
Rajat Pandit
3c36f82f18
Update nodejs_web_app.rst
2014-04-03 20:54:57 +01:00
Victor Vieux
95d07b52b3
Merge pull request #4992 from crosbymichael/fix-mknod-test
...
Fix configuration test for MKNOD
2014-04-03 12:21:30 -07:00
Michael Crosby
5864a3ff77
Merge pull request #4980 from creack/update_signal_management
...
Return correct exit code upon signal + SIGQUIT now quits without cleanup
2014-04-03 11:58:19 -07:00
Kevin Wallace
e21607341c
Add myself to AUTHORS.
...
Docker-DCO-1.1-Signed-off-by: Kevin Wallace <kevin@pentabarf.net > (github: kevinwallace)
2014-04-03 18:44:13 +00:00
Kevin Wallace
c94111b619
Allow non-privileged containers to create device nodes.
...
Such nodes could already be created by importing a tarball to a container; now
they can be created from within the container itself.
This gives non-privileged containers the mknod kernel capability, and modifies
their cgroup settings to allow creation of *any* node, not just whitelisted
ones. Use of such nodes is still controlled by the existing cgroup whitelist.
Docker-DCO-1.1-Signed-off-by: Kevin Wallace <kevin@pentabarf.net > (github: kevinwallace)
2014-04-03 18:44:13 +00:00
Victor Vieux
5844920185
Merge pull request #4989 from alexlarsson/fix-volumes-from
...
Fix --volumes-from mount failure
2014-04-03 11:27:18 -07:00
Tianon Gravi
fee16d4216
Update contrib/check-config.sh cgroupfs check to allow for something like '... cgroup rw,cpu' (looking at you, boot2docker)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-03 11:52:19 -06:00
Tianon Gravi
9712f8127a
Update contrib/check-config.sh to use zcat and grep if zgrep isn't available
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-03 11:46:24 -06:00
Alexander Larsson
bd94f84ded
Fix --volumes-from mount failure
...
As explained in https://github.com/dotcloud/docker/issues/4979
--volumes-from fails with ENOFILE errors.
This is because the code tries to look at the "from" volume without
ensuring that it is mounted yet. We fix this by mounting the containers
before stating in it.
Also includes a regression test.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-03 19:33:20 +02:00
Guillaume J. Charmes
cd910cb685
Allow force sigint and allow sigquit after sigint
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-03 10:07:42 -07:00
Vincent Batts
cea43f8a2d
docker daemon: show info about the server
...
For combing through logs, have an intro line with information about the
running instance of the docker daemon.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-04-03 10:54:54 -04:00
James Turnbull
be882d989a
Merge pull request #4984 from michaelneale/master
...
explained what authConfig actually is
2014-04-03 09:20:24 -04:00
Sven Dowideit
cb824f4093
Merge pull request #4985 from drothlis/patch-1
...
docs: Fix typo in hello world example
2014-04-03 20:07:44 +10:00
Michael Neale
75633a0451
explained what authConfig actually is.
...
Docker-DCO-1.1-Signed-off-by: Michael Neale <michael.neale@gmail.com > (github: michaelneale)
2014-04-03 19:43:21 +11:00
David Röthlisberger
8c4617e0ae
docs: Fix typo in hello world example
2014-04-03 09:40:28 +01:00
Michael Crosby
8b450a93b8
Remove driver wide mount label for dm
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-03 06:34:57 +00:00
Michael Crosby
e2779e11db
Remove runtime options from config
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-03 04:40:38 +00:00
Sven Dowideit
24e8b1b834
Merge pull request #4924 from msabramo/move_installmirrors_anchor_in_docs
...
Move installmirrors anchor in doc
2014-04-03 12:48:01 +10:00
Sven Dowideit
e8cb65b3cc
Merge pull request #4972 from unclejack/document_a_flag
...
docs: explain what docker run -a does
2014-04-03 10:23:39 +10:00
Victor Vieux
9687c087ab
Merge pull request #4953 from rhatdan/selinux
...
These two patches should fix problems we see with running docker in the wild.
2014-04-02 16:36:41 -07:00
Michael Crosby
9cc7eb4ab3
Merge pull request #3971 from creack/fix_add_ownership
...
Change ownership to root for ADD file/directory
2014-04-02 12:22:09 -07:00
Tianon Gravi
8aa3dc681d
Merge pull request #4965 from tianon/update-makefile
...
Update Makefile with several improvements
2014-04-02 12:03:12 -06:00
unclejack
3e68d36485
Merge pull request #4951 from alexlarsson/dm-fix-deadlock
...
Fix AB-BA deadlock in devicemapper backend
2014-04-02 20:58:09 +03:00
unclejack
b5caa5053a
Merge pull request #4779 from vieux/symlink_mtab
...
symlink /etc/mtab and /proc/mounts
2014-04-02 20:57:04 +03:00
Michael Crosby
94233a204f
Fix lxc label handleing
...
This also improves the logic around formatting the labels for selinux
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-02 16:52:49 +00:00
Michael Crosby
6e7a93628b
Merge branch 'selinux' of https://github.com/rhatdan/docker into rhatdan-selinux
...
Conflicts:
pkg/selinux/selinux.go
runtime/execdriver/lxc/lxc_template.go
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-02 16:11:35 +00:00
Dan Walsh
ca4224762b
Fix SELinux issue with missing Contexts in lxc execdriver
...
There is a bug in the SELinux patch for the lxc execdriver, that
causes lxc containers to blow up whether or not SELinux is enabled.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-04-03 09:45:40 -04:00
Dan Walsh
d76ac4d429
In certain cases, setting the process label will not happen.
...
When the code attempts to set the ProcessLabel, it checks if SELinux Is
enabled. We have seen a case with some of our patches where the code
is fooled by the container to think that SELinux is not enabled. Calling
label.Init before setting up the rest of the container, tells the library that
SELinux is enabled and everything works fine.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-04-03 09:32:29 -04:00
Dan Walsh
32ad78b043
Remove hard coding of SELinux labels on systems without proper selinux policy.
...
If a system is configured for SELinux but does not know about docker or
containers, then we want the transitions of the policy to work. Hard coding
the labels causes docker to break on older Fedora and RHEL systems
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-04-03 09:32:29 -04:00
unclejack
63c7941172
docs: explain what docker run -a does
...
This adds a bit of documentation for the `-a` flag for docker run.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-04-02 16:23:01 +03:00
Michael Crosby
a9d6eef238
Remove racy test causing tests to stall
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-02 13:22:51 +00:00
Michael Crosby
18ef3cc24a
Remove loopback setup for native driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-02 13:12:52 +00:00
Michael Crosby
f80fd5da09
Fix configuration test for MKNOD
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-02 13:07:11 +00:00
James Turnbull
440562511e
Merge pull request #4966 from SvenDowideit/add-kernel-version-info
...
add RHEL6 kernel version, and a 3.8 hint to the binaries doc
2014-04-02 08:56:17 -04:00
Guillaume J. Charmes
3b3f4bf052
Return correct exit code upon signal + SIGQUIT now quits without cleanup
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-02 05:56:11 -07:00
Tianon Gravi
aec989bd08
Add more color and cgroupfs hierarchy verification to check-config.sh
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-02 02:44:12 -06:00
Tianon Gravi
506055d973
Merge pull request #4853 from pjz/bash_completion
...
Include completion scripts in ubuntu/debian package
2014-04-02 01:40:24 -06:00
Alexander Larsson
2ffef1b7eb
devmapper: Avoid AB-BA deadlock
...
We currently drop the global lock while holding a per-device lock when
waiting for device removal, and then we re-aquire it when the sleep is done.
This is causing a AB-BA deadlock if anyone at the same time tries to do any
operation on that device like this:
thread A: thread B
grabs global lock
grabs device lock
releases global lock
sleeps
grabs global lock
blocks on device lock
wakes up
blocks on global lock
To trigger this you can for instance do:
ID=`docker run -d fedora sleep 5`
cd /var/lib/docker/devicemapper/mnt/$ID
docker wait $ID
docker rm $ID &
docker rm $ID
The unmount will fail due to the mount being busy thus causing the
timeout and the second rm will then trigger the deadlock.
We fix this by adding a lock ordering such that the device locks
are always grabbed before the global lock. This is safe since the
device lookups now have a separate lock.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-02 09:05:00 +02:00
Alexander Larsson
70826e8b3f
devmapper: Add lock to protext Devices map
...
Currently access to the Devices map is serialized by the main
DeviceSet lock, but we need to access it outside that lock, so we
add a separate lock for this and grab that everywhere we modify
or read the map.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-02 09:05:00 +02:00
Alexander Larsson
e01b71cebe
devmapper: Add lookupDevice() helper
...
This centralizes the lookup of devices so it is only done in one place.
This will be needed later when we change the locking for it.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-02 09:05:00 +02:00
Alexander Larsson
74edcaf1e8
devmapper: Pass info rather than hash to setInitialized
...
We already have this at the caller, no need to look up again.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-02 09:05:00 +02:00
Alexander Larsson
5955846774
devmapper: Pass info rather than hash to deactivateDevice()
...
We already have the info in most cases, no need to look this up multiple times.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-02 09:05:00 +02:00
Alexander Larsson
8e39b35c7c
devmapper: Pass info rather than hash to deleteDevice
...
All the callers already have the info, no need for an extra lookup.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-02 09:05:00 +02:00
Alexander Larsson
e5394e35c7
devmapper: Pass info rather than hash to activateDeviceIfNeeded
...
There is no need to look this up again, we have it already in all callers.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-02 09:05:00 +02:00
Sven Dowideit
2b64453adb
add RHEL6 kernel version, and a 3.8 hint to the binaries doc
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-02 16:52:07 +10:00
Tianon Gravi
b51fe17833
Update Makefile with several improvements
...
Especially but not limited to:
- make BINDDIR= ... - for when you don't want a bind mount at all
- make DOCSPORT=9000 docs - for when you want a not-8000 docs port
- when we can't determine a branch name, we don't try to "docker build -t docker: ." anymore - we just "docker build -t docker ." (thus allowing Docker to assume ":latest")
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-01 22:43:38 -06:00
Victor Vieux
93bb208164
Merge pull request #4961 from creack/update_version_pkg
...
Update Version to not use string anymore
2014-04-01 18:37:25 -07:00
Michael Crosby
b4c8232b95
Merge pull request #4964 from creack/add_api_version
...
Add API version to `docker version`
2014-04-01 18:36:18 -07:00
Victor Vieux
d7ec39a4cf
<3
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-04-02 01:19:26 +00:00
Guillaume J. Charmes
b246fc33ae
Add API version to docker version
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-01 17:30:19 -07:00
Guillaume J. Charmes
8ff02d58d9
Merge pull request #4963 from tianon/check-config
...
Add basic initial "check-config" script to contrib
2014-04-01 16:51:32 -07:00
Victor Vieux
431046e0f5
Merge pull request #4902 from shykes/wozniak_is_not_boring
...
Steve Wozniak is not boring.
2014-04-01 16:49:56 -07:00
unclejack
ceed9382d0
Merge pull request #4931 from crosbymichael/gen-mac-addr-for-bridge
...
Set bridge mac addr on supported kernels
2014-04-02 02:47:56 +03:00
Tianon Gravi
9c0c4aeda4
Add basic initial "check-config" script to contrib
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-01 17:42:54 -06:00
Sven Dowideit
8cc8b1dd99
Merge pull request #4938 from jlhawn/master
...
No longer expose gravatar_email in docker.io api
2014-04-02 09:13:33 +10:00
unclejack
30ff3fa954
Merge pull request #4867 from crosbymichael/clean-shutdown
...
Cleanly shutdown docker
2014-04-02 01:48:03 +03:00
Guillaume J. Charmes
3ee37f547f
Update Version to not use string anymore
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-01 15:46:52 -07:00
Michael Crosby
9cf89f8542
Merge pull request #4942 from vieux/cleanup_dev_libcontainer
...
remove setupDev from libcontainer
2014-04-01 14:28:17 -07:00
Guillaume J. Charmes
026aebdebb
Change ownership to root for ADD file/directory
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-01 14:17:31 -07:00
Victor Vieux
79c0ca81fc
Merge pull request #4958 from crosbymichael/update-port-tests
...
Update test to reallocate port
2014-04-01 14:15:36 -07:00
Victor Vieux
dcf2b72f5b
add test
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-04-01 21:07:40 +00:00
Guillaume J. Charmes
7462cc6479
Merge pull request #4949 from tjmehta/4908-fix_dynamic_port_allocation_limit
...
Fix dynamic port allocation limit
2014-04-01 13:49:21 -07:00
Guillaume J. Charmes
b4b87413d8
Merge pull request #4833 from crosbymichael/pluginflag
...
Add opts flag for fine grained control over drivers
2014-04-01 13:34:08 -07:00
Michael Crosby
3178723341
Merge pull request #4956 from tianon/sig
...
Simplify the kill "SIG" prefix stripping code
2014-04-01 13:10:16 -07:00
Victor Vieux
e175a55eb9
Merge pull request #4948 from creack/push_single_tag
...
Allow push of a single tag
2014-04-01 12:54:15 -07:00
Tianon Gravi
4bf70317ed
Simplify the kill "SIG" prefix stripping code
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-01 13:33:46 -06:00
Michael Crosby
7ab66fa694
Merge pull request #4947 from tianon/sig
...
Allow "SIG" prefix on signal names in `docker kill` ("SIGKILL", etc)
2014-04-01 11:59:44 -07:00
Victor Vieux
b01c3a8b6c
Merge pull request #4945 from samalba/fix-checksum-layer
...
Fix checksum layer
2014-04-01 11:31:59 -07:00
Guillaume J. Charmes
b8d660d946
Update docs. Make PULL up to date, remove deprecated falg and update PUSH
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-01 11:17:54 -07:00
Victor Vieux
1aa976aca9
Merge pull request #4920 from discordianfish/we-need-more-women
...
Improve gender equality
2014-04-01 11:15:34 -07:00
Michael Crosby
249a5ddfeb
Merge pull request #4916 from creack/no_error_start_twice
...
Don't error when trying to start a running container
2014-04-01 10:45:31 -07:00
Dan Walsh
2224e0d65a
In certain cases, setting the process label will not happen.
...
When the code attempts to set the ProcessLabel, it checks if SELinux Is
enabled. We have seen a case with some of our patches where the code
is fooled by the container to think that SELinux is not enabled. Calling
label.Init before setting up the rest of the container, tells the library that
SELinux is enabled and everything works fine.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-04-01 13:30:10 -04:00
Dan Walsh
f9b8161c60
Remove hard coding of SELinux labels on systems without proper selinux policy.
...
If a system is configured for SELinux but does not know about docker or
containers, then we want the transitions of the policy to work. Hard coding
the labels causes docker to break on older Fedora and RHEL systems
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-04-01 13:29:54 -04:00
Guillaume J. Charmes
7a50f03fa6
Update test to be consistent
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-01 10:27:10 -07:00
Guillaume J. Charmes
cff5f0357e
Minor cleanup
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-01 10:27:05 -07:00
Guillaume J. Charmes
a03f83e337
Do not error when trying to start a started container
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-01 10:26:53 -07:00
Tianon Gravi
4cb602afa0
Allow "SIG" prefix on signal names in docker kill ("SIGKILL", etc)
...
This way, we can use both `docker kill -s INT some_container` and `docker kill -s SIGINT some_container` and both will do nice things for us. :)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-01 11:01:07 -06:00
Tianon Gravi
527bb5e960
Merge pull request #4904 from creack/make_dev
...
Add "BINDDIR" variable to facilitate having a shell with the full source tree bind-mounted
2014-04-01 10:19:56 -06:00
Guillaume J. Charmes
bd24eb07b6
Add $BINDIR to allow mounting the whole sources if needed (for development)
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-01 09:01:27 -07:00
Michael Crosby
ac9b06ae95
Update sig message
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-01 08:18:52 +00:00
Michael Crosby
6b7cfc9e95
Update test to reallocate port
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-01 07:27:34 +00:00
Michael Crosby
93779cc7fe
Send sigterm and wait forever
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-01 07:12:50 +00:00
Michael Crosby
e36d89b0f9
Ensure state is saved to disk after we kill the ghost
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-01 07:12:50 +00:00
Michael Crosby
283daced0c
Don't send prctl to be consistent with other drivers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-01 07:12:50 +00:00
Michael Crosby
5bb82f6313
Ensure a reliable way to kill ghost containers on reboot
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-01 07:11:41 +00:00
Michael Crosby
5b9069bd99
Add kill for other drivers on restart
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-01 07:11:41 +00:00
Michael Crosby
f067e26367
Ensure that all containers are stopped cleanly at shutdown
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-01 07:11:41 +00:00
Michael Crosby
40c6d00c97
Update imports to be consistent
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-01 07:07:42 +00:00
tjmehta
739d124480
make findNextPort circular, add all-ports-allocated error
...
Docker-DCO-1.1-Signed-off-by: Tejesh Mehta <tejesh.mehta@gmail.com > (github: tjmehta)
2014-03-31 22:21:52 -07:00
Guillaume J. Charmes
e648a186d6
Allow push of a single tag
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-31 18:50:10 -07:00
Sam Alba
de9fba7172
Payload checksum now match the checksum simple
...
Backported for backward compatibility.
Docker-DCO-1.1-Signed-off-by: Sam Alba <sam.alba@gmail.com > (github: samalba)
2014-03-31 18:31:15 -07:00
Sam Alba
3f0886c8c3
Inverted layer checksum and tarsum.
...
The checksum of the payload has to be computed on the Gzip'ed content.
Docker-DCO-1.1-Signed-off-by: Sam Alba <sam.alba@gmail.com > (github: samalba)
2014-03-31 17:56:25 -07:00
Victor Vieux
d52d24dd80
remove setupDev from libcontainer
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-04-01 00:28:44 +00:00
Michael Crosby
7a7f59210d
Ensure secound part of the key is provided
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-31 23:12:08 +00:00
Michael Crosby
4cdcea2047
Set bridge mac addr on supported kernels
...
Fixes #3200
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-31 22:56:23 +00:00
Josh Hawn
289377b409
No longer expose gravatar_email in docker.io api
...
Docker.io API has replaced the gravatar_email field with a
gravatar_url field instead.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2014-03-31 15:34:43 -07:00
Guillaume J. Charmes
f6f059d99a
Merge pull request #4929 from crosbymichael/volume-abs-path
...
Force abs paths for host volumes
2014-03-31 15:19:30 -07:00
Victor Vieux
07b60d626a
symlink /etc/mtab and /proc/mounts
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-31 21:15:03 +00:00
unclejack
e76113be6c
Merge pull request #4925 from creack/fix_logs
...
Fix expending buffer in StdCopy
2014-03-31 23:15:07 +03:00
unclejack
cd0a907325
Merge pull request #4930 from vieux/fix_regression_import
...
Fix regression import
2014-03-31 23:12:39 +03:00
Guillaume J. Charmes
5fb28eab3e
Add regression test
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-31 13:12:22 -07:00
Tianon Gravi
6ed2aa1db4
Merge pull request #4881 from barnybug/fish-completions
...
Update fish completions for docker 0.9.1
2014-03-31 13:57:00 -06:00
Victor Vieux
5b98b70f29
Merge pull request #4927 from crosbymichael/start-hang
...
Make sure to set error reguardless of attach or stdin
2014-03-31 12:56:38 -07:00
Victor Vieux
b430f4f45b
add test
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-31 19:31:21 +00:00
Victor Vieux
9709c31d1b
fix import display
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-31 19:21:57 +00:00
Victor Vieux
bce2464e5e
Merge pull request #4928 from unclejack/testscli-pull_busybox
...
integration-cli: pull busybox before running
2014-03-31 12:16:44 -07:00
Michael Crosby
904bf049c1
Force abs paths for host volumes
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-31 19:10:19 +00:00
unclejack
f7ae3a1381
integration-cli: pull busybox before running
...
Make sure the busybox image is ready to be used when running the cli
integration tests.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-03-31 22:07:23 +03:00
Michael Crosby
b45c1061bf
Merge pull request #4174 from vbatts/vbatts-env_file
...
support for `docker run` environment variables file
2014-03-31 12:01:14 -07:00
Marc Abramowitz
f163720228
Move installmirrors anchor in doc
...
so it's before "Mirrors" instead of "Docker and local DNS server
warnings"
Docker-DCO-1.1-Signed-off-by: Marc Abramowitz <msabramo@gmail.com > (github: msabramo)
2014-03-31 11:48:57 -07:00
Vincent Batts
500c8ba4b6
env-file: variable behavior
...
trim the front of variables. Error if there are other spaces present.
Leave the value alone.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-31 14:45:13 -04:00
Vincent Batts
ff4ac7441b
--env-file: simple line-delimited
...
match dock functionality, and not try to achieve shell-sourcing compatibility
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-31 14:45:13 -04:00
Vincent Batts
d9c257732e
env-file: remove the unneeded deprecation markup
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-31 14:45:13 -04:00
Vincent Batts
33dde1f728
env-file: update functionality and docs
...
Multiple flags allowed. Order prescribed. Examples provided. Multiline
accounted for.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-31 14:45:13 -04:00
Vincent Batts
acf5289ddd
make the --env-file accept multiple flags
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-31 14:45:13 -04:00
Vincent Batts
bcba5246f9
Fixing doc references to --env-file
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-31 14:44:32 -04:00
Vincent Batts
4e0014f582
go fmt
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-31 14:44:32 -04:00
Vincent Batts
586e6c5eb9
--env-file instead of --envfile
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-31 14:44:32 -04:00
Vincent Batts
bfaa917a96
pkg/opts: Close the file handle
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-31 14:44:32 -04:00
Vincent Batts
cd51ac92bd
support for docker run environment variables file
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-31 14:44:32 -04:00
Michael Crosby
51d9a04f17
Make sure to set error reguardless of attach or stdin
...
Fixes #3364
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-31 18:33:14 +00:00
unclejack
1805ef1ccc
Merge pull request #4901 from vieux/split_api_2_pkg
...
Split API into 2 go packages
2014-03-31 21:32:05 +03:00
Victor Vieux
7697aad7b0
apply Reduce error level form harmless errors
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-31 18:11:53 +00:00
Victor Vieux
185b040e49
fix tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-31 18:11:53 +00:00
Victor Vieux
ae9ed84fda
split client in 2 files
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-31 18:11:53 +00:00
Victor Vieux
a7365a6237
split API into 2 go packages
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-31 18:10:02 +00:00
unclejack
25f7b3fbb7
Merge pull request #4926 from tianon/add-cli-tests-to-default-bundles
...
Add "test-integration-cli" to our DEFAULT_BUNDLES list (make all)
2014-03-31 21:09:44 +03:00
unclejack
b936f4f5e1
Merge pull request #4752 from crosbymichael/fix-volumes-from-files
...
Allow volumes from to be individual files
2014-03-31 21:07:05 +03:00
Tianon Gravi
2543912e7b
Add "test-integration-cli" to our DEFAULT_BUNDLES list (make all)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-31 11:55:55 -06:00
Guillaume J. Charmes
e4aaacc235
Fix expending buffer in StdCopy
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-31 10:54:06 -07:00
Johannes 'fish' Ziemke
7808886744
Add more women
...
Added Adele Goldstine, Erna Schneider Hoover, Grace Hopper, Jean Bartik,
Jean E. Sammet, Karen Spärck Jones, Radia Perlman and Sophie Wilson.
Thanks to @jamtur01 for Sophie Kowalevski, Hypatia, Jane Goodall, Maria
Mayer, Rosalind Franklin, Gertrude Elion, Elizabeth Blackwell,
Marie-Jeanne de Lalande, Maria Kirch, Maria Ardinghelli, Jane Colden,
June Almeida, Mary Leakey, Lise Meitner, Johanna Mestorf.
Thanks to @xamebax for Françoise Barré-Sinoussi, Rachel Carson, Barbara
McClintock, Ada Yonath.
Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org > (github: discordianfish)
2014-03-31 19:44:57 +02:00
Michael Crosby
28015f8e57
Add integration test for volumes-from as file
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-31 17:42:34 +00:00
Michael Crosby
a57900e35f
Allow volumes from to be individual files
...
Fixes #4741
Right now volumes from expected a dir and not a file so when the drivers
tried to do the bind mount, the destination was a dir, not a file so it
fails to run.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-31 17:27:38 +00:00
Michael Crosby
7727c817fb
Merge pull request #4505 from unclejack/cli_integration_tests
...
cli integration tests
2014-03-31 10:26:38 -07:00
unclejack
883649ffe7
Merge pull request #4922 from creack/reduce_error_lvl
...
Reduce error level form harmless errors
2014-03-31 20:05:25 +03:00
Guillaume J. Charmes
a2487aa683
Reduce error level form harmless errors
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-31 09:07:56 -07:00
Dan Walsh
6899b05236
Merge branch 'master' of github.com:dotcloud/docker
2014-03-31 10:09:27 -04:00
Sven Dowideit
04d1e68639
OSX mktemp is different - hopfully this will now work on HP/UX >:}
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-03-31 11:05:21 +10:00
Sven Dowideit
c8ae307bab
Merge pull request #4900 from WarheadsSE/fix-bip-docs
...
Fix daemon's documentation for -bip flag
2014-03-30 10:38:36 +10:00
Sven Dowideit
eaf2dd0839
Merge pull request #4887 from jameshfisher/nat
...
Add missing port NAT configuration
2014-03-30 10:28:59 +10:00
Tianon Gravi
3fb1fc0b7b
Small tweaks to the hack scripts to make them simpler
...
Please do with this as you please (including rebasing and/or squashing it), especially under clause (c) of the DCO.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-29 23:09:45 +02:00
unclejack
6db32fdefd
initial version of cli integration tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-03-29 23:09:40 +02:00
Solomon Hykes
04f5c75239
Steve Wozniak is not boring.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-03-29 00:48:47 +00:00
Victor Vieux
c705e4a80b
Merge pull request #4884 from rhatdan/remount-var-lib-docker
...
Remount /var/lib/docker as --private to fix scaling issue
2014-03-28 17:15:32 -07:00
Jason Plum
36dfa0c4ec
Fix daemon's documentation for -bip flag
2014-03-28 18:02:17 -04:00
James Turnbull
058cc8818a
Merge pull request #4862 from jsimonelis/dockerfile_reference_typofix
...
documentation typo fix -- Dockerfile reference
2014-03-28 16:18:45 -04:00
Justin Simonelis
7d750180e4
Update AUTHORS
2014-03-28 15:15:54 -05:00
Victor Vieux
e13b4fd869
Merge pull request #4836 from atlassian/master
...
Use environmental proxy when doing a ping to the remote repo
2014-03-28 10:24:16 -07:00
Michael Crosby
755cd48258
Merge pull request #4895 from alexlarsson/dm-clean-shutdown
...
devmapper: Ensure we shut down thin pool cleanly.
2014-03-28 09:49:04 -07:00
Alexander Larsson
66c5e19f9b
devmapper: Ensure we shut down thin pool cleanly.
...
The change in commit a9fa1a13c3alexl@redhat.com > (github: alexlarsson)
2014-03-28 15:58:14 +01:00
Dan Walsh
792bb41e52
Remount /var/lib/docker as --private to fix scaling issue
...
If an admin mounts all file systems as -rshared (Default on RHEL and Fedora)
we see a scaling problem as the number of container increase.
Basically every new container needs to have it new mounts in /var/lib/docker
shared to all other containers, this ends up with us only able to scale to
around 100 containers, before the system slows down.
By simply bind mounting /var/lib/docker on its and then setting it private,
the scaling issue goes away.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-03-28 09:19:21 -04:00
unclejack
5b9c8607d9
Merge pull request #4759 from crosbymichael/comments-in-buildfile
...
Strip comments before parsing line continuations
2014-03-28 11:16:32 +02:00
unclejack
10b7ae39b9
Merge pull request #4880 from tianon/ignore-down-interfaces
...
Adjust TestOnlyLoopbackExistsWhenUsingDisableNetworkOption to ignore "DOWN" interfaces
2014-03-28 10:54:11 +02:00
unclejack
0fb8146afa
Merge pull request #4889 from crosbymichael/fix-commit-validation
...
Fix commit and import when no repository is specified
2014-03-28 10:25:21 +02:00
Victor Vieux
d2327006d6
Merge pull request #4442 from ibuildthecloud/hairpin-nat
...
Support hairpin NAT without going through docker server
2014-03-27 18:09:42 -07:00
unclejack
69ba31e17e
Merge pull request #4450 from alexlarsson/cgroups-systemd
...
Add systemd implementation of cgroups
2014-03-28 03:05:02 +02:00
James Harrison Fisher
64dd77fa0e
Add missing port NAT configuration
...
Missing port translation causes last line to fail
Docker-DCO-1.1-Signed-off-by: James Fisher <jameshfisher@gmail.com > (github: jameshfisher)
2014-03-27 23:02:44 +00:00
Guillaume J. Charmes
45b43d85ec
Merge pull request #4873 from crosbymichael/add-internal-symlinks
...
Follow symlinks inside container root for build's ADD
2014-03-27 15:46:48 -07:00
Guillaume J. Charmes
d848e2d113
Merge pull request #4871 from crosbymichael/bip-exists
...
Return error when existing bridge does not match ip
2014-03-27 14:51:21 -07:00
Alexander Larsson
6c7835050e
cgroups: Add systemd implementation of cgroups
...
This implements cgroup.Apply() using the systemd apis.
We create a transient unit called "docker-$id.scope" that contains
the container processes. We also have a way to set unit specific
properties, currently only defining the Slice to put the
scope in.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-27 22:44:31 +01:00
Alexander Larsson
1296d5ce9a
Add systemd.SdBooted()
...
This is a conversion of sd_booted() from libsystemd to go and checks
if the system was booted with systemd.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-27 22:44:31 +01:00
Alexander Larsson
cb43fd0071
pkg/systemd: Drop our copy-pasted version of go-systemd/activation
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-27 22:44:31 +01:00
Alexander Larsson
d4725801b3
Vendor github.com/godbus/dbus and github.com/coreos/go-systemd
...
We need this to do systemd API calls.
We also add the static_build tag to make godbus not use
os/user which is problematic for static builds.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-27 22:44:26 +01:00
Alexander Larsson
9294d7f2af
cgroups: Join groups by writing to cgroups.procs, not tasks
...
cgroups.procs moves all the threads of the process, and "tasks" just
the one thread. I believe there is a risk that we move the main thread,
but then we accidentally fork off one of the other threads if the go
scheduler randomly switched to another thread. So, it seems safer (and
more correct) to use cgroups.procs.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-27 21:47:47 +01:00
Alexander Larsson
7f7d8419a7
cgroups: Splity out Apply/Cleanup to separate file/interface
...
This leaves only the generic cgroup helper functions in cgroups.go and
will allow easy implementations of other cgroup managers.
This also wires up the call to Cleanup the cgroup which was missing
before.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-27 21:47:47 +01:00
Alexander Larsson
7a3070a600
Add --opt arguments for drivers
...
In order to handle special configuration for different drivers we
make the Config field a map to string array. This lets
us use it for lxc, by using the "lxc" key for those, and we can
later extend it easily for other backend-specific options.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-27 21:47:47 +01:00
Tianon Gravi
4af79a36e2
Add mention of mounting cgroupfs properly to PACKAGERS.md
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-27 16:44:30 -04:00
Barnaby Gray
9d2a778051
Update fish completions for docker master.
...
Docker-DCO-1.1-Signed-off-by: Barnaby Gray <barnaby@pickle.me.uk > (github: barnybug)
2014-03-27 19:45:47 +00:00
Ryan Thomas
d6c2188cae
Docker-DCO-1.1-Signed-off-by: Ryan Thomas <rthomas@atlassian.com> (github: rthomas)
2014-03-28 06:31:04 +11:00
Tianon Gravi
be5c65c2a2
Merge pull request #4613 from tianon/add-cgroupfs-mention-to-packagers
...
Add mention of mounting cgroupfs properly to PACKAGERS.md
2014-03-27 13:26:31 -06:00
Tianon Gravi
94538fe022
Merge pull request #4865 from creack/fix_fish_completion
...
Fix fish completion when having alias on awk or grep
2014-03-27 13:07:11 -06:00
Michael Crosby
ba9f9b3c92
Merge pull request #4818 from viirya/fix_working_dir_not_dir
...
fix the problem when setting existing file as working dir
2014-03-27 11:41:18 -07:00
Tianon Gravi
db20cb0e1a
Merge pull request #4879 from gorsuch/exec-upstart
...
Use "exec" in the upstart script to let upstart manage the docker process instead of a shell
2014-03-27 12:15:30 -06:00
unclejack
303a954151
Merge pull request #4838 from crosbymichael/btrfs-ftw
...
Promote btrfs
2014-03-27 19:55:25 +02:00
Michael Gorsuch
73ee4879af
upstart: use exec here so upstart can monitor the process and not just a shell
...
Docker-DCO-1.1-Signed-off-by: Michael Gorsuch <michael.gorsuch@gmail.com > (github: gorsuch)
2014-03-27 12:44:33 -05:00
Tianon Gravi
ad3e71d5c7
Adjust TestOnlyLoopbackExistsWhenUsingDisableNetworkOption to ignore "DOWN" interfaces
...
This fixes the following, which I've been seeing on all my machines for as long as I can remember:
--- FAIL: TestOnlyLoopbackExistsWhenUsingDisableNetworkOption (0.36 seconds)
container_test.go:1597: Wrong interface count in test container: expected [*: lo], got [1: lo 2: sit0]
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-27 11:06:32 -06:00
Tianon Gravi
79e8ef28e4
Merge pull request #4211 from rhatdan/master
...
Add SELinux support
2014-03-27 10:26:05 -06:00
Michael Crosby
6c9a47f01c
Update native driver to use labels from opts
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-27 09:04:54 +00:00
Michael Crosby
bfa2141765
Update lxc to use opts for selinux labels
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-27 08:57:01 +00:00
Michael Crosby
2d270c4f06
Fix compile and unit test errors after merge
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-27 08:25:01 +00:00
Michael Crosby
eab56ac007
Merge branch 'master' into pluginflag
...
Conflicts:
pkg/cgroups/cgroups.go
pkg/libcontainer/nsinit/exec.go
pkg/libcontainer/nsinit/init.go
pkg/libcontainer/nsinit/mount.go
runconfig/hostconfig.go
runconfig/parse.go
runtime/execdriver/driver.go
runtime/execdriver/lxc/lxc_template.go
runtime/execdriver/lxc/lxc_template_unit_test.go
runtime/execdriver/native/default_template.go
runtime/execdriver/native/driver.go
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-27 08:00:18 +00:00
Michael Crosby
097aef2ca9
Fix commit and import when no repository is specified
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-27 04:24:31 +00:00
Michael Crosby
67af7b3fb0
Strip comments before parsing line continuations
...
Fixes #3898
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-27 02:41:08 +00:00
Michael Crosby
0fb01fd8fe
Follow symlinks inside container root for build's ADD
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-27 02:07:35 +00:00
Dan Walsh
4c43566925
This patch adds SELinux labeling support.
...
docker will run the process(es) within the container with an SELinux label and will label
all of the content within the container with mount label. Any temporary file systems
created within the container need to be mounted with the same mount label.
The user can override the process label by specifying
-Z With a string of space separated options.
-Z "user=unconfined_u role=unconfined_r type=unconfined_t level=s0"
Would cause the process label to run with unconfined_u:unconfined_r:unconfined_t:s0"
By default the processes will run execute within the container as svirt_lxc_net_t.
All of the content in the container as svirt_sandbox_file_t.
The process mcs level is based of the PID of the docker process that is creating the container.
If you run the container in --priv mode, the labeling will be disabled.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-03-26 15:30:40 -04:00
Guillaume J. Charmes
ab00619c56
Merge pull request #4855 from unclejack/update_release_v0.9.1
...
Update master for release 0.9.1
2014-03-26 11:43:13 -07:00
Guillaume J. Charmes
e7f3234c1e
Fix fish completion when having alias on awk or grep
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-26 09:05:21 -07:00
Paul Jimenez
4746c76156
Include contributed completions in ubuntu PPA
...
Docker-DCO-1.1-Signed-off-by: Paul Jimenez <pj@place.org > (github: pjz)
2014-03-26 11:23:26 -04:00
Justin Simonelis
72dc19fd7d
authors update
2014-03-26 10:30:57 -04:00
Justin Simonelis
61f7d967ed
typo fix
2014-03-26 10:24:16 -04:00
Michael Crosby
baba9cde95
Return error when existing bridge does not match ip
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-26 11:51:27 +00:00
unclejack
b2721e05ce
Change version to 0.9.1-dev
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-03-26 00:18:45 +02:00
unclejack
d36176652e
Bump to version v0.9.1
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Conflicts:
VERSION
2014-03-26 00:18:19 +02:00
Victor Vieux
5506e4b62d
Merge pull request #4840 from vbatts/vbatts-load_from_input
...
docker load: add --input flag
2014-03-25 14:37:27 -07:00
Victor Vieux
abef5cb0fc
Merge pull request #4628 from kippandrew/port-allocator
...
Fix port collision with dynamically allocated ports
2014-03-25 14:30:10 -07:00
Victor Vieux
6643cc20fe
Merge pull request #4794 from alexlarsson/dm-better-shutdown
...
devicemapper: Better/faster shutdown
2014-03-25 14:03:00 -07:00
Tianon Gravi
e99297e4eb
Merge pull request #4842 from pda/installer-devicemapper-comment
...
Update AUFS comment in install.sh
2014-03-25 14:29:46 -06:00
Paul Annesley
576278102e
install.sh (get.docker.io) aufs comment updated.
...
devicemapper has landed, but the TODO hasn't been actioned presumably
because aufs is still preferred over devicemapper when available[1].
Comment updated accordingly.
Citation [1]: 267ca39921/runtime/graphdriver/driver.go (L40-L46)paul@annesley.cc > (github: pda)
2014-03-25 11:33:16 -07:00
Vincent Batts
2517370088
docker load: added example of a multiple tag image
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-25 08:30:59 -04:00
Sven Dowideit
d9c1116303
Merge pull request #4845 from noducks/link_fix
...
Force flag to prevent file already exists error.
2014-03-25 21:03:04 +10:00
noducks
8e434c314e
Force flag to prevent file already exists error.
...
Docker-DCO-1.1-Signed-off-by: No Ducks <onemannoducks@gmail.com > (github: noducks)
2014-03-25 10:26:45 +00:00
Sven Dowideit
30d25a3d27
Merge pull request #4814 from noducks/master
...
Reminder for OSX users not to use SUDO
2014-03-25 20:15:39 +10:00
viirya
293157b8b3
check if working dir is a directory and raise corresponding errors when making dir.
...
Docker-DCO-1.1-Signed-off-by: Liang-Chi Hsieh <viirya@gmail.com > (github: viirya)
2014-03-25 17:47:08 +08:00
noducks
69087f2d23
Reminder for OSX users not to use SUDO
...
Useful for those who haven't made it to the examples page yet. dad4a998dconemannoducks@gmail.com > (github: noducks)
2014-03-25 09:42:59 +00:00
Ryan Thomas
a5ccb5b28d
Docker-DCO-1.1-Signed-off-by: Ryan Thomas <rthomas@atlassian.com> (github: rthomas)
2014-03-25 14:45:11 +11:00
Vincent Batts
c6c7c03cdd
docker load: doc clarification
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-24 23:36:07 -04:00
Sven Dowideit
267ca39921
Merge pull request #4839 from bflad/chef-docker-docs
...
Add Chef usage documentation
2014-03-25 12:38:45 +10:00
Brian Flad
c84ff187c6
Fix typo in Using Chef documentation description
...
Docker-DCO-1.1-Signed-off-by: Brian Flad <bflad417@gmail.com > (github: bflad)
2014-03-24 22:29:54 -04:00
Vincent Batts
84e1fdf35d
docker load: add --input flag
...
for those that do not care to read from redirected stdin
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-24 21:43:26 -04:00
Brian Flad
bb034c6b42
Add Chef usage documentation
...
Docker-DCO-1.1-Signed-off-by: Brian Flad <bflad417@gmail.com > (github: bflad)
2014-03-24 21:39:15 -04:00
Sven Dowideit
0b2b5a594b
Merge pull request #4786 from SvenDowideit/run--lxc-conf-is-lxc-driver-only-atm
...
add a note that --lxc-conf is lxc-driver only.
2014-03-25 11:21:06 +10:00
Michael Crosby
4585d2da3e
Merge pull request #4751 from enokd/master
...
Fixes #3369 Repeated slash-'/' characters; harmonize across all name-related commands
2014-03-24 17:43:02 -07:00
Tianon Gravi
e1035535ec
Merge pull request #4837 from crosbymichael/remove-ci
...
Remove docker-ci code from the repo
2014-03-24 18:01:26 -06:00
Michael Crosby
a258d048a2
Merge pull request #4778 from vbatts/vbatts-save_to_output
...
`docker save --output` flags
2014-03-24 16:52:08 -07:00
Guillaume J. Charmes
c3ff1f41bb
Merge pull request #4835 from crosbymichael/reverst-stop-kill
...
Revert back to the default stop functionality of SIGKILL after timeout
2014-03-24 16:33:38 -07:00
Michael Crosby
dece260f3a
Merge pull request #4832 from LK4D4/fix_events_hanging_#4804
...
Workaround for hanging events. Fixes #4804
2014-03-24 16:26:50 -07:00
LK4D4
c7540b3e94
Workaround for hanging events. Fixes #4804
...
Docker-DCO-1.1-Signed-off-by: LK4D4 <lk4d4math@gmail.com > (github: LK4D4)
2014-03-24 22:31:32 +04:00
Michael Crosby
68dd722e3c
Promote btrfs
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-24 14:15:04 +00:00
Michael Crosby
f41135bc11
As far as I know this code is not used or maintained
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-24 12:39:56 +00:00
Michael Crosby
d503714285
Revert "Disable automatic killing of containers when docker stop fails"
...
This reverts commit 8b5cf51d60michael@crosbymichael.com > (github: crosbymichael)
2014-03-24 12:03:56 +00:00
Michael Crosby
f1bd79ec97
Revert "fix failing test to use kill instead of stop"
...
This reverts commit 4434dcee89michael@crosbymichael.com > (github: crosbymichael)
2014-03-24 12:03:41 +00:00
Michael Crosby
10fdbc0467
Add unit test for lxc conf merge and native opts
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-24 07:16:40 +00:00
Michael Crosby
9a7be1b015
Add cpuset.cpus to cgroups and native driver options
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-24 05:33:11 +00:00
Michael Crosby
5294bf7e67
Merge pull request #4775 from LK4D4/remove_duplicate_dns_#4714
...
Remove duplication of Dns in config merging.
2014-03-21 17:08:06 -07:00
Victor Vieux
97e5295f43
Merge pull request #4800 from vieux/rename_network_driver
...
rename lxc to bridge
2014-03-21 16:52:40 -07:00
Michael Crosby
de450b23be
Merge pull request #4761 from ichik1/fix-display-of-since-time-exit
...
Fix since time exit display when s.FinishedAt is zero
2014-03-21 16:48:30 -07:00
Tianon Gravi
708ecd7da2
Add mention of mounting cgroupfs properly to PACKAGERS.md
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-21 14:17:09 -06:00
Michael Crosby
2c58a1e288
Change placement of readonly filesystem
...
We need to change it to read only at the very end so that bound,
copy dev nodes and other ops do not fail.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-21 14:17:17 +00:00
Michael Crosby
83618c2b81
Add more native driver options
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-21 14:07:16 +00:00
Michael Crosby
146a212f71
Change syntax to use dots
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-21 12:38:50 +00:00
Michael Crosby
c9d7f858fd
Change flag to -o and --opt
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-21 11:53:15 +00:00
Michael Crosby
7c726669cb
Factor out the native driver config options
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-21 08:10:07 +00:00
Ken ICHIKAWA
4002eac8b8
Fix since time exit display when s.FinishedAt is zero
...
When s.FinishedAt is zero, the since time exit in docker ps doesn't display correct time.
For example
```
Exited (0) 292.471209 years ago
```
This patch fixes the since time exit to display nothing if s.FinishedAt is zero.
Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com > (github: ichik1)
2014-03-21 15:28:02 +09:00
Victor Vieux
69db806542
Merge pull request #4518 from tianon/sync-DCO-with-developercertificate.org
...
Resync the DCO text with upstream at http://developercertificate.org/
2014-03-20 23:07:08 -07:00
Sven Dowideit
14502f0f1c
Merge pull request #4803 from alambike/patch-1
...
Added Eixo::Docker to the list of libraries
2014-03-21 12:49:51 +10:00
alambike
79c11b19ec
Added Eixo::Docker to the list of libraries
...
Docker-DCO-1.1-Signed-off-by: Javier Gómez <alambike@gmail.com > (github: alambike)
2014-03-21 03:13:06 +01:00
Sven Dowideit
8329cd55e1
Merge pull request #4796 from cpuguy83/fix_single_dash_args_in_dcs
...
Fix double single dash arg issues in docs
2014-03-21 11:18:21 +10:00
Michael Crosby
be5538d8a8
Allow containers to join the net namespace of other conatiners
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-21 00:48:17 +00:00
Michael Crosby
1bedae9107
Merge branch 'proppy-nsinit' into pluginflag
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-21 00:36:23 +00:00
Michael Crosby
87b0df997b
Merge branch 'nsinit' of https://github.com/proppy/docker into proppy-nsinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-21 00:36:09 +00:00
Michael Crosby
70f3b9f4ce
Add ability to work with individual namespaces
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-21 00:23:34 +00:00
Michael Crosby
443a75d5f6
Allow caps to be toggled in native driver with plugin flag
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-21 00:10:24 +00:00
Djibril Koné
43c3ee3ba1
Harmonize / across all name-related commands/Validate images names
...
Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com > (github: enokd)
2014-03-21 00:40:58 +01:00
Michael Crosby
c5f9c4bd69
Dont use custom marshaling for caps and namespaces
...
This also adds an enabled field to the types so that they
can be easily toggled.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-20 23:09:01 +00:00
Michael Crosby
f7b3e879fc
Add initial plugin flag to pass lxc and native driver options
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-20 22:58:02 +00:00
Victor Vieux
8944fb2e9b
rename lxc to bridge
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-20 21:51:28 +00:00
Tianon Gravi
ab0c9b385c
Remove the inotifywait hack from our upstart host-integration example that is no longer necessary
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-20 14:59:40 -06:00
Brian Goff
fbd6fee4ab
Fix double single dash arg issues in docs
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-03-20 14:14:54 -04:00
Alexander Larsson
a9fa1a13c3
devicemapper: Better/faster shutdown
...
Right now shutdown is looping over *all* devicemapper
devices and actively deactivating them, this is pretty
slow if you have a lot of non-active containers. We
instead only deactivate the devices that are mounted.
We also do the shutdown unmount using MNT_DETACH which
forces the unmount in the global namespace, even if it
is busy because of some container having it mounted.
This means the device will be freed when that container
exits.
Also, we move the call to waitClose to deactivateDevice
because all callers of any of them call both anyway.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-20 17:38:35 +01:00
Guillaume J. Charmes
56c156190a
Merge pull request #4782 from unclejack/fix_TestCreateStartRestartStopStartKillRm
...
fix failing test to use kill instead of stop
2014-03-20 09:10:32 -07:00
Tianon Gravi
2678af4ea8
Merge pull request #4790 from tianon/fix-release
...
Fix a lot of the sha256 and md5 stuff to be more DRY and extendible, and on more things (specifically, the tgz files too)
2014-03-19 22:49:19 -06:00
Tianon Gravi
6b46a09186
Fix a lot of the sha256 and md5 stuff to be more DRY and extendible, and on more things (specifically, the tgz files too)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-19 22:25:09 -06:00
Tianon Gravi
372b7282cb
Merge pull request #4788 from SvenDowideit/sign-releases-fixup
...
Fix bugs in release.sh
2014-03-19 18:19:25 -06:00
Sven Dowideit
62eb23aed5
missed a bug
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-03-20 10:18:08 +10:00
Sven Dowideit
a8cc6ebb18
I'm not looking forward to documenting cli arguments that may or may not show depending on what plugins / drviers you choose
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-03-20 09:59:54 +10:00
Djibril Koné
e38e977a04
Harmonize / across all name-related commands
...
Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com > (github: enokd)
Harmonize / across all name-related commands
Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com > (github: enokd)
Harmonize / across all name-related commands:Return an error when repeated /
Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com > (github: enokd)
2014-03-20 00:45:29 +01:00
Tianon Gravi
43124b5613
Merge pull request #4708 from SvenDowideit/sign-releases
...
Add md5 and sha256 to binaries on get.docker.io
2014-03-19 17:38:07 -06:00
Sven Dowideit
43febdd432
whitespace-blind
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-03-20 09:35:58 +10:00
James Turnbull
f2b01f5fa1
Merge pull request #4784 from SvenDowideit/reference-security-doc
...
add a link to the security documentation when we mention the docker group (or -G)
2014-03-19 17:20:44 -06:00
Sven Dowideit
179e2c92d8
Generate md5 and sha265 hashes when building, and upload them in hack/release.sh
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-03-20 09:19:47 +10:00
Sven Dowideit
f3765f96cf
add a link to the security documentation when we mention the docker group (or -G)
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-03-20 09:08:52 +10:00
Victor Vieux
aa63ece2ec
Merge branch 'master' into discordianfish-https_client
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-19 22:05:36 +00:00
Victor Vieux
12687b7c10
Merge branch 'https_client' of github.com:discordianfish/docker into discordianfish-https_client
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-19 22:03:11 +00:00
Sven Dowideit
16ee4958f2
Merge pull request #4703 from netroy/patch-1
...
Document the missing `DisableNetwork` config flag to /containers/create end-point
2014-03-20 07:55:35 +10:00
Guillaume J. Charmes
3c9ae2b348
Merge pull request #3774 from danielnorberg/dns-search-domains
...
configurable dns search domains
2014-03-19 14:52:49 -07:00
unclejack
4434dcee89
fix failing test to use kill instead of stop
...
TestCreateStartRestartStopStartKillRm was failing because stop has been
changed to not kill containers.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-03-19 23:23:45 +02:00
Vincent Batts
78a0105eaf
api/client: var style tweak
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-19 17:09:12 -04:00
Daniel Norberg
c657603c61
variable declaration cleanup
...
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com > (github: danielnorberg)
2014-03-19 16:44:11 -04:00
Daniel Norberg
698ca9f38d
fix typo in documentation
...
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com > (github: danielnorberg)
2014-03-19 16:44:09 -04:00
LK4D4
48cb2f0317
Remove duplication of Dns in config merging.
...
Fixes #4714
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-03-19 23:20:30 +04:00
Michael Crosby
6b5ba1b066
Merge pull request #4777 from vbatts/vbatts-server-info_and_assurance
...
images: assurance and debug info on image layers
2014-03-19 12:07:11 -07:00
Vincent Batts
e93a16ab48
docker save: add and improve docs
...
add usage examples for `docker save ...`
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-19 14:47:20 -04:00
Vincent Batts
367a679b92
images: assurance and debug info on image layers
...
when pushing or saving layers, report sizes for validation. And ensure
that the files written are sync'ed.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-19 14:34:12 -04:00
Vincent Batts
5127732c79
docker save: --output flag
...
for those that do not care to redirect stdout
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-19 14:31:22 -04:00
Aditya
ec3257921d
Docker-DCO-1.1-Signed-off-by: Aditya <aditya@netroy.in> (github: netroy)
...
document `DisableNetwork` config flag
2014-03-19 19:01:49 +01:00
Michael Crosby
47470d299d
Merge pull request #4691 from tianon/relative-workdir
...
Add proper support for relative WORKDIR instructions
2014-03-19 09:57:23 -07:00
Daniel Norberg
fbfac21ed4
configurable dns search domains
...
Add a --dns-search parameter and a DnsSearch
configuration field for specifying dns search
domains.
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com > (github: danielnorberg)
2014-03-19 10:49:25 -04:00
James Turnbull
d3c5891486
Merge pull request #4754 from vojnovski/consistent_apt-key_use
...
refactor($hack,$docs): be consistent in apt-key keyserver URI usage
2014-03-19 07:38:05 -06:00
Viktor Vojnovski
4fd82db4be
refactor($hack,$docs): be consistent in apt-key keyserver URI usage, as done in #4740
...
In #4740 , the apt-key call in docs is changed to use the keyserver port 80 instead of
port 11371, as the previous call would fail with a restrictive firewall or proxy.
This commit extends the change to all apt-key calls in the repository.
Docker-DCO-1.1-Signed-off-by: Viktor Vojnovski <vojnovski@gmail.com > (github: vojnovski)
2014-03-19 10:20:10 +01:00
James Turnbull
ccddb33bf4
Merge pull request #4727 from andreaturli/master
...
add softlayer installation instructions
2014-03-19 01:04:44 -06:00
Sven Dowideit
53dc2d67fb
mention the tgz - other people might like to know
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-03-19 14:24:49 +10:00
Sven Dowideit
92194f613e
use this horrible complex bit of shell to make sure that curl doesn't hand the poor user a broken docker client
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-03-19 14:12:47 +10:00
Sven Dowideit
9bbc11b2ae
Merge pull request #4758 from crosbymichael/redis-bind
...
Be explicit about binding to all interfaces in redis example
2014-03-19 13:04:02 +10:00
Michael Crosby
0bb1e3d9a7
Merge pull request #4753 from vieux/clean_container_stop
...
cleanup container.stop
2014-03-18 18:49:51 -07:00
Michael Crosby
7822b053cb
Be explicit about binding to all interfaces in redis example
...
Fixes #4021
Moved to debian because the redis installed in ubuntu is really old
and does not support args via the cli.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-18 17:24:06 -07:00
Sven Dowideit
3b5b2f8953
Merge pull request #4757 from crosbymichael/osx-duh
...
Add sudo clause if your using osx or tcp
2014-03-19 10:22:30 +10:00
Michael Crosby
38a3fc3e0e
Add sudo clause if your using osx or tcp
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-18 17:07:45 -07:00
Victor Vieux
3b1d590269
cleanup container.stop
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-18 23:48:14 +00:00
Sven Dowideit
9e1306f78f
Merge pull request #4755 from crosbymichael/add-size-to-history-docs
...
Add image size to history docs
2014-03-19 09:32:35 +10:00
Johan Euphrosine
5dbfe310fe
libcontainer: remove duplicate imports
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-03-18 16:25:26 -07:00
Michael Crosby
041ae08a2c
Add image size to history docs
...
Fixes #3147
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-18 16:24:45 -07:00
Johan Euphrosine
f58757a699
libcontainer: goimports
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-03-18 16:18:34 -07:00
Johan Euphrosine
b10b950b11
libcontainer/nsinit/init: move mount namespace after network
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-03-18 16:18:04 -07:00
Johan Euphrosine
f52b2fdcbb
libcontainer/network: add netns strategy
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-03-18 16:17:28 -07:00
Michael Crosby
22c18de7be
Merge pull request #4744 from LK4D4/fix_issue_#3565
...
Using names in docker ps --since-id/--before-id, resolves #3565
2014-03-18 15:39:56 -07:00
Tianon Gravi
119839dfd7
Merge pull request #4749 from cpuguy83/add_nofile_noproc_settings_to_upstart
...
Add upstart nofile/noproc similar to systemd init
2014-03-18 15:30:30 -06:00
Sven Dowideit
06d87fd540
Merge pull request #4740 from vojnovski/patch-1
...
Update ubuntulinux.rst
2014-03-19 06:48:57 +10:00
Brian Goff
e27c635c06
Add upstart nofile/noproc similar to systemd init
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-03-18 16:27:20 -04:00
LK4D4
c1f2abd899
Using names in docker ps --since-id/--before-id, resolves #3565
...
Also renames --since-id/--before-id to --since/--before and add errors
on non-existent containers.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-03-18 23:30:21 +04:00
Guillaume J. Charmes
bfbf338f51
Merge pull request #4684 from cpuguy83/4682-do_not_sigkill_on_docker_stop
...
Disable automatic killing of containers when docker stop fails
2014-03-18 11:28:42 -07:00
Michael Crosby
1e56ec8b67
Merge pull request #4733 from vieux/3729_time_exit
...
add time since exit in docker ps
2014-03-18 11:25:11 -07:00
Victor Vieux
c584910b55
Merge pull request #4650 from vbatts/vbatts-btrfs_build_tags
...
btrfs: build tags
2014-03-18 11:10:00 -07:00
Vincent Batts
c76def2dd2
typo
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-18 13:46:38 -04:00
Vincent Batts
29c45e7f4f
packagers: btrfs build tag docs
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-18 13:45:36 -04:00
Vincent Batts
5cfea26bcf
btrfs: build tags
...
correct filename and make the tag more readable
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-18 13:44:23 -04:00
Vincent Batts
85a62d9b77
btrfs: build tags
...
Default to the same build behavior, but allow a go build tag to disable
building of the btrfs graphdriver
go build -tags no_btrfs' ...
$ go build
$ objdump -S docker | grep btrfs | wc -l
194
$ go build -tags no_btrfs
$ objdump -S docker | grep btrfs | wc -l
1
# that is a comment ;-)
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-18 13:44:22 -04:00
Andy Kipp
555416fd02
Add err checks for port allocator tests
...
Docker-DCO-1.1-Signed-off-by: Andy Kipp <andy@rstudio.com > (github: kippandrew)
2014-03-18 13:30:21 -04:00
Andy Kipp
73c416a20d
Be more explicit in finding next port to allocate
...
Docker-DCO-1.1-Signed-off-by: Andy Kipp <andy@rstudio.com > (github: kippandrew)
2014-03-18 13:30:21 -04:00
Andy Kipp
7a1db291fc
Better test error message
...
Docker-DCO-1.1-Signed-off-by: Andy Kipp <andy@rstudio.com > (github: kippandrew)
2014-03-18 13:30:21 -04:00
Andy Kipp
f7b6fbbd76
Prevent dynamic allocation of previously allocated ports
...
Docker-DCO-1.1-Signed-off-by: Andy Kipp <andy@rstudio.com > (github: kippandrew)
2014-03-18 13:30:21 -04:00
Victor Vieux
f14c0866ec
Merge pull request #4674 from vbatts/vbatts-graphdriver_build_tags
...
graphdriver: build tags
2014-03-18 10:25:59 -07:00
Guillaume J. Charmes
8ac6400749
Merge pull request #4739 from alexlarsson/dm-timeout
...
devmapper: Increase timeout in waitClose to 10sec
2014-03-18 10:12:59 -07:00
James Turnbull
98949c0793
Merge pull request #4738 from SvenDowideit/mention-env-scrubbing
...
add env hint
2014-03-18 10:32:05 -06:00
Viktor Vojnovski
ae1dd52b19
Update ubuntulinux.rst
...
Adding the Docker repository key fails if port 11371 not open. This would probably work for more people.
2014-03-18 17:10:22 +01:00
Alexander Larsson
a70beda1ec
devmapper: Increase timeout in waitClose to 10sec
...
As reported in https://github.com/dotcloud/docker/issues/4389 we're
currently seeing timeouts in waitClose on some systems. We already
bumped the timeout in waitRemove() in
https://github.com/dotcloud/docker/issues/4504 .
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-18 15:54:40 +01:00
Sven Dowideit
e5cbb5c906
add env hint
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-03-18 22:29:11 +10:00
Michael Crosby
3782900405
Merge pull request #4731 from crosbymichael/fix-execin
...
Only unshare the mount namespace for execin
2014-03-17 18:59:26 -07:00
Vincent Batts
448b64164d
runtime: no build tags for vfs driver
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-17 21:54:43 -04:00
Vincent Batts
670ce98c60
graphdriver: build tags
...
Enable build tags for all the graphdrivers to be excludable.
As an example:
```
$ go build
$ ls -l docker
-rwxr-xr-x 1 vbatts vbatts 18400158 Mar 14 14:22 docker*
$ go build -tags "exclude_graphdriver_aufs exclude_graphdriver_vfs exclude_graphdriver_devicemapper"
$ ls -l docker
-rwxr-xr-x 1 vbatts vbatts 17467068 Mar 14 14:22 docker*
```
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-17 21:54:05 -04:00
Michael Crosby
4b1513f9c3
Only unshare the mount namespace for execin
...
Fixes #4728
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-17 18:52:56 -07:00
Tianon Gravi
69299f041f
Add some documentation about relative WORKDIR values
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-17 19:42:27 -06:00
Tianon Gravi
c1f492755b
Improve WORKDIR test to cover more edge cases
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-17 19:42:13 -06:00
Victor Vieux
15a267b57d
add time since exit in docker ps
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-18 01:34:43 +00:00
Guillaume J. Charmes
68dc189680
Merge pull request #4661 from vieux/add_no_prune
...
Add no prune
2014-03-17 16:07:55 -07:00
Andrea Turli
8b159fca8a
address comments from @jamtur01
...
Docker-DCO-1.1-Signed-off-by: Andrea Turli <andrea.turli@gmail.com > (github: andreaturli)
2014-03-17 23:39:35 +01:00
unclejack
fb503da34e
Merge pull request #4710 from jimenez/4680-timeout_flag-fix
...
Disable timeout
2014-03-18 00:38:39 +02:00
Victor Vieux
30541ade82
Merge pull request #4702 from timthelion/Issue#4681-1
...
Fix Issue#4681
2014-03-17 15:31:54 -07:00
Andrea Turli
782eb5f03a
add softlayer installation instructions
...
Docker-DCO-1.1-Signed-off-by: Andrea Turli <andrea.turli@gmail.com > (github: andreaturli)
2014-03-17 23:19:47 +01:00
Isabel Jimenez
25218f9b23
adding configuration for timeout and disable it by default
...
Docker-DCO-1.1-Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com > (github: jimenez)
2014-03-17 15:12:02 -07:00
Timothy Hobbs
659b719aa6
Refactor out interface specific information from execdriver.Network
...
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
2014-03-17 22:53:48 +01:00
Sven Dowideit
865310e99d
Merge pull request #4689 from ralphbean/patch-1
...
Update fedora.rst
2014-03-18 07:49:48 +10:00
Timothy Hobbs
353df19ab7
Fix issue #4681 - No loopback interface within container when networking is disabled.
...
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Remove loopback code from veth strategy
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Looback strategy: Get rid of uneeded code in Create
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Use append when building network strategy list
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Swap loopback and veth strategies in Networks list
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Revert "Swap loopback and veth strategies in Networks list"
This reverts commit 3b8b2c8454171d79bed5e9a80165172617e92fc7.
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
When initializing networks, only return from the loop if there is an error
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
2014-03-17 22:01:24 +01:00
Timothy Hobbs
53c5b1856d
Add failing test case for issue #4681
...
Add a failing test case for an issue where docker is not creating a loopback device if networking is dissabled.
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
2014-03-17 22:01:24 +01:00
Guillaume J. Charmes
dd040c9870
Merge pull request #4723 from vieux/fix_panic_monitor
...
fix panic in monitor
2014-03-17 13:52:22 -07:00
unclejack
0e92c7c24a
Merge pull request #4721 from vieux/4716-display_ps-fix
...
Fix display command display in docker ps
2014-03-17 22:04:00 +02:00
Victor Vieux
1dfc440733
fix panic in monitor
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-17 19:33:40 +00:00
Victor Vieux
326f6a4b4d
fix tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-17 19:17:40 +00:00
Brian Goff
8b5cf51d60
Disable automatic killing of containers when docker stop fails
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-03-17 15:15:44 -04:00
Guillaume J. Charmes
59035d291f
Merge pull request #4678 from crosbymichael/move-runtime-deps
...
Move runtime deps
2014-03-17 12:01:09 -07:00
Michael Crosby
2bddcd68b4
Gofmt imports
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-17 11:41:28 -07:00
Victor Vieux
a18d08177c
Add missing client doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-17 18:40:57 +00:00
Victor Vieux
afcaaffd0b
update doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-17 18:40:57 +00:00
Victor Vieux
edd8d2d351
add no prune to rmi
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-17 18:40:57 +00:00
Michael Crosby
96c4816cef
Move graphdrivers into runtime top level pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-17 11:40:12 -07:00
Michael Crosby
af385151ce
Move execdrivers into runtime top level pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-17 11:40:12 -07:00
Michael Crosby
2230c9b9a7
Move networking drivers into runtime top level pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-17 11:40:12 -07:00
unclejack
2ada6441db
Merge pull request #4701 from erikh/4099-non_existent_file_no_error
...
Fix `docker cp` trying to untar files that do not exist.
2014-03-17 20:38:26 +02:00
Guillaume J. Charmes
f9bd6c860d
Merge pull request #4364 from vieux/move_clone
...
move git clone from daemon to client
2014-03-17 11:36:56 -07:00
Victor Vieux
5921b186d1
display command display in docker ps
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-17 18:36:15 +00:00
Guillaume J. Charmes
597e0812fb
Merge pull request #4645 from crosbymichael/add-logger
...
Add logger to libcontainer
2014-03-17 11:30:14 -07:00
Guillaume J. Charmes
d810218038
Merge pull request #4720 from vieux/fix_content-type_cp
...
fix content-type detection in docker cp
2014-03-17 11:24:18 -07:00
Ralph Bean
a62c7215c6
Update fedora.rst
...
It looks like ``wmdocker`` does not have an update for Fedora 20:
```
~❯ pkgwat releases wmdocker
Starting new HTTPS connection (1): apps.fedoraproject.org
+---------------+----------------+-----------------+
| release | stable_version | testing_version |
+---------------+----------------+-----------------+
| Rawhide | 1.5-12.fc21 | None |
| Fedora 20 | None | None |
| Fedora 19 | None | None |
| Fedora EPEL 7 | None | None |
| Fedora EPEL 6 | None | None |
| Fedora EPEL 5 | None | None |
+---------------+----------------+-----------------+
```
I'm not sure if the owner awjb is intending to create an F20 update or
not, but either way -- these docs are incorrect as currently written.
Docker-DCO-1.1-Signed-off-by: Ralph Bean <rbean@redhat.com > (github: ralphbean)
2014-03-17 14:18:11 -04:00
Guillaume J. Charmes
73f5aa87af
Merge pull request #4719 from philips/Capabilities-to-CapabilitiesMask
...
refactor(libcontainer): rename to CapabilitiesMask
2014-03-17 11:15:29 -07:00
Brandon Philips
ad7e7d6123
chore(libcontainer): small grammar fix in types_test
...
Someone probably got really used to typing er on the end of contain :)
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-03-17 11:07:29 -07:00
Brandon Philips
128381e0f0
refactor(libcontainer): rename to CapabilitiesMask
...
The Capabilities field on libcontainer is actually used as a mask.
Rename the field so that this is more clear.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-03-17 11:07:12 -07:00
Victor Vieux
a9ac35cbfb
Merge pull request #4700 from erikh/2371-sort_ports
...
In `docker ps`, sort by port instead of unsorted.
2014-03-17 11:03:06 -07:00
Michael Crosby
f68dd44dfa
Merge pull request #4686 from pnasrat/benchmark-typo
...
Fix spelling of benchmark test
2014-03-17 10:59:43 -07:00
Victor Vieux
90b283c39a
fix content-type detection in docker cp
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-17 17:56:21 +00:00
unclejack
555c1ef670
Merge pull request #4672 from vieux/update_godoc_mflags
...
update godoc and add MAINTAINERS for mflags
2014-03-17 19:30:58 +02:00
Sébastien Stormacq
681d1d2f61
Include instruction for AMI 2014.03
...
Include instructions to install Docker from Amazon's Software Repository on new AMI 2014.03 (Release Candidate)
Docker-DCO-1.1-Signed-off-by: Sebastien Stormacq <sebastien.stormacq@gmail.com > (github: sebsto)
2014-03-17 15:36:46 +01:00
Sven Dowideit
2ea3fa9af5
Merge pull request #4698 from rutsky/external_link_in_rst_fix
...
Fix external link on security of containers
2014-03-17 09:29:33 +10:00
Erik Hollensbe
9e69a042c5
Fix docker cp trying to untar files that do not exist.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <erik@hollensbe.org > (github: erikh)
2014-03-16 17:48:46 +00:00
Erik Hollensbe
e32965dbb1
In docker ps, sort by port instead of unsorted.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <erik@hollensbe.org > (github: erikh)
2014-03-16 16:28:44 +00:00
Vladimir Rutsky
65051f4215
Fix external link on security of containers
...
Docker-DCO-1.1-Signed-off-by: Vladimir Rutsky <altsysrq@gmail.com > (github: rutsky)
2014-03-16 18:36:15 +04:00
Sven Dowideit
7a7126faf6
Merge pull request #4687 from zqhxuyuan/patch-1
...
Update epel.rpm's new url
2014-03-16 08:14:18 +10:00
Tianon Gravi
054b85a7b2
Add proper support for relative WORKDIR instructions
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-15 14:03:16 -06:00
zqh
853c5e258f
Update nodejs_web_app.rst
...
the address of epel rpm has change to http://dl.fedoraproject....
2014-03-16 01:07:22 +08:00
Paul Nasrat
5583774e29
Fix spelling of benchmark test
...
Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com > (github: pnasrat)
2014-03-15 11:38:31 -04:00
Guillaume J. Charmes
f9090567af
Merge pull request #4676 from crosbymichael/no-sig-kill
...
Send sigterm to child instead of sigkill
2014-03-14 16:44:08 -07:00
Tianon Gravi
2ba0861ad3
Add Sam's Go "dockerclient" to the list of Client Libraries
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-14 17:20:22 -06:00
Guillaume J. Charmes
75738b8527
Merge pull request #4673 from vieux/update_test_TestCreateRmRunning
...
update TestCreateRmRunning
2014-03-14 15:50:27 -07:00
Sven Dowideit
5fd2de9792
Merge pull request #4679 from metalivedev/updateimages
...
Update images to remove references to AUFS, LXC
2014-03-15 08:45:37 +10:00
Michael Crosby
39037a91f8
Send sigterm to child instead of sigkill
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-14 15:42:05 -07:00
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
Victor Vieux
6a058540fe
Merge pull request #4647 from vieux/fix_registry_tests
...
use mock for search
2014-03-14 14:34:44 -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
Victor Vieux
123ebf9053
update TestCreateRmRunning
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-14 18:16:14 +00:00
Victor Vieux
a41f6d9367
update godoc and add MAINTAINERS for mflags
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-14 17:35:41 +00:00
Michael Crosby
0e863a584a
Add stderr log ouput if in debug
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-14 09:55:05 -07:00
Michael Crosby
7294392c72
Add initial logging to libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-14 09:55:05 -07: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
Victor Vieux
9a0d7fe018
use mock for search
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-13 17:40:34 +00: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 baa70e9751ichikawa.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
Sven Dowideit
2ad16c88e2
Merge pull request #4526 from Rovanion/master
...
All caps variables in normal bash should be avoided not to accidentally collide with environment variables.
2014-03-12 22:24:00 +10:00
James Turnbull
a5fa161ff8
Merge pull request #4143 from SvenDowideit/apt-cacher-example
...
Show some ENV / local updated baseimage tricks that use an apt-cacher-ng...
2014-03-12 08:20:42 -04:00
unclejack
2cfcf42d50
retry to retrieve metadata on failure during pull
...
This makes Docker retry to retrieve the JSON metadata for the layers.
Docker will make 5 attempts to retrieve the metadata before failing and
it will increase the delay between attempts after each failed attempt.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-03-12 14:05:43 +02:00
Sven Dowideit
8bf63d5326
fixes suggested by James
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-03-12 22:02:24 +10:00
Tianon Gravi
99b6364790
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)
2014-03-12 01:18:12 -06:00
Tianon Gravi
e1c48fa560
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)
2014-03-12 01:17:38 -06:00
Ken ICHIKAWA
b7ae9984fb
Update daemon docs and help messages for --iptables and --ip-forward
...
Fix docs and help messages of --iptables and --ip-forward to describe the true case behaviour
Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com > (github: ichik1)
2014-03-12 13:50:03 +09:00
Tianon Gravi
f544ebd55a
Merge pull request #4574 from tianon/fix-cgroup-hax
...
Fix init script cgroup mounting workarounds to be more similar to cgroupfs-mount...
2014-03-11 22:21:01 -06:00
Vincent Batts
2b855afaee
registry: Info collection
...
roll version and standalone information into the _ping. And to support
Headers they are checked after the JSON is loaded (if there is anything
to load). To stay backwards compatible, if the _ping contents are not
able to unmarshal to RegistryInfo, do not stop, but continue with the
same behavior.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-11 23:36:51 -04:00
Sven Dowideit
bf009b530e
Merge pull request #4541 from scollier/master
...
Adding the new options to the `docker ps` documentation.
2014-03-12 11:36:12 +10:00
Scott Collier
fbf74eb079
Removing HEAD tag from last commit
...
Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com > (github: scollier)
2014-03-11 20:00:16 -05:00
Scott Collier
7178b285a3
Adding CLI options to the commandline reference documentation.
...
Fixing bad DCO sig
URLs of pages are:
http://docs.docker.io/en/latest/reference/commandline/cli/
Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com > (github: scollier)
2014-03-11 19:54:48 -05:00
Victor Vieux
f0eb227548
improve deprecation message
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-12 00:51:46 +00:00
Scott Collier
baa70e9751
Adding the new options to the docker ps documentation.
...
URL of documentation page is: http://docs.docker.io/en/latest/reference/commandline/cli/#ps
Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com > (github: scollier)
Adding the new options to the `docker ps` documentation.
URL of documentation page is: http://docs.docker.io/en/latest/reference/commandline/cli/#ps
Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com > (github: scollier)
Adding CLI options to the commandline reference documentation.
URLs of pages are:
http://docs.docker.io/en/latest/reference/commandline/cli/
Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com > (github: scollier)
changing indention
Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com > (github: scollier)
2014-03-11 19:51:30 -05:00
Guillaume J. Charmes
95e5910ab2
Fix attach exit on darwin
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-11 17:51:29 -07:00
Victor Vieux
f9fde52a07
Merge pull request #4598 from creack/fix_lxc
...
Fix lxc
2014-03-11 17:17:54 -07:00
Tianon Gravi
7b79f597f6
Merge pull request #4521 from tianon/release-checklist-origin
...
Note within the RELEASE-CHECKLIST that "origin" is assumed to be upstream
2014-03-11 14:34:47 -06:00
Michael Crosby
b55a79aa1c
Merge pull request #4504 from alexlarsson/devicemapper-waits
...
devmapper: Increase sleep times and unlock while sleeping
2014-03-11 13:17:53 -07:00
Guillaume J. Charmes
fd0737df2c
Update parseLxcInfo to comply with new lxc1.0 format
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-11 12:08:32 -07:00
Guillaume J. Charmes
721562f296
Remove goroutine leak upon error
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-11 11:39:28 -07:00
Victor Vieux
3715f46b8b
Merge pull request #4491 from crosbymichael/add-pull-dep
...
Add deprecation warning for -t on pull
2014-03-11 10:22:06 -07:00
Victor Vieux
0a6d9035cf
Merge pull request #4589 from creack/update_maintainer
...
Update MAINTAINER email + add self to pkg/signal MAINTAINER
2014-03-11 10:18:37 -07:00
Guillaume J. Charmes
7654bac442
Merge pull request #4466 from alexlarsson/execdrivers
...
Move execdriver construction into execdriver/execdrivers
2014-03-11 10:14:20 -07:00
Michael Crosby
15e52ccaad
Add deprecation warning for -t on pull
...
Closes #3410
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-11 10:11:05 -07:00
Guillaume J. Charmes
af3ff044a2
Merge pull request #4499 from alexlarsson/fix-remove-fail
...
DeviceMapper: Succeed immediately when removing non-existant devices
2014-03-11 10:09:58 -07:00
Guillaume J. Charmes
6169dafab3
Merge pull request #4569 from dolph/master
...
spelling correction
2014-03-11 09:19:46 -07:00
Guillaume J. Charmes
037f942a0b
Merge pull request #4583 from kzys/freebsd-signal
...
Like signal_linux.go, we don't have import os and os/signal
2014-03-11 09:01:39 -07:00
Alexander Larsson
07c35b41a5
Move execdriver construction into execdriver/execdrivers
...
This can't be in execdriver (dependency loop) but should not be
hardcoded inside runtime.go either. So we put it in a subpackage.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-11 16:37:19 +01:00
Kato Kazuyoshi
b2cd89056f
Like signal_linux.go, we don't have import os and os/signal
...
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-03-11 23:14:58 +09:00
Vincent Batts
2a2c694758
registry: make certain headers optional
...
For a pull-only, static registry, there only a couple of headers that
need to be optional (that are presently required.
* X-Docker-Registry-Version
* X-Docker-Size
* X-Docker-Endpoints
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-11 10:08:44 -04:00
James Turnbull
e50a5fcb0d
Merge pull request #4577 from SvenDowideit/moltar-perl-modules
...
add Net::Docker CPAN module
2014-03-11 09:37:44 -04:00
Sven Dowideit
b348ee0fd0
add Net::Docker CPAN module
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-03-11 20:28:26 +10:00
Tianon Gravi
76dc670f41
Add variable for DOCKER_LOGFILE to sysvinit and use append instead of overwrite in opening the logfile
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-11 01:40:31 -06:00
Tianon Gravi
b21f8872cc
Fix init script cgroup mounting workarounds to be more similar to cgroupfs-mount and thus work properly
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-11 01:39:06 -06:00
Guillaume J. Charmes
915d967f55
Update email + add self to pkg/signal
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-10 20:26:45 -07:00
Dolph Mathews
18ea183ea0
spelling correction
...
s/singal/signal/
Docker-DCO-1.1-Signed-off-by: Dolph Mathews <dolph.mathews@gmail.com > (github: dolph)
2014-03-10 22:17:03 -05:00
Victor Vieux
0d6275b298
if client has no git, use server
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-11 01:23:14 +00:00
Victor Vieux
8301fc8e56
move git clone from daemon to client
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
add a little doc
2014-03-11 01:23:14 +00:00
Michael Crosby
b5a544b02e
Merge pull request #4563 from creack/signal-improvment
...
Signal improvments
2014-03-10 17:59:17 -07:00
Tianon Gravi
ce09171780
Merge pull request #4520 from tianon/clarify-docs-branch-update
...
Clarify how to update the docs branch in the RELEASE-CHECKLIST with concrete instructions
2014-03-10 18:47:31 -06:00
Victor Vieux
7fc4cc0759
Merge pull request #4567 from creack/merge_auth_registry
...
Merge auth package within registry
2014-03-10 17:45:56 -07:00
Michael Crosby
923962a4b5
Merge pull request #4515 from vieux/improve_sort_flags
...
improve alpha sort in mflag
2014-03-10 17:45:41 -07:00
Guillaume J. Charmes
157f24ca77
Make docker use the signal pkg with strings
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-10 17:36:47 -07:00
Guillaume J. Charmes
10dc16dcd3
Create portable signalMap
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-10 17:36:41 -07:00
Guillaume J. Charmes
c563262239
Move signal to pkg
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-10 17:36:32 -07:00
Michael Crosby
0b8cd3ec8e
Merge pull request #4566 from srid/nsinit_uniq_errors
...
nsinit: prefix errors with their source
2014-03-10 17:26:17 -07:00
Guillaume J. Charmes
8d88ea0c15
Merge auth package within registry
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-10 17:16:58 -07:00
srid
03211ecce0
nsinit: prefix errors with their source
...
Docker-DCO-1.1-Signed-off-by: Sridhar Ratnakumar <github@srid.name > (github: srid)
2014-03-10 17:08:50 -07:00
Michael Crosby
bc513c5afb
Merge pull request #4564 from vieux/remove_unused_version
...
Remove unused version.go
2014-03-10 17:06:30 -07:00
Michael Crosby
ca3369dc8d
Merge pull request #4440 from infoxchange/aufs-permissions-4068
...
Create directories for tar files with relaxed permissions
2014-03-10 16:50:17 -07:00
unclejack
8bcb156694
Merge pull request #3985 from creack/add_freebsd_support
...
Add freebsd client support
2014-03-11 00:58:30 +02:00
Guillaume J. Charmes
3c25302a0b
Update vendor.sh with new kr/pty revision
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-10 15:34:38 -07:00
Guillaume J. Charmes
6ccfb7fb9a
Update bsd specs
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-03-10 15:19:08 -07:00
Guillaume J. Charmes
802407a099
Update vendor for kr/pty
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-03-10 15:18:54 -07:00
Victor Vieux
6f70ed3a74
remove useless lock
...
move job to server and remove version.go
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-10 22:14:37 +00:00
Michael Crosby
3c7206b991
Merge pull request #4562 from vieux/remove_utils_in_docker_package
...
Remove utils in docker package
2014-03-10 14:27:13 -07:00
Guillaume J. Charmes
51b137f09e
Merge pull request #4561 from crosbymichael/merge_release_v0.9.0
...
Merge release v0.9.0
2014-03-10 14:24:25 -07:00
Victor Vieux
fde5f573d3
move opts out of pkg because it's related to docker
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-10 21:10:23 +00:00
Michael Crosby
d7646f934a
Change version to v0.9.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-10 14:08:26 -07:00
Michael Crosby
71c65193e0
Merge branch 'release' into merge_release_v0.9.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-10 14:08:17 -07:00
Victor Vieux
d648708d02
remove utils.go
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-10 21:06:27 +00:00
unclejack
52c258c5cf
Merge pull request #4538 from crosbymichael/move-runtime
...
Move runtime into sub package
2014-03-10 22:52:32 +02:00
Guillaume J. Charmes
4fa8d0794e
Merge pull request #4542 from fabiofalci/remove_manual_cookie
...
Remove manual http cookie management
2014-03-10 13:51:02 -07:00
unclejack
9bfbc7e648
Merge pull request #4560 from vieux/move_unit_test
...
move a unit test file
2014-03-10 22:45:41 +02:00
Victor Vieux
0ebf5d0ab3
move a unit test file
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-10 20:24:15 +00:00
Guillaume J. Charmes
bb43761940
Merge branch 'master' into add_freebsd_support
...
Conflicts:
archive/archive.go
archive/start_unsupported.go
2014-03-10 13:20:49 -07:00
James Turnbull
2b1244fc0d
Merge pull request #4559 from metalivedev/unmaintainer
...
Removing myself from doc maintainers
2014-03-10 15:59:50 -04:00
Andy Rothfusz
3e4d0857bf
Removing myself from doc maintainers due to other obligations eliminating time to maintain docs.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
2014-03-10 12:55:26 -07:00
Michael Crosby
143c9707a9
Merge pull request #4489 from crosbymichael/bump_v0.9.0
...
Bump to version 0.9.0
2014-03-10 10:04:33 -07:00
Tianon Gravi
2b3fdf2344
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)
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com > (github: crosbymichael)
2014-03-10 09:57:10 -07:00
Tianon Gravi
211fc574a1
Merge pull request #4545 from tianon/update-packaging-and-init
...
Fix a few packaging bugs, including and especially a temporary patch to our upstart script to mount cgroups
2014-03-10 10:52:45 -06:00
Tianon Gravi
50082f792b
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)
2014-03-10 03:27:46 -06:00
Michael Crosby
47edf3e8bf
Add IsRunning to server interface
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-09 23:16:15 -07:00
Michael Crosby
36c3614fdd
Move runtime and container into sub pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-09 23:03:40 -07:00
Michael Crosby
01b6b2be73
Move graph and tags to graph sub pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-09 22:59:29 -07:00
Michael Crosby
82a5439835
Move image into sub pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-09 22:59:29 -07:00
Michael Crosby
12bd83182d
Move daemon config into sub pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-09 22:59:28 -07:00
Rovanion Luckey
b24be254fa
All caps variables in normal bash should be avoided not to accidentally collide with environment variables.
...
Docker-DCO-1.1-Signed-off-by: Rovanion Luckey <rovanion.luckey@gmail.com > (github: Rovanion)
2014-03-09 11:08:11 +01:00
Fabio Falci
df9b99aca0
Remove manual http cookie management
...
Since docker uses cookiejar it doesn't need to manage cookies manually
anymore.
Managing cookie was duplicating it.
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: fabiofalci)
2014-03-09 02:25:19 +00:00
Sven Dowideit
d9f47c41c3
Merge pull request #4508 from walterl/patch-1
...
Fixed installmirrors ref
2014-03-09 10:15:47 +10:00
Scott Collier
694c8e7dfc
Adding options to docker restart documentation
...
URL of page is: http://docs.docker.io/en/latest/reference/commandline/cli/#restart
Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com > (github: scollier)
2014-03-08 17:23:06 -06:00
Johannes 'fish' Ziemke
c000cb6471
Add authenticated TLS support for API
...
Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org > (github: discordianfish)
2014-03-09 00:06:44 +01:00
James Turnbull
198f8d7884
Merge pull request #4528 from tomfotherby/patch-1
...
Correct Docker run --host param to --hostname
2014-03-08 17:53:55 -05:00
Scott Collier
59acb8c83d
Adding the new options to the docker ps documentation.
...
URL of documentation page is: http://docs.docker.io/en/latest/reference/commandline/cli/#ps
Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com > (github: scollier)
2014-03-08 16:32:00 -06:00
Tianon Gravi
68217729a3
Merge pull request #4540 from unclejack/debootstrap_upgrade_packages
...
Run dist-upgrade after repo updates in mkimage-debootstrap
2014-03-08 10:10:11 -07:00
unclejack
d04f4d836c
upgrade packages after debootstrap
...
This makes mkimage-debootstrap upgrade packages after retrieving
updated lists of packages.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-03-08 18:41:50 +02:00
unclejack
a5c6e08bd6
Merge pull request #4535 from vieux/fix_string_command
...
fix string in docker images
2014-03-08 17:02:25 +02:00
Victor Vieux
7da37fec13
handle capital
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-07 23:40:45 +00:00
Michael Crosby
0ab7b6952a
Bump to version 0.9.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-07 15:38:10 -08:00
Michael Crosby
ccdf27e502
Merge branch 'master' into bump_v0.9.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-07 15:37:29 -08:00
Michael Crosby
d8425d98e6
Merge pull request #4534 from creack/fix_race_kill
...
Fix Race when killing the daemon
2014-03-07 18:11:51 -05:00
Sven Dowideit
65283afc8b
Merge pull request #4524 from gurjeet/patch-3
...
Correct typo
2014-03-08 08:43:16 +10:00
Victor Vieux
bc086a9cd6
fix string in docker images
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-07 20:07:17 +00:00
Guillaume J. Charmes
b845ff355a
Fix Race when killing the daemon
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-03-07 11:51:28 -08:00
Victor Vieux
27eae50224
Merge pull request #4529 from pmorie/typo
...
Fix typo in devmapper driver_test
2014-03-07 11:01:04 -08:00
Guillaume J. Charmes
f27ad07139
Merge pull request #4516 from tianon/fix-static-dockerinit
...
Fix dynbinary so that dockerinit can still be properly static even if it has to link against libapparmor for Ubuntu
2014-03-07 10:15:49 -08:00
Guillaume J. Charmes
5b0ca89e2a
Merge pull request #4519 from crosbymichael/back-to-pivot-root
...
Use env var to toggle pivot root or ms_move
2014-03-07 10:12:00 -08:00
Paul Morie
b3e7df48df
Fix typo in devmapper driver_test
...
Docker-DCO-1.1-Signed-off-by: Paul Morie <pmorie@gmail.com > (github: pmorie)
2014-03-07 12:20:25 -05:00
Tom Fotherby
d61938d2b8
Correct Docker run --host param to --hostname
2014-03-07 16:41:11 +00:00
Gurjeet Singh
6d9a7d6bc3
Correct typo
2014-03-07 08:45:08 -05:00
Sven Dowideit
3e5102c11e
Merge pull request #4522 from liubin0329/patch-1
...
removing redundant dot
2014-03-07 23:20:02 +10:00
bin liu
29079f03cf
removing redundant dot
...
Maybe it's a typo
2014-03-07 18:19:18 +08:00
Tianon Gravi
661cf32e4f
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)
2014-03-06 23:29:08 -07:00
Tianon Gravi
0a819380c5
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)
2014-03-06 23:16:26 -07:00
Tianon Gravi
aceb10b1e5
Resync the DCO text with upstream at http://developercertificate.org/
...
```
Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.
```
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-06 22:32:58 -07:00
Tianon Gravi
a40bb2aabc
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)
2014-03-06 21:22:25 -07:00
Michael Crosby
36dd124b16
Add env var to toggle pivot root or ms_move
...
Use the DOCKER_RAMDISK env var to tell the native driver not to use
a pivot root when setting up the rootfs of a container.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-06 19:30:52 -08:00
Tianon Gravi
be344cf0d8
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)
2014-03-06 19:55:22 -07:00
Victor Vieux
3729ece2ea
improve alpha sort in mflag
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-07 02:20:59 +00:00
Michael Crosby
c38635020a
Revert "Revert "libcontainer: Use pivot_root instead of chroot""
...
This reverts commit 82f797f140michael@crosbymichael.com > (github: crosbymichael)
2014-03-06 17:19:59 -08:00
Michael Crosby
557e4fef44
Revert "Revert "libcontainer: Use MS_PRIVATE instead of MS_SLAVE""
...
This reverts commit bd263f5b15michael@crosbymichael.com > (github: crosbymichael)
2014-03-06 17:19:47 -08:00
unclejack
78dc1ede52
Merge pull request #4512 from crosbymichael/no-pivot-root
...
No pivot root because of ramdisk
2014-03-07 02:54:03 +02:00
unclejack
f244d9763e
Merge pull request #4511 from crosbymichael/ensure-native-containers-die
...
Ensure that native containers die with the parent
2014-03-07 02:49:10 +02:00
Michael Crosby
bd263f5b15
Revert "libcontainer: Use MS_PRIVATE instead of MS_SLAVE"
...
This reverts commit 757b577572michael@crosbymichael.com > (github: crosbymichael)
2014-03-06 16:41:03 -08:00
Michael Crosby
82f797f140
Revert "libcontainer: Use pivot_root instead of chroot"
...
This reverts commit 5b5c884cc8michael@crosbymichael.com > (github: crosbymichael)
2014-03-06 16:32:06 -08:00
Michael Crosby
ea9bce8724
Ensure that native containers die with the parent
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-06 16:30:56 -08:00
unclejack
1695c77c43
Merge pull request #4509 from crosbymichael/kill-all
...
Remove the ghosts and kill everything
2014-03-07 01:35:38 +02:00
Michael Crosby
772ef99d28
Remove the ghosts and kill everything
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-06 15:30:26 -08:00
James Turnbull
eda43fc70f
Merge pull request #4510 from vieux/fix_param_doc
...
Fix name parameter
2014-03-06 17:55:57 -05:00
Andy Rothfusz
44fc1dfca2
Merge pull request #4475 from ubermuda/patch-1
...
Added Docker-PHP to the list of client libs
2014-03-06 14:54:33 -08:00
Victor Vieux
476c290b07
Fix name parameter
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-06 22:51:44 +00:00
unclejack
e4ebe6a12f
Merge pull request #4488 from crosbymichael/return-correct-lxc-pid
...
Return correct process pid for lxc
2014-03-07 00:14:08 +02:00
unclejack
e388b6aba5
Merge pull request #3959 from cpuguy83/3958_add_ability_to_remove_running_container_in_single_command
...
Add ability to force removal of running container via docker rm -f
2014-03-07 00:05:57 +02:00
Guillaume J. Charmes
b722aa21b7
Merge pull request #4506 from creack/fix_apparmor
...
Use CGO for apparmor profile switch
2014-03-06 13:37:34 -08:00
Walter Leibbrandt
188dea9e0e
Fixed installmirrors ref
...
Nested inline markup is not (yet) possible: http://stackoverflow.com/a/9645684
2014-03-06 23:33:08 +02:00
Guillaume J. Charmes
2128eb52ed
Merge pull request #7 from tianon/fix-hack-tags
...
Update build tags such that we can properly compile on all platforms
2014-03-06 12:49:05 -08:00
Tianon Gravi
0b23393ba1
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)
2014-03-06 13:39:17 -07:00
Guillaume J. Charmes
c89fa6645e
Add buildflags to allow crosscompilation for apparmor
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-03-06 12:05:03 -08:00
Geoffrey Bachelet
511b57bee5
Added Docker-PHP to the list of client libs
...
Docker-DCO-1.1-Signed-off-by: Geoffrey Bachelet <geoffrey.bachelet@gmail.com > (github: ubermuda)
2014-03-06 20:33:51 +01:00
Victor Vieux
83ffc2860b
Merge pull request #3612 from EvanKrall/specify_socket_group
...
Create a -G option that specifies the group which unix sockets belong to...
2014-03-06 11:30:17 -08:00
Guillaume J. Charmes
31f62b934b
Merge pull request #4503 from unclejack/attempt_to_fix_apparmor_profile
...
remove dbus from apparmor profile for Ubuntu 12.04
2014-03-06 11:20:06 -08:00
Evan Krall
644acec2f7
Create a -G option that specifies the group which unix sockets belong to.
...
Docker-DCO-1.1-Signed-off-by: Evan Krall <krall@yelp.com > (github: EvanKrall)
2014-03-06 11:17:04 -08:00
Guillaume J. Charmes
f0f833c6d7
Use CGO for apparmor profile switch
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-03-06 11:10:58 -08:00
unclejack
46fdb6af8e
remove dbus from apparmor profile
...
This removes the dbus entry from the apparmor profile Docker creates.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-03-06 19:47:03 +02:00
Alexander Larsson
81f148be56
devmapper: Increase sleep times and unlock while sleeping
...
We've seen some cases in the wild where waiting for unmount/deactivate
of devmapper devices taking a long time (several seconds). So, we increase
the sleeps to 10 seconds before we timeout. For instance:
https://github.com/dotcloud/docker/issues/4389
But, in order to not keep other processes blocked we unlock the global
dm lock while waiting to allow other devices to continue working.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-06 18:36:08 +01:00
Alexander Larsson
3e8a02a939
devmapper: Add per-device lock
...
We currently use a global lock to protect global data (like the
Devices map) as well as device data itself and access to
(non-threadsafe) libdevmapper.
This commit also adds a per-device lock, which will allow per-device
operations to temporarily release the global lock while e.g. waiting.
The per-device lock will make sure that nothing else accesses that
device while we're operating on it.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-06 18:36:03 +01:00
Michael Crosby
6af82bf4ca
Merge pull request #4498 from alexlarsson/fix-cloexec-race
...
libcontainer: Don't use UsetCloseOnExec, it is racy
2014-03-06 11:45:26 -05:00
James Turnbull
c273a93cf9
Merge pull request #4474 from timthelion/master
...
Change mustn't to must not
2014-03-06 09:48:59 -05:00
Alexander Larsson
1cdd775f5d
DeviceMapper: Succeed immediately when removing non-existant devices
...
We've seen situations where removal of "ID-init" failed during
container deletion (EBUSY), after removal of "ID" has succeeded. This
caused the container delete operation to fail, and on the next delete
attempt the removal of "ID" failed immediately with "does not exist".
Ideally we should not fail the ID-init removal, but its also non-ideal
to allow a state where the container is half-removed and we cannot
make progress deleting the container. So, we silently ignore not-exist
errors on device removal.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-06 15:12:09 +01:00
Alexander Larsson
5c9b28db18
libcontainer: Don't use UsetCloseOnExec, it is racy
...
We can't keep file descriptors without close-on-exec except with
syscall.ForkLock held, as otherwise they could leak by accident into
other children from forks in other threads.
Instead we just use Cmd.ExtraFiles which handles all this for us.
This fixes https://github.com/dotcloud/docker/issues/4493
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-06 14:10:32 +01:00
Michael Crosby
69e3d30bb6
Return correct process pid for lxc
...
Fixes #2875
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-05 18:02:19 -08:00
Andy Rothfusz
fb314c266b
Merge pull request #4129 from proppy/patch-2
...
hack/RELEASE: add step for updating doc branch
2014-03-05 16:08:37 -08:00
Guillaume J. Charmes
1ad14effb5
Merge pull request #4264 from ndarilek/2973-skip-volumes-from
...
Don't call applyVolumesFrom on containers with volumes already configure...
2014-03-05 15:44:15 -08:00
Sven Dowideit
8d947da826
Merge pull request #4468 from bcbcarl/4467-dockerjs-outdated
...
Flag 'docker-js' as outdated (Fix #4467 )
2014-03-06 09:37:34 +10:00
Victor Vieux
3ab4a28807
Merge pull request #4477 from creack/apparmor_native
...
Add AppArmor support to native driver + change pipe/dup logic
2014-03-05 15:23:31 -08:00
Tianon Gravi
d03be9d7cf
Merge pull request #4463 from tianon/update-packagers-doc-and-lxc-dep
...
Update PACKAGERS.md and hack/make/ubuntu
2014-03-05 16:15:16 -07:00
Guillaume J. Charmes
920a6ca54c
Generate and load custom docker profile for apparmor
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-03-05 15:02:11 -08:00
Guillaume J. Charmes
4b700dbe85
Merge pull request #6 from crosbymichael/tryagain2
...
Some cleanup around logs
2014-03-05 13:54:21 -08:00
Michael Crosby
37f137c822
Some cleanup around logs
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-05 13:50:49 -08:00
Guillaume J. Charmes
cb4189a292
Add AppArmor support to native driver + change pipe/dup logic
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-03-05 13:08:24 -08:00
Michael Crosby
a24a802193
Merge pull request #4478 from vieux/add_missing_--_native
...
Add missing -- when we run dockerinit from native
2014-03-05 15:35:25 -05:00
Andy Rothfusz
34fe14f174
Merge pull request #4444 from SvenDowideit/update-host-integration-docs
...
update to use --name, and add a little more detail to how docker start -a works
2014-03-05 12:30:55 -08:00
Andy Rothfusz
ac734f0d36
Merge pull request #4392 from SvenDowideit/small-doc-fixes
...
Small doc fixes
2014-03-05 12:29:46 -08:00
Andy Rothfusz
bb0211ff30
Merge pull request #4449 from jamtur01/readme
...
Some fixes and 0.9.0 pre-req changes to the README.md
2014-03-05 12:28:32 -08:00
James Turnbull
046e6604e5
Some updates to the README.md
...
* Updated pre-reqs for 0.9.
* Fixed a couple of docker to Docker.
* Fixed the Docker build example to be correct.
* Reformatted a bunch of paragraphs
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-03-05 15:27:49 -05:00
Victor Vieux
c987901f8d
Add missing -- when we run dockerinit from native
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-05 20:26:48 +00:00
unclejack
c05e095baa
Merge pull request #4476 from vieux/improve_flags
...
Improve flags
2014-03-05 21:59:05 +02:00
Victor Vieux
069dc7f8c7
fix panic with only long flags or only one deprecatd
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-05 19:45:57 +00:00
Victor Vieux
089bf5e11e
fix usage for completly deprecated flag
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-05 19:27:39 +00:00
Victor Vieux
7ec82aa727
Merge pull request #4471 from unclejack/fix_integration_test_deprecation_warnings
...
fix flag deprecation warnings in integration tests
2014-03-05 11:00:56 -08:00
Victor Vieux
9101686161
Merge pull request #4462 from jamtur01/langfix
...
Updated a variety of language and error messages
2014-03-05 10:22:51 -08:00
Victor Vieux
2a8c927f33
Merge pull request #4461 from jamtur01/capital
...
Consistently capitalize CLI options
2014-03-05 10:21:20 -08:00
Timothy Hobbs
47f1609f5c
Change mustn't to must not
...
mustn't is ambiguous. It may mean "you don't need to" even when it's not a tag question. See prose:
http://books.google.cz/books?id=otFPvwLG524C&pg=PA241&lpg=PA241&dq=mustn%27t+trouble+yourself&source=bl&ots=vjgh7n-yyW&sig=LBQAwlZu3GxI5YzvRAXFow4hE1U&hl=en&sa=X&ei=a14XU9vxB4SBywOPz4HwDw&ved=0CDQQ6AEwAg#v=onepage&q=mustn%27t%20trouble%20yourself&f=false
http://www.nytimes.com/books/first/m/maynard-home.html (search for mustn't)
We mustn't argue over grammar.
See: https://github.com/dotcloud/docker/pull/4473
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: timthelion)
2014-03-05 17:33:18 +00:00
Michael Crosby
858d0356fd
Merge pull request #4278 from alexlarsson/system
...
Create pkg/system and move stuff there from archive
2014-03-05 12:32:35 -05:00
Michael Crosby
ad68ab19e0
Merge pull request #4465 from alexlarsson/private
...
libcontainer: Use MS_PRIVATE instead of MS_SLAVE
2014-03-05 12:16:18 -05:00
Tianon Gravi
c41e51ce3d
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)
2014-03-05 08:20:42 -07:00
unclejack
35054601d8
fix flag deprecation warnings in integration tests
...
This removes three warnings in the integration tests:
Warning: '-viz' is deprecated, it will be removed soon. See usage.
Warning: '-tree' is deprecated, it will be removed soon. See usage.
Warning: '-cidfile' is deprecated, it will be removed soon. See usage.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-03-05 16:43:03 +02:00
Alexander Larsson
d6114c0da0
Create pkg/system and move stuff there from archive
...
This is a package for generic system calls etc that for some reason
is not yet supported by "syscall", or where it is different enough
for the different ports to need portability wrappers.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-05 14:05:32 +01:00
Carl X. Su
5e32c40795
Flag 'docker-js' as outdated
2014-03-05 20:16:41 +08:00
Alexander Larsson
757b577572
libcontainer: Use MS_PRIVATE instead of MS_SLAVE
...
Now that we unmount all the mounts from the global namespace we can
use a private namespace rather than a slave one (as we have no need
for unmounts of inherited global mounts to propagate into the
container).
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-05 09:40:54 +01:00
Tianon Gravi
5317ad476d
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)
2014-03-04 22:59:46 -07:00
Tianon Gravi
4293a1ceb4
Update the relevant docs section to match PACKAGERS.md
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-04 22:54:58 -07:00
Tianon Gravi
b69f632830
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)
2014-03-04 22:52:39 -07:00
Tianon Gravi
615667b883
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)
2014-03-04 22:51:34 -07:00
Tianon Gravi
d9ec3a0347
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)
2014-03-04 21:41:59 -07:00
Tianon Gravi
9a677e6a68
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)
2014-03-04 21:40:42 -07:00
Tianon Gravi
a7f265223a
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)
2014-03-04 21:25:00 -07:00
Tianon Gravi
6f2564350f
Merge pull request #4455 from lsm5/systemd
...
Bump container limit via systemd conf file
2014-03-04 20:37:16 -07:00
Lokesh Mandvekar
291d5e642e
bump open files and procs limit via unitfile
...
Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com > (github: lsm5)
modified: contrib/init/systemd/docker.service
modified: contrib/init/systemd/socket-activation/docker.service
2014-03-04 22:29:51 -05:00
Sven Dowideit
cadd94f44c
implement pharvey's suggestions
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-03-05 13:12:29 +10:00
Sven Dowideit
28a545d294
Show some ENV / local updated baseimage tricks that use an apt-cacher-ng proxy to make debian based installations instant
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-03-05 13:12:25 +10:00
Sven Dowideit
83de8bb842
Closes #4374
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
\nDocker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: )
2014-03-05 02:41:14 +00:00
James Turnbull
9cbf22dee2
Updated a variety of language and error messages
...
In api/client.go updated:
1. Made api == API
2. Restated Docker daemon connection error to be clearer.
3. Changed use of "Impossible" in error messages.
4. Removed extra space in restart error message.
5. Fixed capitalization in three error messages.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-03-04 20:52:48 -05:00
James Turnbull
725c7cd08a
Made CLI option capitalization consistent in api/client.go
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-03-04 20:45:22 -05:00
James Turnbull
41bf38e44d
Consistently capitalize CLI options
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-03-04 20:22:51 -05:00
Sven Dowideit
3acbd758d8
update to use --name, and add a little more detail to how docker start -a works
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-03-05 00:57:08 +00:00
Victor Vieux
e7055830ab
Merge pull request #4460 from crosbymichael/add-shm-size
...
Add shm size cap to mount
2014-03-04 14:20:20 -08:00
Michael Crosby
b07708c8de
Add shm size cap to mount
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-04 14:18:40 -08:00
Michael Crosby
19b898ad56
Merge pull request #4457 from creack/remove_loopback_mount
...
Remove loopback mount
2014-03-04 17:11:37 -05:00
Guillaume J. Charmes
57a47f5bbf
Remove /dev tmpfs mountpoint
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-03-04 13:21:22 -08:00
Guillaume J. Charmes
c74a8b28cd
remove /run mountpoint
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-03-04 12:32:17 -08:00
Guillaume J. Charmes
39d58129c3
Remove loopback mount bind
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-03-04 12:30:52 -08:00
unclejack
a0c465a333
Merge pull request #4456 from crosbymichael/change-veth-name
...
Change veth prefix back to veth
2014-03-04 21:51:44 +02:00
Michael Crosby
0cdf102638
Change veth prefix back to veth
...
Fixes #4453
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-04 11:46:05 -08:00
Michael Crosby
b63709c1f1
Merge pull request #4452 from crosbymichael/small-fixes-to-libcontainer
...
Add find tests and remove panic in DEBUG
2014-03-04 14:37:41 -05:00
unclejack
ba8d8f0abb
Merge pull request #4448 from alexlarsson/pivot_root
...
libcontainer: Use pivot_root instead of chroot
2014-03-04 19:59:16 +02:00
unclejack
17577a6dce
Merge pull request #4418 from SvenDowideit/mention-expose-in-port-mapping-deprecation
...
make the port mapping deprecation error message more obvious
2014-03-04 19:44:06 +02:00
Michael Crosby
7e52445f2f
Add find tests and remove panic in DEBUG
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-04 08:55:12 -08:00
James Turnbull
20ddd34d05
Merge pull request #4438 from crosbymichael/update-docs
...
Update daemon docs for exec drivers
2014-03-04 07:56:30 -05:00
Alexander Larsson
5b5c884cc8
libcontainer: Use pivot_root instead of chroot
...
Instead of keeping all the old mounts in the container namespace and
just using subtree as root we pivot_root so that the actual root in
the namespace is the root we want, and then we unmount the previous
mounts.
This has multiple advantages:
* The namespace mount tree is smaller (in the kernel)
* If you break out of the chroot you could previously access the host
filesystem. Now the host filesystem is fully invisible to the namespace.
* We get rid of all unrelated mounts from the parent namespace, which means
we don't hog these. This is important if we later switch to MS_PRIVATE instead
of MS_SLAVE as otherwise these mounts would be impossible to unmount from the
parent namespace.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-04 12:44:08 +01:00
Alexey Kotlyarov
2aeccdd3bb
Create directories for tar files with relaxed permissions
...
Docker-DCO-1.1-Signed-off-by: Alexey Kotlyarov <alexey@infoxchange.net.au > (github: koterpillar)
2014-03-04 16:15:52 +11:00
Darren Shepherd
b39d02b611
Support hairpin NAT without going through docker server
...
Hairpin NAT is currently done by passing through the docker server. If
two containers on the same box try to access each other through exposed
ports and using the host IP the current iptables rules will not match the
DNAT and thus the traffic goes to 'docker -d'
This change drops the restriction that DNAT traffic must not originate
from docker0. It should be safe to drop this restriction because the
DOCKER chain is already gated by jumps that check for the destination
address to be a local address.
Docker-DCO-1.1-Signed-off-by: Darren Shepherd <darren.s.shepherd@gmail.com > (github: ibuildthecloud)
2014-03-03 21:53:57 -07:00
Andy Rothfusz
fbc00df7a0
Merge pull request #4415 from iantruslove/patch-1
...
Fix minor typo
2014-03-03 17:58:03 -08:00
Michael Crosby
0f96a749ab
Update daemon docs for exec drivers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-03 17:43:08 -08:00
Guillaume J. Charmes
0eeb146398
Merge pull request #4270 from DevTable/fixregistryauth
...
Fix registry auth and remove other hidden ping commands from client code
2014-03-03 17:34:21 -08:00
unclejack
d761ebea6f
Merge pull request #4382 from unclejack/fix_symlink_handling
...
handle symlinks for Docker's root dir & TMPDIR
2014-03-04 03:23:11 +02:00
Sven Dowideit
2275c83358
make the port mapping deprecation error message more obvious see 4075
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-03-04 10:45:26 +10:00
Tianon Gravi
52d212aa6e
Merge pull request #4437 from SvenDowideit/tweak-DCO-hook-for-windows
...
Replace `echo -e` with the portable `{ echo; echo ...; }`
2014-03-03 17:43:37 -07:00
Sven Dowideit
4f29836f71
nope, echo -e isn't portable
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-03-04 10:40:36 +10:00
Guillaume J. Charmes
69c69059fc
Merge pull request #4327 from crosbymichael/add-libcontainer
...
Add native execution driver to docker and make it the default
2014-03-03 16:34:20 -08:00
Michael Crosby
77766834a3
Merge pull request #12 from SvenDowideit/add-libcontainer-minor-doc-tweak
...
very minor spelling
2014-03-03 19:19:16 -05:00
Tianon Gravi
93c1a7b796
Merge pull request #4419 from SvenDowideit/tweak-DCO-hook-for-windows
...
Fix newlines echoing in DCO git hook contrib script
2014-03-03 17:14:08 -07:00
Sven Dowideit
2e71adac9f
very minor spelling
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-03-04 10:12:12 +10:00
Sven Dowideit
43feb84203
it seems on MSWindows MSYS bash, echo n puts a literal \n (not a newline) into the commit message, so lets get more primitive
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-03-04 10:08:40 +10:00
Tianon Gravi
b1267cb6ad
Merge pull request #4435 from vieux/warning_makefile
...
Remove warnings from Makefile
2014-03-03 16:40:31 -07:00
Victor Vieux
b9cb95c0a0
remove warnings from makefile
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-03 23:32:25 +00:00
Sven Dowideit
fca4cf6f0a
Merge pull request #4413 from jamtur01/exemption
...
Added documentation (and some cleanup) around small patch exemptions
2014-03-04 09:10:37 +10:00
Michael Crosby
5639b29b78
Merge pull request #4432 from vieux/fix_warning_as_error
...
fix warning can't docker run
2014-03-03 17:16:25 -05:00
Victor Vieux
e23b4e5d15
fix warning can't docker run
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-03 22:07:42 +00:00
unclejack
611acf7a7c
handle symlinks for Docker's root dir & TMPDIR
...
This removes the incomplete symlink handling from engine.go and it adds
it one place in docker.go.
It also enables handling symlinks for TMPDIR.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-03-03 23:00:53 +02:00
unclejack
aac9542a68
Merge pull request #4412 from crosbymichael/fix-env-clobber
...
Don't always just append env vars, replace defaults with ones from confi...
2014-03-03 22:52:03 +02:00
Victor Vieux
37d0ce42c6
Merge pull request #4385 from khia/json_format
...
Support json output in --format flag of docker inspect
2014-03-03 12:36:47 -08:00
Michael Crosby
5465fdf00f
Factor out finalize namespace
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-03 12:15:47 -08:00
Guillaume J. Charmes
e070db75fe
Merge pull request #4428 from vieux/add_warning_flags
...
add warning for deprecatd flags
2014-03-03 12:09:09 -08:00
Victor Vieux
bb5ed45224
add warning for deprecatd flags
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-03 19:57:05 +00:00
Michael Crosby
2f35f8e2a8
Update readme to remove .nspid
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-03 11:31:37 -08:00
unclejack
93f925c533
Merge pull request #4426 from vieux/prevent_grouping_--
...
prevent flag grouping with --
2014-03-03 21:30:49 +02:00
Victor Vieux
cb3d27d01b
prevent flag grouping with --
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-03 19:17:28 +00:00
Victor Vieux
23ec7e637c
Merge pull request #4377 from vieux/fix_4358
...
fix fedora tty with apparmor
2014-03-03 11:10:09 -08:00
unclejack
7531f82c70
Merge pull request #4321 from vieux/docker_run_-it
...
Add support for docker run -it or docker images -qa
2014-03-03 20:52:10 +02:00
Victor Vieux
954a913c1f
Merge pull request #2 from SvenDowideit/docker_run_-it_docs
...
add a little bit mentioning commandline option combinations
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-03 18:48:47 +00:00
Victor Vieux
690fb50beb
Merge pull request #4398 from philips/fix-socket-activation
...
fix(api): serve until the "acceptconnections" job
2014-03-03 10:19:51 -08:00
Michael Crosby
62d604a81e
Merge pull request #4200 from alexlarsson/fix-fedora-tests
...
Fix fedora tests
2014-03-03 10:54:31 -05:00
Tianon Gravi
ded2fb883d
Merge pull request #4420 from unclejack/bump_to_go_1.2.1
...
Bump Go to 1.2.1 in the Dockerfile
2014-03-03 07:56:31 -07:00
Alexander Larsson
9e28c3e3f8
aufs: Skip tests if aufs not supported
...
This makes it possible to pass the rest of the testsuite without aufs in the kernel.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-03 15:11:49 +01:00
Alexander Larsson
e8af7fcf6d
runtime: Fix unique constraint error checks
...
The sqlite3 version in fedora (3.8) returns a different error string in the unique constraints
failure case than the one in hack/ (3.7). This updates the check to detect both, fixing
one integration check failure on Fedora.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-03 15:10:52 +01:00
unclejack
4a688d6864
bump go to 1.2.1 in the Dockerfile
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-03-03 15:09:54 +02:00
James Turnbull
37893c3db0
Merge pull request #4406 from funkymonkeymonk/voldocs
...
adding note that host-volumes must be defined using absolute paths
2014-03-02 23:19:09 -05:00
James Turnbull
881cdd2a02
Merge pull request #4410 from 1uptalent/fix_typo_in_build_command_doc
...
DOC: Fix switch name for tagging images in build command
2014-03-02 23:17:51 -05:00
James Turnbull
8f57f77160
Merge pull request #4176 from SvenDowideit/how-to-backup-volumes
...
add some info wrt backup and restore of volumes
2014-03-02 17:41:39 -05:00
Ian Truslove
3de1d25c11
Fix minor typo
2014-03-02 13:32:48 -07:00
James Turnbull
b187d7ae41
Added documentation (and some cleanup) around small patch exemptions
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-03-02 11:43:18 -05:00
Tianon Gravi
10137a561c
Merge pull request #4399 from barnybug/fish-completions
...
Add fish shell completions from github.com/barnybug/docker-fish-completion
2014-03-02 08:45:09 -07:00
Tianon Gravi
a61096ec70
Merge pull request #4411 from lewispeckover/fix_mkimage-yum_mknod
...
Add "mkdir /dev" before doing mknod in mkimage-yum
2014-03-02 08:44:54 -07:00
Lewis Peckover
6d55a9d7ce
mkdir /dev before doing mknod
...
Docker-DCO-1.1-Signed-off-by: Lewis Peckover <lew@lew.io > (github: lewispeckover)
2014-03-02 14:50:16 +00:00
German DZ
62b88cd619
DOC: Fix switch name for tagging images in build command
...
Docker-DCO-1.1-Signed-off-by: German Del Zotto <germ@ndz.com.ar > (github: GermanDZ)
2014-03-02 13:50:34 +01:00
FunkyMonkeyMonk
3ddfbf6880
adding note that host-volumes must be defined using absolute paths
...
Docker-DCO-1.1-Signed-off-by: Will Weaver <monkey@buildingbananas.com > (github: funkymonkeymonk)
2014-03-01 20:43:53 -05:00
Brandon Philips
8d2226b7e5
fix(api): serve until the "acceptconnections" job
...
This fixes a bug that I encountered when using socket activation with
docker 0.8.1. When running the first `docker run` it would return:
"create: command not found".
The root cause was the socket activation code path was starting to
listen before the "initserver" job had finished. This meant that the
"create" handler hand't been registered yet leading to the command not
found error.
In log format it looks like this:
```
[/var/lib/docker|9d2e78e9] +job initserver()
2014/03/01 04:05:35 Listening for HTTP on fd ()
[/var/lib/docker|0d71c177] +job create()
create: command not found
[/var/lib/docker|0d71c177] -job create()
[/var/lib/docker|0d71c177] +job acceptconnections()
[/var/lib/docker|0d71c177] -job initserver() = OK (0)
```
To fix the issue select on the activationLock and block until the
"acceptconnections" job has ran.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-03-01 10:55:36 -08:00
Barnaby Gray
bf6adf952b
Add fish shell completions from https://github.com/barnybug/docker-fish-completion .
...
Docker-DCO-1.1-Signed-off-by: Barnaby Gray <barnaby@pickle.me.uk > (github: barnybug)
2014-03-01 17:33:54 +00:00
Michael Crosby
f83482c918
Merge pull request #4395 from creack/remove_goroutine_leak_test
...
Make the chan for utils.Go buffered in order to avoid goroutine leak
2014-03-01 10:41:36 -05:00
Michael Crosby
b02b933c62
Don't always just append env vars, replace defaults with ones from config
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-01 03:46:45 -08:00
ILYA Khlopotov
e07920f680
Support json output in --format flag of docker inspect
...
Docker-DCO-1.1-Signed-off-by: ILYA Khlopotov <ilya.khlopotov@gmail.com > (github: khia)
2014-02-28 17:34:31 -08:00
Guillaume J. Charmes
d3a6ee1e55
Make the chan for utils.Go buffered in order to avoid goroutine leak
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-28 16:35:43 -08:00
Victor Vieux
6d6ec5e005
Merge pull request #4394 from creack/fix_tty_ghost
...
Check if the command exists before dereference
2014-02-28 15:53:27 -08:00
Guillaume J. Charmes
5ec6819705
Check if the command exists before dereference
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-28 15:39:24 -08:00
Sven Dowideit
5fde31ba9c
add some info wrt backup and restore of volumes
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-03-01 08:44:01 +10:00
Wes Morgan
3b969aad4a
merge existing config when committing
...
Fixes #1141
Docker-DCO-1.1-Signed-off-by: Wes Morgan <cap10morgan@gmail.com > (github: cap10morgan)
2014-02-28 15:27:05 -07:00
Victor Vieux
5f5880edb8
Merge pull request #4388 from vieux/fix_eventlisteners_nb
...
fix EventsListeners in docker info
2014-02-28 13:53:15 -08:00
Andy Rothfusz
ba2a042aea
Merge pull request #4390 from SvenDowideit/spelling-1
...
one ponted out by lukaspustina, and one that I bet I added
2014-02-28 13:39:40 -08:00
Andy Rothfusz
70d2ca4ed3
Merge pull request #4319 from jlhawn/docs-docker-io-api
...
Added documentation for docker.io OAuth & Accounts
2014-02-28 13:35:33 -08:00
Sven Dowideit
b16f466354
one ponted out by lukaspustina, and one that I bet I added
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-03-01 05:12:21 +10:00
Victor Vieux
0ca7df046b
fix EventsListeners in docker info
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-28 19:06:36 +00:00
Victor Vieux
142213ade8
Merge pull request #4379 from vieux/remove_warnings_twice
...
remove WARNING writter twice
2014-02-28 10:31:25 -08:00
unclejack
b4146fbe48
Merge pull request #4376 from vieux/fix_lxc_version
...
fix docker info with lxc 1.0.0
2014-02-28 20:04:11 +02:00
Brian Goff
d78fcb32ff
Add ability to force removal of running container via docker rm -f
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-02-27 23:31:36 -05:00
Victor Vieux
f67e725e68
remove WARNING writter twice
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-28 02:40:15 +00:00
Victor Vieux
6104f9f949
fix fedora tty with apparmor
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-28 01:20:10 +00:00
Victor Vieux
f30f823bf5
fix docker info with lxc 1.0.0
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-28 00:32:58 +00:00
Josh Hawn
b6a5082bd1
Updated OAuth docs per arothfusz's comments
...
Added emphasis of https for OAuth interactions.
Updated example URIs to use HTTPS
Included redirect hostname on authorization page.
Docker-DCO-1.1-Signed-off-by: Josh hawn <josh.hawn@docker.com > (github: jlhawn)
2014-02-27 14:21:24 -08:00
Sven Dowideit
cdec3297f7
add a little bit mentioning commandline option combinations
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-02-28 08:14:22 +10:00
Michael Crosby
44c3b71332
Ensure that ticker does not leak
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-27 11:40:25 -08:00
Victor Vieux
31e08fdc96
Merge pull request #4369 from tianon/better-archive-tar-vendor-import-path
...
Use a more defensive vendored archive/tar import path to make it clear this isn't upstream's released archive/tar
2014-02-27 10:37:38 -08:00
Andy Rothfusz
ce8a735248
Merge pull request #4318 from robpc/patch-1
...
Fixed typo in Dockerfile example
2014-02-27 10:19:09 -08:00
Michael Crosby
fdeea90fc8
Allow child process to live if daemon dies
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-27 09:33:36 -08:00
Tianon Gravi
e6784be628
Merge pull request #4365 from maztaim/master
...
Use mknod instead of MAKEDEV in mkimage-yum.sh
2014-02-27 10:14:22 -07:00
Tianon Gravi
2ca4e0ea60
Use a more defensive vendored archive/tar import path to make it clear this isn't upstream's released archive/tar
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-27 09:43:44 -07:00
Michael Crosby
a115ce797b
Ensure that the container dir is remove on restore
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-27 08:28:55 -08:00
Tim Bosse
1d82091756
Some distributions no longer include MAKEDEV script. Stole this from mkimage-rinse.sh.
...
Docker-DCO-1.1-Signed-off-by: Tim Bosse <taim@bosboot.org > (github: maztaim)
2014-02-26 22:34:42 -05:00
Michael Crosby
fb08b8b221
Code review updates
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-26 19:21:46 -08:00
Michael Crosby
01dc79b3ea
Merge pull request #4276 from tianon/json-stream-newlines
...
Add newlines to the JSON stream functions
2014-02-26 21:25:42 -05:00
Victor Vieux
389eba4396
Merge pull request #4297 from dotcloud/add-simple-checksum
...
registry: Added simple checksums (sha256) for layers
2014-02-26 18:15:48 -08:00
Michael Crosby
7cd2245947
Ensure that loopback devices are mounted inside the conatiner
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-26 17:21:09 -08:00
robpc
1475dafd52
Fixed typo in Dockerfile example
...
Docker-DCO-1.1-Signed-off-by: Rob Cannon <rpcann@gmail.com > (github: robpc)
The 'true' command is located in /bin not /usr/bin in the busybox image.
2014-02-26 19:38:51 -05:00
Michael Crosby
70820b69ec
Make network a slice to support multiple types
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-26 14:20:41 -08:00
Michael Crosby
ce08083f9c
Merge branch 'master' into add-libcontainer
...
Conflicts:
execdriver/termconsole.go
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-26 12:55:24 -08:00
Michael Crosby
0e356d49aa
Merge pull request #4346 from creack/fix_race_exit_code
...
Fix exit code issue with TTY mode
2014-02-26 15:32:01 -05:00
Victor Vieux
5908aa350d
Merge pull request #4357 from creack/fix_TestCmdKill
...
Fix TestCmdKill by closing the pipe before waiting on the container
2014-02-26 12:20:30 -08:00
unclejack
bde192bb80
Merge pull request #4078 from vieux/rewrite_rmi
...
Rewrite docker rmi
2014-02-26 21:30:24 +02:00
unclejack
22da8cdc7e
Merge pull request #4282 from ibuildthecloud/jumbo-frames
...
Add MTU to lxc conf to make host and container MTU match
2014-02-26 20:11:38 +02:00
unclejack
31ddc16692
Merge pull request #4292 from cpuguy83/4291_make_rm_default_for_build
...
make docker build -rm=true default
2014-02-26 19:03:59 +02:00
Brian Goff
0b4aeb79d9
make docker build -rm=true default #4292
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-02-26 11:04:06 -05:00
unclejack
d8b60cb592
Merge pull request #4308 from vbatts/vbatts-seperate_driver_term
...
seperate out the terminal functions from lxc
2014-02-26 16:58:21 +02:00
unclejack
b8a8c0c686
Merge pull request #4342 from vieux/update_maintainers_api
...
update api Maintainers file
2014-02-26 16:33:02 +02:00
unclejack
a42ef866ed
Merge pull request #4316 from tianon/more-lenient-kernel-version
...
Adjust kernel version parsing to be more lenient of strange things like "3.12-1-amd64"
2014-02-26 16:15:56 +02:00
unclejack
22861b42ee
Merge pull request #4328 from vieux/fix_4298
...
fix divide by zero error
2014-02-26 15:59:52 +02:00
unclejack
94001dc6c6
Merge pull request #4341 from vieux/fix_content_type_copy
...
fix content-type docker copy
2014-02-26 15:45:38 +02:00
Tianon Gravi
b5ba89596e
Merge pull request #4348 from tianon/fix-yum-tagging
...
Update mkimage-yum to not read /etc/redhat-release from the host
2014-02-25 23:46:04 -07:00
Tianon Gravi
d29ee876ac
Update mkimage-yum to not read /etc/redhat-release from the host
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-25 23:35:59 -07:00
Guillaume J. Charmes
4039fbb1b0
Fix TestCmdKill by closing the pipe before waiting on the container
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-25 20:16:17 -08:00
Michael Crosby
6016126c71
Fix cgroups swap issue when it is not supported
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-25 19:45:57 -08:00
Michael Crosby
bfdf07ac98
Return error for lxc-conf when using native driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-25 17:13:00 -08:00
Guillaume J. Charmes
3806ff61d1
Fix exit code issue with TTY mode
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-25 16:50:33 -08:00
Michael Crosby
5c67d2e634
Ensure that the container's dir is remove from native driver on stop
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-25 16:27:07 -08:00
Sam Alba
a0251223cd
registry: Fixed unexported field
...
Docker-DCO-1.1-Signed-off-by: Sam Alba <sam.alba@gmail.com > (github: samalba)
2014-02-25 16:06:04 -08:00
Victor Vieux
2f468a498a
update api Maintainers file
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 23:19:44 +00:00
Michael Crosby
93ed15075c
Fix cross compile for make cross
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-25 15:19:13 -08:00
Andy Rothfusz
d373cb8c89
Merge pull request #4323 from timruffles/patch-2
...
help contributors be more productive
2014-02-25 15:03:30 -08:00
Victor Vieux
386e7c80c0
fix content-type docker copy
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 22:49:19 +00:00
Victor Vieux
8dad771daa
add version pkg
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 21:08:38 +00:00
Victor Vieux
10faefac3b
add missing doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 21:08:08 +00:00
Victor Vieux
3f6324f0e8
fix bad rebase
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 21:08:08 +00:00
Victor Vieux
21f56c04e4
fix doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 21:08:08 +00:00
Victor Vieux
626cee87f7
fix message 'No such image: ubuntu' => 'No such image: ubuntu:latest'
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 21:08:08 +00:00
Victor Vieux
964d82d005
fix tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 21:08:08 +00:00
Victor Vieux
c7f825c0f0
:= / var
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 21:08:08 +00:00
Victor Vieux
e7cc88c39f
bump API version
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 21:08:07 +00:00
Victor Vieux
795ed6b1e5
Rewrite docker rmi
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 21:08:07 +00:00
Michael Crosby
79089720c4
Merge pull request #4335 from tianon/what-the-etc-group
...
Convert api/server.go to also use the handy user package
2014-02-25 15:50:53 -05:00
Michael Crosby
96e33a7646
Move container.json and pid file into a root specific driver dir
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-25 12:41:31 -08:00
Tianon Gravi
7bce5957a0
Convert api/server.go to also use the handy user package
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-25 13:07:19 -07:00
Guillaume J. Charmes
ca42758368
Merge branch 'add-libcontainer' of https://github.com/crosbymichael/docker into add-libcontainer
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-25 11:42:15 -08:00
Michael Crosby
de083400b8
Address initial feedback from pr
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-25 10:54:41 -08:00
Solomon Hykes
56584a92f4
Merge pull request #4314 from shykes/engine-commands
...
Engine: builtin command 'commands' returns a list of registered commands
2014-02-25 09:59:26 -08:00
Vincent Batts
c35853191c
correcting the package name for the terminal setup
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-02-25 10:07:06 -05:00
Victor Vieux
b7a0f62f0f
fix divide by zero error
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 08:01:46 +00:00
Michael Crosby
a64ebabdfa
Remove setup logging from sysinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 21:54:37 -08:00
Guillaume J. Charmes
91bf120c51
Better capability/namespace management
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-24 21:52:29 -08:00
Michael Crosby
431d510cae
Remove container env var from libcontainer
...
Update tests to use native driver
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 21:51:00 -08:00
Michael Crosby
8db740a38e
Move types around in native driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 21:21:35 -08:00
Michael Crosby
f8453cd049
Refactor and improve libcontainer and driver
...
Remove logging for now because it is complicating things
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 21:11:52 -08:00
Michael Crosby
d59c05a37c
Fix exec driver flag, rename new driver to 'native'
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 20:41:09 -08:00
Michael Crosby
27a43692c2
Merge branch 'master' into add-libcontainer
...
Conflicts:
runtime.go
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 20:35:12 -08:00
Michael Crosby
c9addff444
Merge pull request #4189 from vbatts/vbatts-execdriver_flag
...
execdriver flag for docker daemon
2014-02-24 23:28:17 -05:00
Michael Crosby
ca537a63a8
Remove chroot driver, it's not needed
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 18:52:48 -08:00
Michael Crosby
9cb4573d33
Improve logging for nsinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 18:38:36 -08:00
Guillaume J. Charmes
e84e344b1f
Use the dockerenv file from the current dir instead of root
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-24 17:02:46 -08:00
Michael Crosby
77f68f74c7
Rename namespace driver to docker
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 16:42:30 -08:00
Michael Crosby
9f03fd76b5
Fix restore container by nspid
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 16:35:11 -08:00
Michael Crosby
9bf6cb2692
Fix get pids for nsinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 16:26:06 -08:00
Michael Crosby
a76407ac61
Cgroups allow devices for privileged containers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 15:47:23 -08:00
Tianon Gravi
b5517db808
Merge pull request #4296 from morgante/patch-1
...
Remove trailing slash from --host parameter in contrib/vagrant-docker/README.md
2014-02-24 16:27:31 -07:00
Guillaume J. Charmes
b6d4c27fcd
Merge pull request #4309 from crosbymichael/change-cgroup-subsystem
...
Use the cpu cgroup subsystem instead of memory because its non optional
2014-02-24 15:24:51 -08:00
unclejack
b2064f2ce6
Merge pull request #4313 from shykes/api-common
...
api/common.go
2014-02-25 01:11:53 +02:00
Victor Vieux
4434b63ff4
fix gofmt
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-24 23:10:45 +00:00
Tim Ruffles
9c4799b7e7
help contributors be more productive
...
certainly saved me time after I found this in hack/make.sh :)
Docker-DCO-1.1-Signed-off-by: Tim Ruffles <oi@truffles.me.uk > (github: github_handle)
2014-02-24 23:07:40 +00:00
Victor Vieux
3839e3a0f6
enable docker run -it
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-24 22:53:00 +00:00
Michael Crosby
a6e5e18511
Fix kill signals and rootfs path for pid
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 14:35:27 -08:00
Victor Vieux
ad88d0be83
Merge pull request #4315 from shykes/engine-parsejob-test
...
Engine: add tests for ParseJob()
2014-02-24 14:27:19 -08:00
Michael Crosby
cfd188e925
Add info for driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 14:11:09 -08:00
Tianon Gravi
88b774d092
Merge pull request #4320 from vieux/buffer_test_integration_line_by_line
...
Add --line-buffered to the integration test output filtering
2014-02-24 15:09:21 -07:00
Victor Vieux
5f15faf500
Merge pull request #4290 from tianon/extract-path
...
Extract our default PATH value to a constant for great reuse
2014-02-24 14:06:27 -08:00
Victor Vieux
24ff3a3dc3
add --line-buffered
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-24 21:59:01 +00:00
Victor Vieux
4a4915c8ee
Merge pull request #4312 from shykes/engine-error-reporting
...
Engine: clearer job error reporting
2014-02-24 13:58:12 -08:00
Michael Crosby
1c79b747bb
Honor user passed on container in nsinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 13:52:56 -08:00
Josh Hawn
00bb76f35b
Added documentation for docker.io OAuth & Accounts
...
OAuth docs:
documented the OAuth authorization flow and how to register your application
Account docs:
documented getting/updating user profile data
documented getting/updating user email data
Docker-DCO-1.1-Signed-off-by: Josh hawn <josh.hawn@docker.com > (github: jlhawn)
2014-02-24 13:48:43 -08:00
Michael Crosby
757c7581c8
Use the cpu cgroup subsystem instead of memory because its non optional
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 13:42:13 -08:00
Michael Crosby
01f9815b55
Fix tests with dockerinit lookup path
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 13:40:17 -08:00
Sam Alba
522c0765f1
registry: Removed checksumPayload from exported fields
...
Docker-DCO-1.1-Signed-off-by: Sam Alba <sam@docker.com > (github: samalba)
2014-02-24 12:40:33 -08:00
Tianon Gravi
2ae8180de2
Adjust kernel version parsing to be more lenient of strange things like "3.12-1-amd64"
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-24 13:38:58 -07:00
Solomon Hykes
0469e7d062
Engine: tiny cosmetic fix
...
To make @creack happy :)
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-24 12:31:39 -08:00
Solomon Hykes
d985fd4984
Engine: add tests for ParseJob()
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-24 12:31:39 -08:00
Solomon Hykes
cd846ecb60
Engine: builtin command 'commands' returns a list of registered commands
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-24 12:29:49 -08:00
Solomon Hykes
62b21daded
Engine: cleanup side effects between tests
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-24 12:29:39 -08:00
Vincent Batts
fabc478e7e
Move the terminal setup to execdriver, instead of ./pkg/term
...
It is independent of any particular driver, but likely used by
multiple execdrivers. Also, pkg/... is not to have any links to
docker, which this terminal setup does.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-02-24 15:28:45 -05:00
Michael Crosby
8f20058307
Compile nsinit into docker for use with dockerinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 12:21:13 -08:00
Tianon Gravi
05e4030313
Merge pull request #4288 from tianon/mkimage-steamos
...
Add "SteamOS" support to mkimage-debootstrap
2014-02-24 13:02:04 -07:00
Solomon Hykes
f14f4aa509
Merge pull request #4311 from shykes/engine-parsejob
...
Engine.ParseJob: create a new job from a shell-like text command.
2014-02-24 11:55:50 -08:00
Tianon Gravi
cd94c9d666
Add "SteamOS" support to mkimage-debootstrap (requires a debootstrap script like https://github.com/tianon/gentoo-overlay/blob/master/dev-util/debootstrap-valve/files/scripts/alchemist )
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-24 12:55:04 -07:00
Solomon Hykes
551355c9ad
api/common.go: code shared by the server and client implementation of the Docker remote api.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-24 11:54:50 -08:00
Solomon Hykes
8a1778301b
Engine: clearer job error reporting
...
* Job.Error and Job.Errorf always print a newline.
* Avoid redundant prefixing of error messages.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-24 11:53:56 -08:00
Guillaume J. Charmes
c63ce728cf
Merge pull request #4249 from shykes/builtins
...
Register built-in engine commands at runtime instead of compile-time
2014-02-24 11:40:09 -08:00
Guillaume J. Charmes
8cfa7715c7
Merge pull request #4281 from unclejack/remove_vagrantfile
...
Remove Vagrantfile and remove it from all docs
2014-02-24 11:39:11 -08:00
Solomon Hykes
2019a73f03
Engine.ParseJob: create a new job from a shell-like text command.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-24 11:38:13 -08:00
Solomon Hykes
92c3927b5d
Cleanup integration tests
...
Refactor integration tests to remove special cases in the creation of
test engines. All test engines are now created through newTestEngine.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-24 19:24:30 +00:00
Solomon Hykes
919665a20a
Register built-in engine commands at runtime instead of compile-time
...
This allows selective loading of commands, and paves the way to dynamic
plugins.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-24 19:24:29 +00:00
Guillaume J. Charmes
aed7fe1cda
Merge pull request #4293 from cpuguy83/patch-1
...
Doc: Remove uneeded wording in Dockerfile format
2014-02-24 11:05:25 -08:00
Michael Crosby
89dbdb1f71
Merge branch 'libcontainer-in-docker' into add-libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 10:49:49 -08:00
Michael Crosby
a08e78a78c
Look for cpu subsystem instead of memory
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 10:46:20 -08:00
Vincent Batts
de848a14ca
seperate out the terminal functions from lxc to the pkg/term
...
Since these functions are indepenent of lxc, and could be used by
other drivers.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-02-24 13:42:09 -05:00
Sam Alba
f420bb2979
registry: Fixed tests
...
Docker-DCO-1.1-Signed-off-by: Sam Alba <sam@docker.com > (github: samalba)
2014-02-24 09:04:27 -08:00
Sam Alba
8d230cf89c
registry: Added simple checksums (sha256) for layers
...
Docker-DCO-1.1-Signed-off-by: Sam Alba <sam@docker.com > (github: samalba)
2014-02-23 18:50:04 -08:00
Brian Goff
cfdfd46e49
Remove uneeded wording in Dockerfile format
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-02-23 15:45:44 -05:00
Morgante Pell
2a7f7c86da
Remove trailing slash from host parameter in docker init.
...
(This causes errors on Docker 0.8)
Docker-DCO-1.1-Signed-off-by: Morgante Pell <morgante.pell@morgante.net > (github: morgante)
2014-02-23 23:42:54 +04:00
Tianon Gravi
b3ffc1f835
Extract our default PATH value to a constant for great reuse
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-22 20:01:45 -07:00
Tianon Gravi
ed8466c44c
Merge pull request #4246 from Ximion/master
...
contrib/debootstrap: Add initial support for Tanglu
2014-02-22 14:58:14 -07:00
Matthias Klumpp
4bfc8e9722
contrib/debootstrap: Add initial support for Tanglu
...
This will add support for Tanglu, a Debian based Linux-distribution.
Docker-DCO-1.1-Signed-off-by: Matthias Klumpp <matthias@tenstral.net > (github: Ximion)
2014-02-22 17:25:52 +01:00
Michael Crosby
172260a49b
Fix tty copy for driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-22 01:28:59 -08:00
Michael Crosby
fac41af25b
Refactor driver to use Exec function from nsini
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-22 01:21:26 -08:00
Michael Crosby
ae423a036e
Abstract out diff implementations for importing
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-22 00:29:21 -08:00
Michael Crosby
2412656ef5
Add syncpipe for passing context
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 22:58:30 -08:00
Michael Crosby
dd59f7fb28
Refactor exec method
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 22:37:09 -08:00
Michael Crosby
5a4069f3aa
Refactor network creation and initialization into strategies
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 22:26:07 -08:00
Michael Crosby
9876e5b890
Export functions of nsinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 21:14:21 -08:00
unclejack
67d55860a5
Remove Vagrantfile and remove it from all docs
...
This removes the Vagrantfile and updates the documentation to remove
the steps which explain how to install Docker in a VM via Vagrant.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-02-22 03:25:32 +02:00
Michael Crosby
2419e63d24
Initial commit of libcontainer running docker
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 17:23:49 -08:00
Michael Crosby
332755b99d
Pass tty master to Exec
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 16:40:32 -08:00
Michael Crosby
c8fd81c278
Pass pipes into Exec function
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 16:28:43 -08:00
Michael Crosby
a352ecb01a
Use lookup path for init
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 16:17:18 -08:00
Sven Dowideit
f36d455144
Merge pull request #4245 from manuel-woelker/docs-remote-api
...
Added some documentation for the JSON params in the /containers/create and /containers/(id)/start remote APIs
2014-02-22 10:15:20 +10:00
Michael Crosby
ba025cb75c
User os.Args[0] as name to reexec
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 15:32:50 -08:00
Michael Crosby
50c752fcb0
Add good logging support to both sides
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:17 -08:00
Michael Crosby
7f247e7006
Move tty into container.json
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:17 -08:00
Michael Crosby
6b2e963ce0
Refactor the flag management for main
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:17 -08:00
Michael Crosby
1316007e54
Make nsinit a proper go pkg and add the main in another dir
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:17 -08:00
Guillaume J. Charmes
66baa0653b
Make sure to close the pipe upon ctrl-d
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-21 14:56:17 -08:00
Guillaume J. Charmes
1a4fb09219
Handle non-tty mode
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-21 14:56:17 -08:00
Guillaume J. Charmes
83dfdd1d95
Minor cleanup
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-21 14:56:17 -08:00
Guillaume J. Charmes
8dec4adcb3
Use a custom pipe instead of stdin for sync net namespace
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-21 14:56:16 -08:00
Guillaume J. Charmes
b519d3ea5a
Use flag for init
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-21 14:56:16 -08:00
Michael Crosby
7020e208c7
Move rest of cgroups functions into cgroups pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
Michael Crosby
3cb698125d
Change IP to address because it includes the subnet
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
Michael Crosby
c442586305
Refactory cgroups into general pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
Michael Crosby
f00f374138
Remove clone_vfork
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
Michael Crosby
5f84738ef1
Revert "WIP for setup kmsg"
...
This reverts commit 80db9a918337c4ae80ffa9a001da13bd24e848c8.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
Alexander Larsson
664fc54e65
libcontainer: Initial version of cgroups support
...
This is a minimal version of raw cgroup support for libcontainer.
It has only enough for what docker needs, and it has no support
for systemd yet.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-21 14:56:16 -08:00
Michael Crosby
f0b4dd6e58
WIP for setup kmsg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
Michael Crosby
e133d895a6
Remove privileged.json config
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
Michael Crosby
70593be139
Add comments to many functions
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
Michael Crosby
e0ff0f4dd6
Add CAP_NET_ADMIN
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
Michael Crosby
3a97fe27d8
Update readme and add TODO
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
Michael Crosby
d84feb8fe5
Refactor to remove cmd from container
...
Pass the container's command via args
Remove execin function and just look for an
existing nspid file to join the namespace
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
Michael Crosby
420b5eb211
Add execin function to running a process in a namespace
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
Michael Crosby
5d62916c48
Refactor large funcs
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
Guillaume J. Charmes
f3c48ec584
OSX compilation
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@dotcloud.com > (github: creack)
2014-02-21 14:56:16 -08:00
Michael Crosby
61a119220d
General cleanup of libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
Michael Crosby
5428964400
Add dynamic veth name
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
Michael Crosby
34671f2010
Implement init veth creation
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:15 -08:00
Michael Crosby
7bc3c01250
Simplify namespaces with only nsinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:15 -08:00
Michael Crosby
e25065a6b1
Use nsinit as app
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:15 -08:00
Guillaume J. Charmes
18f06b8d16
Fix ptmx issue on libcontainer
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-21 14:56:15 -08:00
Guillaume J. Charmes
93d41e53ae
Improve general quality of libcontainer
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-21 14:56:15 -08:00
Michael Crosby
1142945769
Use nsinit for setting up namespace
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:15 -08:00
Michael Crosby
72e65b654b
WIP moving to nsini
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:15 -08:00
Michael Crosby
68b049aed4
Make separate nsinit pkg for a dockerinit like init
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:15 -08:00
Michael Crosby
e8abaf217b
Initial commit of libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:15 -08:00
unclejack
75e62a60a2
Merge pull request #4284 from crosbymichael/refactor-tty
...
Move tty into drivers
2014-02-22 00:09:54 +02:00
Michael Crosby
aac702727e
Move current tty and pipe impl to lxc driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 13:27:34 -08:00
Michael Crosby
8e2284aaa2
Add CloseWriters back and do an interface cast
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 12:52:18 -08:00
Michael Crosby
592c2f6f9a
Move term creation into driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 12:42:37 -08:00
Michael Crosby
1e74287698
Change Console to Terminal
...
Move creation and attach to driver
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 12:32:14 -08:00
Michael Crosby
8c783c1c13
Move console into execdriver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 11:47:53 -08:00
Andy Rothfusz
36fd9f3c53
Merge pull request #4280 from dpb587/bugfix-mtu-typo
...
Fix argument usage typo for docker --mtu
2014-02-21 10:59:42 -08:00
Andy Rothfusz
0c8c87d9ff
Merge pull request #4277 from SvenDowideit/tianon-made-me-doit
...
small update to API docs to go with #4276
2014-02-21 10:57:51 -08:00
Danny Berger
afb565e97c
Drop -mtu from docs in favor of --mtu only
...
Docker-DCO-1.1-Signed-off-by: Danny Berger <dpb587@gmail.com > (github: dpb587)
2014-02-21 13:43:50 -05:00
Tianon Gravi
59d9edd9f5
Merge pull request #4283 from tianon/hide-no-packages-being-tested
...
Add simple "grep" to hide the harmless "warning: no packages being tested depend on ..." in "go test -coverpkg ..." output
2014-02-21 11:40:12 -07:00
Tianon Gravi
41b1f93bf7
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)
2014-02-21 11:26:04 -07:00
Manuel Woelker
c3faab3955
docs: document some JSON parameters /containers/create and /containers/(id)/start in remote api ( fixes #2948 )
...
Docker-DCO-1.1-Signed-off-by: Manuel Woelker <github@manuel.woelker.org > (github: manuel-woelker)
2014-02-21 19:25:49 +01:00
Michael Crosby
81cd2054f6
Merge pull request #4271 from DevTable/fixbuildauth
...
Fix build auth by adding config to the build job environment
2014-02-21 13:03:31 -05:00
Michael Crosby
ab63975b8e
Merge pull request #4260 from unclejack/onbuild_fixes
...
forbid chained onbuild, from & maintainer triggers
2014-02-21 12:50:40 -05:00
Danny Berger
8c4160fe61
Fix cli argument usage typo for docker --mtu
...
Docker-DCO-1.1-Signed-off-by: Danny Berger <dpb587@gmail.com > (github: dpb587)
2014-02-21 10:51:51 -05:00
James Turnbull
ea9dd4ca59
Merge pull request #4248 from unclejack/https_fixes
...
don't skip cert check for an example & use HTTPS
2014-02-21 10:47:44 -05:00
Darren Shepherd
0db53bd2ec
Add MTU to lxc conf to make host and container MTU match
...
If you are using jumbo frames the host side of the veth was being set to
1500. Docker would set the MTU of the container side of the veth to 9001.
This would lead to a situation in which the two sides of the veth had
different MTU sizes causing issues in network traffic.
Docker-DCO-1.1-Signed-off-by: Darren Shepherd <darren.s.shepherd@gmail.com > (github: ibuildthecloud)
2014-02-21 03:02:06 -07:00
Sven Dowideit
f83e553452
small update to API docs to go with #4276
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-21 17:42:02 +10:00
Tianon Gravi
060da572d2
Add newlines to the JSON stream functions
...
This makes the JSON streams a _lot_ easier to parse in less well-baked JSON parsers, and no less so in better ones.
Line-based JSON streams are very, very common, where simply chunk-based is not very common at all.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-21 00:07:44 -07:00
James Turnbull
4f20538f73
Merge pull request #4273 from SvenDowideit/docker-build-rm
...
reinforce that docker build --rm is a good default to use
2014-02-20 23:42:57 -05:00
Sven Dowideit
e59485e148
reinforce that docker build --rm is a good default to use
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-02-21 13:51:08 +10:00
Andy Rothfusz
a5515d27e5
Merge pull request #4233 from deedubs/patch-1
...
FIX: Linux mint troubleshooting tip
2014-02-20 18:07:39 -08:00
Andy Rothfusz
2018d4f9cd
Merge pull request #4251 from tianon/add-back-grub-info
...
Add back the Ubuntu "Memory and Swap Accounting" section that was lost when the "Kernel" page was culled
2014-02-20 18:04:50 -08:00
Andy Rothfusz
bb368b0563
Merge pull request #4261 from amouat/patch-1
...
Fix misspelling
2014-02-20 17:13:54 -08:00
Andy Rothfusz
93b98c9fe3
Merge pull request #4252 from SvenDowideit/mention-scratch-image
...
lets talk about the other way to make base images
2014-02-20 17:12:36 -08:00
Sven Dowideit
7aa403df75
Merge pull request #4265 from unclejack/explain_networkmanager_and_dns_problems
...
docs: explain DNS warnings & how to fix them
2014-02-21 10:48:35 +10:00
jakedt
7dcbae485c
Fix build command auth by adding the auth config and registry objects to the build job environment.
...
Docker-DCO-1.1-Signed-off-by: Jake Moshenko <jake@devtable.com > (github: jakedt)
2014-02-20 19:22:13 -05:00
Jake Moshenko
90b0cce07b
Fix registry auth by storing the string passed on the command line, and allowing for credential selection by normalizing on hostname. Also, remove remote ping calls from CmdPush and CmdPull.
...
Docker-DCO-1.1-Signed-off-by: Jake Moshenko <jake@devtable.com > (github: jakedt)
2014-02-20 18:32:33 -05:00
Victor Vieux
a6909084e9
Merge pull request #3845 from alexlarsson/tar-caps
...
Implement capabilitiy bit storage in layers
2014-02-20 12:01:34 -08:00
unclejack
b829e96cde
forbid chained onbuild, from & maintainer triggers
...
This changes the way onbuild works:
- forbids the chaining of onbuild instructions
- forbids the use of `onbuild from`
- forbids the use of `onbuild maintainer`
It also makes docker throw errors when encountering such triggers when
executing the triggers during `FROM`.
Three tests have been added:
- ensure that chained onbuild (`onbuild onbuild`) is forbidden
- ensure that `onbuild from` is forbidden
- ensure that `onbuild maintainer` is forbidden
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-02-20 20:31:04 +02:00
unclejack
cae554b32e
docs: explain DNS warnings & how to fix them
...
This explains how to fix the DNS warnings on Ubuntu and why they're
shown.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-02-20 19:53:05 +02:00
Nolan Darilek
937ea1d380
Don't call applyVolumesFrom on containers with volumes already configured ( closes #2973 )
...
Docker-DCO-1.1-Signed-off-by: Nolan Darilek <nolan@thewordnerd.info > (github: ndarilek)
2014-02-20 11:18:27 -06:00
Adrian Mouat
88d24df668
Fix misspelling
...
Docker-DCO-1.1-Signed-off-by: Adrian Mouat <adrian@adrianmouat.com > (github: amouat)
2014-02-20 16:55:07 +01:00
James Turnbull
70771ad2ed
Merge pull request #4257 from jamtur01/sitever
...
Site ver for Webmaster tools
2014-02-20 09:54:29 -05:00
James Turnbull
ef82662158
Site ver for Webmaster tools
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-02-20 08:51:39 -05:00
Alexander Larsson
3b9953903b
archive: Handle capabilities in tar files
...
If a file has a security.capability set, we push this to the tar file.
This is important to handle in e.g. layer files or when copying files
to containers, as some distros (e.g. Fedora) use capability bits as
a more finegrained version of setuid bits, and thus if the capabilites
are stripped (and setuid is not set) the binaries will fail to work.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-20 09:23:34 +01:00
Alexander Larsson
87ca750cdc
archive: Detect file changes to capability bits
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-20 09:23:34 +01:00
Alexander Larsson
c8428d77fd
archive: extract xattrs from tarfiles
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-20 09:23:34 +01:00
Alexander Larsson
d19e998e7a
Archive: Add Add Lgetxattr and Lsetxattr implementations
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-20 09:23:34 +01:00
Sven Dowideit
9f1c69ca7b
lets talk about the other way to make base images
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-20 13:49:15 +10:00
Sven Dowideit
d45538f243
Merge pull request #4231 from thschroeter/correct-port-range-in-os-x-install
...
Correct port range in OS X installation doc
2014-02-20 10:26:11 +10:00
Tianon Gravi
42b97be441
Add back the Ubuntu "Memory and Swap Accounting" section that was lost when the "Kernel" page was culled
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-19 16:54:24 -07:00
unclejack
73a277eb2f
don't skip cert check for an example & use HTTPS
...
This changes two URLs from http to https and it fixes a Dockerfile to
stop skipping certificate validation. It also adds the ca-certificates
package to that Dockerfile example.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-02-20 01:11:04 +02:00
Dan Williams
6073b450e8
FIX: Linux mint troubleshooting tip
...
Package is called 'cgroup-lite' not 'cgroups-lite'. Verified on Linux Mint 16.
Ref http://packages.ubuntu.com/search?keywords=cgroup-lite
Docker-DCO-1.1-Signed-off-by: Dan Williams <me@deedubs.com > (github: deedubs)
2014-02-19 17:30:21 -05:00
Andy Rothfusz
16c2031137
Merge pull request #4225 from cpuguy83/4208-update_docs_to_better_explain_docker_run
...
Doc: Add basics for controlling a container's lifecycle
2014-02-19 13:31:31 -08:00
Andy Rothfusz
f1167096ca
Merge pull request #4226 from metalivedev/updatedocdoc
...
Update Docs doc
2014-02-19 10:36:34 -08:00
Andy Rothfusz
196702fbf9
update links
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
2014-02-19 10:32:43 -08:00
Tianon Gravi
ea0cce6270
Merge pull request #4048 from fabiofalci/test_integration_coverage
...
Collect package coverage information when running integration tests
2014-02-19 10:44:13 -07:00
Fabio Falci
b3d5e9527a
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)
2014-02-19 16:59:51 +00:00
Thomas Schroeter
8a289a8a54
Correct port range in OS X installation doc
...
Docker-DCO-1.1-Signed-off-by: Thomas Schroeter <thschroeter@gmail.com > (github: thschroeter)
2014-02-19 11:21:29 +00:00
Andy Rothfusz
05c692d64e
Update the documentation docs with new branch information.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
2014-02-18 19:21:12 -08:00
Brian Goff
6dc2f55136
Add basics for controlling a container's lifecycle
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-02-18 22:11:29 -05:00
Andy Rothfusz
d0f4bc7cca
Merge pull request #4223 from SvenDowideit/update-boot2docker-repo
...
we moved the boot2docker repo
2014-02-18 17:42:59 -08:00
Sven Dowideit
e2da84ee63
we moved the repo
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-19 11:35:58 +10:00
Andy Rothfusz
ba3cbeb86b
Merge pull request #4173 from SvenDowideit/add-most-spacing-to-headers
...
add a little space above h2->h6 - it gets a bit dense in there when there are lots of steps
2014-02-18 16:55:10 -08:00
Michael Crosby
113629efb1
Merge pull request #4011 from crosbymichael/add-netlink-functions
...
Add more netlink functions
2014-02-18 19:37:52 -05:00
Michael Crosby
ab8e0d1f84
Merge pull request #4218 from crosbymichael/merge_release_v0.8.1
...
Merge release v0.8.1
2014-02-18 19:37:26 -05:00
Michael Crosby
2845c798d6
Merge pull request #4207 from crosbymichael/bump_v0.8.1
...
Bump to version 0.8.1
2014-02-18 19:22:30 -05:00
Michael Crosby
97ed268a82
Change version to v0.8.1
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-18 16:01:04 -08:00
Michael Crosby
961023b873
Merge remote-tracking branch 'origin/release' into merge_release_v0.8.1
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-18 16:00:38 -08:00
Andy Rothfusz
1308673965
Merge pull request #4210 from cpuguy83/4208-update_docs_to_better_explain_docker_run
...
Add extra info regarding docker run funcationality
2014-02-18 15:44:26 -08:00
Michael Crosby
a1598d1e1c
Bump to version 0.8.1
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-18 12:36:05 -08:00
Andy Rothfusz
836a49a46e
Merge pull request #4114 from SvenDowideit/update-sshd-example
...
update the sshd example to use just a Dockerfile
2014-02-18 12:12:52 -08:00
Brian Goff
349adf4d4d
Add extra info regarding docker run funcationality
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-02-18 15:08:09 -05:00
Andy Rothfusz
3a2fa54857
Merge pull request #4147 from float64/patch-1
...
Env Clarification
2014-02-18 12:07:39 -08:00
Andy Rothfusz
57c4f7185d
Merge pull request #2980 from SvenDowideit/1439-add-registry-repository-terms
...
my attempt to disentagle repository and registry
2014-02-18 11:26:45 -08:00
Andy Rothfusz
c14c539c6c
Merge pull request #4145 from SvenDowideit/redo-python-example
...
touch up the examples
2014-02-18 11:08:45 -08:00
Michael Crosby
049c7effe9
Merge branch 'master' into bump_v0.8.1
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-18 10:51:19 -08:00
Tianon Gravi
277262d9c7
Merge pull request #4205 from tianon/fix-dyntest
...
Fix dyntest problems finding dockerinit
2014-02-18 11:50:16 -07:00
Tianon Gravi
b10cfaef62
Merge pull request #4206 from tianon/ubuntu-conflicts
...
Add "Conflicts" to our lxc-docker package
2014-02-18 11:49:47 -07:00
Tianon Gravi
6d1c0a91f8
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)
2014-02-18 11:24:33 -07:00
Tianon Gravi
6ccb30a0e5
Fix dyntest problems finding dockerinit
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-18 11:23:37 -07:00
Michael Crosby
6af6b72023
Merge pull request #4198 from alexlarsson/fix-setuid
...
archive: Fix the storing of setuid bits, etc
2014-02-18 13:11:32 -05:00
Matthias Kühnle
311cb5ca45
Reword - one sentence :-)
...
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com > (github: float64)
2014-02-18 16:04:47 +01:00
Matthias Kühnle
c1dfc63845
Updated environment description
...
.. to make it even more clear that this env variables are there because of the --link option.
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com > (github: float64)
2014-02-18 12:47:44 +01:00
Matthias Kühnle
d73d3b03e4
Reworded description of the environment variables
...
Removed the "test now..." b/c the code example is only about inspection
of env-variables.
Test follows in the next section.
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com > (github: float64)
2014-02-18 12:36:14 +01:00
Matthias Kühnle
8a3cb0c65e
Fixed misspelling
...
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com > (github: float64)
2014-02-18 11:38:23 +01:00
Matthias Kühnle
a7f1b74dd8
Env Clarification
...
Clarified that the env variables here are an example output of env. The user should not set them to the example values.
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com > (github: float64)
2014-02-18 11:36:46 +01:00
Sven Dowideit
a049e93a4c
try out @metalivedev's suggestion, including FQIN
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-02-18 20:16:09 +10:00
Sven Dowideit
940c381dd5
my attempt to disentagle repository and registry (Issue #1439 )
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-02-18 20:16:08 +10:00
Alexander Larsson
5ba2462961
archive: Fix the storing of setuid bits, etc
...
In commit 3dfc910d77alexl@redhat.com > (github: alexlarsson)
2014-02-18 09:53:30 +01:00
James Turnbull
ef844adc3e
Merge pull request #4196 from mahata/fixTypo
...
Fix typo in 'Using Supervisor with Docker' example
2014-02-17 22:48:54 -05:00
Yasunori Mahata
68de32888b
Fix typo in 'Using Supervisor with Docker' example
...
Docker-DCO-1.1-Signed-off-by: Yasunori Mahata <mahata777@gmail.com > (github: mahata)
2014-02-17 19:43:56 -08:00
Sven Dowideit
29f7e1bfcb
suggested improvements
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-18 13:23:28 +10:00
Sven Dowideit
b05602a0fe
update a new movie: http://asciinema.org/a/7658
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-02-18 13:23:28 +10:00
Sven Dowideit
f535a58959
swap busybox for ubuntu, its quicker..
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-18 13:23:28 +10:00
Sven Dowideit
3036b5a196
rejig the helloflask example as more advanced, and move it to the end
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-18 13:23:28 +10:00
Michael Crosby
8f11a1a61f
Merge pull request #4193 from creack/3964-add_tar-fix
...
Fix remote tar ADD behavior
2014-02-17 20:37:42 -05:00
Guillaume J. Charmes
98ce0cdb4f
Fix remote tar ADD behavior
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-17 17:08:17 -08:00
Vincent Batts
5f84d7f314
execdriver flag for docker daemon
...
like the storage-driver flag, this implements a flag for choosing the
execdriver to be used, defaulting to lxc.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-02-17 20:03:53 -05:00
Guillaume J. Charmes
a3bc3bb8c3
Merge pull request #4159 from crosbymichael/move-volumes
...
Move volumes out of container.go and into volumes.go
2014-02-17 16:43:20 -08:00
Guillaume J. Charmes
e9db157bee
Merge pull request #4162 from crosbymichael/movelinks
...
Move links functionality into pkg
2014-02-17 16:34:47 -08:00
Victor Vieux
4187f4e750
Merge pull request #4168 from crosbymichael/add-listenbuffer
...
Hold connections until the daemon has fully loaded
2014-02-17 16:04:49 -08:00
unclejack
045462a367
Merge pull request #4192 from crosbymichael/fix-404
...
Fix error message only if no body is retuned
2014-02-18 01:49:08 +02:00
Michael Crosby
e23190b6b3
Improve error message only if no body is returned
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-17 15:29:52 -08:00
Michael Crosby
d55cc64c4e
Revert "Merge pull request #4151 from crosbymichael/improve-404-client-message"
...
This reverts commit 6dd1bb9eb023aec9d7fcmichael@crosbymichael.com > (github: crosbymichael)
2014-02-17 15:25:00 -08:00
Michael Crosby
e743021193
Move job register into servapi
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-17 15:10:51 -08:00
Victor Vieux
518670f3d8
Merge pull request #4153 from crosbymichael/move-proxy
...
Move proxy into pkg
2014-02-17 14:51:16 -08:00
Victor Vieux
14ed82fc89
Merge pull request #4188 from unclejack/update_dns_resolver_warning
...
update warning about local dns resolvers
2014-02-17 14:39:59 -08:00
Andy Rothfusz
c7c825d9a5
Merge pull request #4171 from SvenDowideit/4061-remote-api-warning
...
change the -H TCP / docker group warning to not reference a resolved issue
2014-02-17 14:36:05 -08:00
unclejack
66c92140c9
Merge pull request #4155 from crosbymichael/remove-reflink
...
Remove unused reflink files
2014-02-18 00:29:35 +02:00
Michael Crosby
055f1a1f81
Remove verbose logging for non errors
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-17 13:31:13 -08:00
unclejack
85b8025a35
update warning about local dns resolvers
...
This changes the local DNS resolver warning to explain what the
warning is about and why the default external DNS server is used.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-02-17 23:29:36 +02:00
Victor Vieux
b7c2e8f54e
Merge pull request #3817 from philips/CONTRIBUTING-is-just-a-dco
...
fix(CONTRIBUTING): Developer Certificate of Origin w/o Grant
2014-02-17 12:28:05 -08:00
Victor Vieux
8f140b2ded
Merge pull request #4178 from alexlarsson/fix-aufs-plnk
...
archive: Handle aufs plink hardlinks in ApplyLayer
2014-02-17 11:48:39 -08:00
Alexander Larsson
6889cd9f9c
archive: Handle aufs plink hardlinks in ApplyLayer
...
Files in the .wh..wh.plnk directory are ignored, but other files
inside the tarfile can be hardlinks to these files. This is not
something that normally happens, as on aufs unmount such files are
supposed to be dropped via the "auplink" too, yet images on the index
(such as shipyard/shipyard, e.g. layer
f73c835af6d58b6fc827b400569f79a8f28e54f5bb732be063e1aacefbc374d0)
contains such files.
We handle these by extracting these files to a temporary directory
and resolve such hardlinks via the temporary files.
This fixes https://github.com/dotcloud/docker/issues/3884
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-17 20:46:32 +01:00
Victor Vieux
24498a896f
Merge pull request #4187 from creack/fix_hostflag_panic
...
Fix DOCKER_HOST=tcp:// panic
2014-02-17 11:43:53 -08:00
Michael Crosby
2769d66f78
Merge pull request #4030 from TheDude05/fix-incorrect-ip-test
...
Fix IPv4 Subnet Test
2014-02-17 14:41:33 -05:00
Guillaume J. Charmes
513d864880
Fix DOCKER_HOST=tcp:// panic
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-17 11:35:26 -08:00
Guillaume J. Charmes
581ee7e584
Merge pull request #4186 from crosbymichael/netlink-maintainer
...
Make crosbymichael and creack netlink maintainers
2014-02-17 11:19:55 -08:00
Michael Crosby
a75c6907b4
Make crosbymichael and creack netlink maintainers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-17 11:17:05 -08:00
unclejack
f3ff190491
Merge pull request #4131 from tianon/vendor-golang-xattrs
...
Add vendored archive/tar that includes xattrs patch
2014-02-17 21:12:28 +02:00
Guillaume J. Charmes
19e44217f5
Merge pull request #4167 from shykes/fix-tests-mac
...
Fix or document broken tests on mac
2014-02-17 11:01:17 -08:00
Daniel Mizyrycki
f056a5d8c5
Merge pull request #4163 from mzdaniel/docker-ci
...
docker-ci 0.5.6: Fully dockerize docker-ci. Add build test coverage. Add backup builder.
2014-02-17 18:56:32 +00:00
Tianon Gravi
032f45683b
Merge pull request #4185 from tmc/fix-building-with-space
...
Quote volume path in Makefile to allow spaces
2014-02-17 11:53:41 -07:00
Michael Crosby
bc286d651d
Merge pull request #4172 from fabiofalci/test_save_and_load
...
Test for save and load commands
2014-02-17 13:52:44 -05:00
Daniel Mizyrycki
b7db2d5f80
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)
2014-02-17 10:52:39 -08:00
Victor Vieux
382659e03a
Merge pull request #4113 from SvenDowideit/build-quiet-help
...
add a little reenforcement to the help for docker build -q
2014-02-17 10:38:43 -08:00
Guillaume J. Charmes
a1fb3b5282
Merge pull request #3463 from songgao/patch-2
...
Support submodules when building from a gh repo
2014-02-17 10:28:17 -08:00
Travis Cline
5006509131
Quote volume path to allow spaces
...
Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com > (github: tmc)
2014-02-17 10:24:50 -08:00
Michael Crosby
1f66296c6e
Merge pull request #4180 from alexlarsson/fix-restart-race
...
Avoid temporarily unmounting the container when restarting it
2014-02-17 13:21:53 -05:00
Song Gao
c9ae66ffe3
Support submodules when building from a gh repo
...
Docker-DCO-1.1-Signed-off-by: Song Gao <song@gao.io > (github: songgao)
2014-02-17 12:08:23 -06:00
unclejack
59e88b0967
Merge pull request #4164 from fabiofalci/cp_error_message
...
`docker cp` error when container doesn't exist
2014-02-17 19:13:55 +02:00
Tianon Gravi
b762d3a739
Add vendored archive/tar that includes xattrs patch
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-17 08:20:21 -07:00
James Turnbull
ab49015523
Merge pull request #4061 from mikemaccana/patch-1
...
Add dockerode NodeJS implementation
2014-02-17 10:14:17 -05:00
Alexander Larsson
ab0f3f86c8
Avoid temporarily unmounting the container when restarting it
...
Stopping the container will typicall cause it to unmount, to keep it mounted
over the stop/start cycle we aquire a temporary reference to it during this time.
This helps with https://github.com/dotcloud/docker/issues/4036
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-17 16:10:54 +01:00
Mike MacCana
02d94dcf6e
Add dockerode NodeJS implementation
...
Also correctly case 'JavaScript'
Docker-DCO-1.1-Signed-off-by: Mike MacCana <mike.maccana@gmail.com > (github: mikemaccana)
2014-02-17 14:04:47 +00:00
Sven Dowideit
6a5a1d44f5
add a little space above h2->h6 - it gets a bit dense in there when there are lots of steps
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-17 12:24:19 +10:00
Fabio Falci
4ab3c31b15
Test for save and load commands
...
Improve test for save to tar and load from tar commands.
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: fabiofalci)
2014-02-17 01:52:50 +00:00
Sven Dowideit
797b7d3446
add a little reenforcement to the help for docker build -q
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-17 11:35:55 +10:00
Sven Dowideit
8871fd3a31
change the -H TCP / docker group warning to not reference a resolved issue
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-17 10:02:23 +10:00
Fabio Falci
a51441278a
docker cp error when container doesn't exist
...
Fix cp api to return a 404 notfound if container doesn't exist.
Fixes #4119 .
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: fabiofalci)
2014-02-16 15:49:36 +00:00
Michael Crosby
d5e41c1cb6
Change name to listenbuffer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-15 21:10:37 -08:00
Michael Crosby
778f1bf663
Integration generic socket wait for docker api
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-15 20:49:50 -08:00
Michael Crosby
64716a21e4
Use socket activation pkg for listeners
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-15 20:24:55 -08:00
Michael Crosby
cfb7711a74
Add socket activation for go apps
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-15 20:18:47 -08:00
Michael Crosby
72ed2537b3
Merge pull request #4107 from shykes/separate-api-client
...
Move remote API client out of the core and into api/
2014-02-15 18:56:49 -05:00
Michael Crosby
4bc966f302
Merge pull request #4102 from shykes/separate-mkbuildclient
...
Refactor utility `MkBuildContext` to the more generic `archive.Generate`
2014-02-15 18:27:13 -05:00
Solomon Hykes
44e10433c7
api/container.go: an API-specific representation of a container
...
This breaks the dependency from the remote API implementation to the
internal representation of a container. Instead it uses its own partial
representation of a container, with only required fields.
* This preserves reverse-compatibility with all past implementations of the remote API.
* This clarifies which fields are guaranteed to be present in a response
A docker remote api server *may* return more fields in a Container
object, but their presence and semantics are not guaranteed and should
not be relied upon by client implementations.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-15 23:24:51 +00:00
Solomon Hykes
567a422a65
Remove duplicate function displayablePorts
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-15 14:55:57 -08:00
Solomon Hykes
ee59ba969f
Move remote api client to api/
...
This moves `commands.go` out of the core and into `api/client.go`
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-15 14:55:51 -08:00
Solomon Hykes
9b56da78e0
Refactor utility MkBuildContext to the more generic archive.Generate
...
This facilitates refactoring commands.go.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-15 14:52:08 -08:00
Solomon Hykes
7286842a12
Document Darwin test failure in a FIXME
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-15 14:40:07 -08:00
Solomon Hykes
353cc8c2a5
Fix engine tests on systems where temp directories are symlinked.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-15 14:39:51 -08:00
Michael Crosby
147b09fae9
Move links to sub pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-14 18:18:16 -08:00
Michael Crosby
fc952e0de9
Remove container dependency for links
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-14 18:07:33 -08:00
Victor Vieux
a7ecc3ea11
Merge pull request #4160 from crosbymichael/cleanup-exec-drivers
...
Cleanup some statements from exec driver work
2014-02-14 17:32:01 -08:00
Michael Crosby
9e3da87a3a
Cleanup some statements from exec driver work
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-14 17:28:50 -08:00
Michael Crosby
bd54d40f68
Move volumes out of container.go and into volumes.go
...
This helps clean up the container file and move volumes into
one location. We currently cannot move volumes to a sub pkg
because they depend on Container and also modify fields on the
container.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-14 17:15:40 -08:00
Michael Crosby
8c39db8f96
Move proxy into pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-14 15:48:05 -08:00
Michael Crosby
055bfb699b
Remove unused reflink files
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-14 15:32:39 -08:00
Victor Vieux
072268ae56
Merge pull request #4152 from crosbymichael/update-fixme
...
Update fixme
2014-02-14 15:19:16 -08:00
Michael Crosby
106079daca
Update fixme
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-14 15:17:12 -08:00
Michael Crosby
1140411d4c
Merge branch 'add-netlink-functions' of github.com:crosbymichael/docker into add-netlink-functions
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-14 12:13:09 -08:00
Michael Crosby
17719cab91
Add new functions to unsupported file
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-14 12:12:35 -08:00
Victor Vieux
6dd1bb9eb0
Merge pull request #4151 from crosbymichael/improve-404-client-message
...
Improve error message for 404 returned by daemon
2014-02-14 11:57:56 -08:00
Michael Crosby
190504472b
Improve error message for 404 returned by daemon
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-14 11:56:52 -08:00
unclejack
23aec9d7fc
Merge pull request #4010 from tianon/iceweasel
...
Swap Firefox to Iceweasel so that the Desktop Integration example is simplified and easier to understand
2014-02-14 21:38:40 +02:00
Michael Crosby
d3a2c15a5d
Merge pull request #4146 from alexlarsson/clean-up-archive-closing
...
Clean up archive closing
2014-02-14 13:48:26 -05:00
Alexander Larsson
d8c888b3f8
Drop EofReader
...
This is not used any more
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-14 13:46:21 +01:00
Alexander Larsson
f198ee525a
Properly close archives
...
All archive that are created from somewhere generally have to be closed, because
at some point there is a file or a pipe or something that backs them. So, we
make archive.Archive a ReadCloser. However, code consuming archives does not
typically close them so we add an archive.ArchiveReader and use that when we're
only reading.
We then change all the Tar/Archive places to create ReadClosers, and to properly
close them everywhere.
As an added bonus we can use ReadCloserWrapper rather than EofReader in several places,
which is good as EofReader doesn't always work right. For instance, many compression
schemes like gzip knows it is EOF before having read the EOF from the stream, so the
EofCloser never sees an EOF.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-14 13:46:17 +01:00
Alexander Larsson
804690bd07
archive.TarFilter() - properly close readers
...
CompressStream() now always returns a stream that is closable, and it never
closes the underlying writer. TarFilter() makes sure the decompressed stream
is closed at the and, as well as the PipeWriter.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-14 12:56:55 +01:00
Alexander Larsson
0d9213f859
archive: Close decompressed streams
...
Various kinds of decompressed streams are really ReadClosers. For instance
gzip.NewReader() is, and the one returned from CmdStream is changed to be
because it returns a PipeReader which is a ReadCloser.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-14 12:56:55 +01:00
Tianon Gravi
32535e0b82
Merge pull request #4123 from tianon/darwin-shasum
...
Add shasum fallback to hack/make/dynbinary for Darwin
2014-02-13 21:20:49 -07:00
Sven Dowideit
a6182dc62e
update the sshd example to use just a Dockerfile
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-14 13:27:58 +10:00
unclejack
7aff7cc4bb
Merge pull request #4135 from creack/console_support
...
Mount-bind the PTY as container console - allow for tmux/screen to run
2014-02-14 03:47:33 +02:00
unclejack
1b8ec8ff1d
Merge pull request #4134 from crosbymichael/fix-add-magic-regression
...
Fix regression with ADD of tar files
2014-02-14 03:43:39 +02:00
Michael Crosby
968f4800b5
Merge pull request #4128 from vieux/fix_header_content-type_api
...
Fix header content type api
2014-02-13 20:29:09 -05:00
Guillaume J. Charmes
408ea0771a
Mount-bind the PTY as container console - allow for tmux/screen to run
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-13 17:23:09 -08:00
Michael Crosby
cad7f7ee50
Fix regression with ADD of tar files
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-13 17:18:38 -08:00
Andy Rothfusz
a4d1da709e
Merge pull request #4120 from apocas/master
...
Image tag endpoint HTTP code typo
2014-02-13 15:49:45 -08:00
Tianon Gravi
cc14441845
Merge pull request #4093 from stpierre/mkimage-yum
...
Fix bogus variable reference in mkimage-yum.sh
2014-02-13 15:28:47 -07:00
Johan Euphrosine
da3a52746b
hack/RELEASE: add step for updating doc branch
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: google)
2014-02-13 12:01:55 -08:00
Tianon Gravi
8d2a2ed457
Merge pull request #4125 from maxamillion/maxamillion/add_redhat_sysvinit
...
Remove unneeded sysctl changes in sysvinit-redhat init script
2014-02-13 12:53:53 -07:00
Guillaume J. Charmes
6cb0a7e04e
Merge pull request #4108 from unclejack/remove_default_tcp_bind_address
...
disallow tcp:// from defaulting to 127.0.0.1:4243
2014-02-13 11:44:31 -08:00
Victor Vieux
0b403b3531
fix content-type for legacy
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-13 19:24:40 +00:00
Victor Vieux
4611a6bdd3
fix content-type for job.Stdout.Add
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-13 19:21:27 +00:00
Guillaume J. Charmes
9997d0c9ed
Merge pull request #4062 from alexlarsson/clean-shutdown
...
devmapper: Fix shutdown warnings
2014-02-13 10:45:03 -08:00
Victor Vieux
6f10f33387
Merge pull request #4103 from vieux/add_error_build-rm
...
add error to docker build --rm
2014-02-13 10:35:55 -08:00
Adam Miller
4317011e21
remove unneeded sysctl changes in sysvinit-redhat init script
...
Docker-DCO-1.1-Signed-off-by: Adam Miller <admiller@redhat.com > (github: maxamillion)
2014-02-13 12:11:38 -06:00
apocas
3417dd4b3b
Image tag endpoint doc typo.
...
Docker-DCO-1.1-Signed-off-by: Pedro Dias <petermdias@gmail.com > (github: apocas)
2014-02-13 18:11:07 +00:00
Michael Crosby
3f1e6b6368
Merge pull request #4096 from alexlarsson/fix-devmapper-race-2
...
Avoid extra mount/unmount during build
2014-02-13 12:53:29 -05:00
Tianon Gravi
c7840f522c
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)
2014-02-13 10:27:45 -07:00
Tianon Gravi
f794fbc230
Merge pull request #4043 from tianon/hack-git-detection-and-use
...
Add better ".git" detection and use
2014-02-13 09:56:14 -07:00
unclejack
47df7a360a
Merge pull request #4056 from alexlarsson/fix-devmapper-test
...
devicemapper: Fix tests on fedora
2014-02-13 15:06:50 +02:00
unclejack
c6edac9a1a
Merge pull request #4073 from crosbymichael/fix-docker-cp-close
...
Ensure docker cp stream is closed properly
2014-02-13 14:12:53 +02:00
unclejack
31dde3ea05
disallow tcp:// from defaulting to 127.0.0.1:4243
...
This stops docker from accepting tcp:// as a valid bind address.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-02-13 13:54:37 +02:00
Andy Rothfusz
cddea301ab
Merge pull request #4111 from merriam/patch-4
...
Minor error in example code (resubmit #4109 )
2014-02-12 18:34:17 -08:00
Andy Rothfusz
9d75155459
Merge pull request #4112 from merriam/patch-3
...
(resubmit #4110 ) Add notes about OS/X and remote daemons
2014-02-12 18:33:11 -08:00
Charles Merriam
ba650e0517
Minor error in example code (resubmit #4109 )
...
Docker-DCO-1.1-Signed-off-by: Charles Merriam <charles.merriam@gmail.com > (github: merriam)
2014-02-12 18:13:46 -08:00
Charles Merriam
2a17bdce9e
(resubmit) Add notes about OS/X and remote daemons
...
Docker-DCO-1.1-Signed-off-by: Charles Merriam <charles.merriam@gmail.com > (github: merriam)
2014-02-12 18:11:01 -08:00
Andy Rothfusz
989fee2490
Merge pull request #4090 from SvenDowideit/add-install-make-git-to-devenv
...
tell the reader that they need git and make for this tutorial
2014-02-12 15:48:39 -08:00
Victor Vieux
a895c7238d
add error to docekr build --rm
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-12 23:23:42 +00:00
Michael Crosby
9fd44cb569
Merge pull request #8 from creack/implement_create_veth
...
Simplify code + Allow more generic attr children + remove prefix
2014-02-12 13:33:29 -05:00
Michael Crosby
3a7f69a3d8
Merge branch 'implement_create_veth' of https://github.com/creack/docker into add-netlink-functions
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-12 10:25:06 -08:00
Tianon Gravi
e7f91a6456
Merge pull request #3947 from maxamillion/maxamillion/add_redhat_sysvinit
...
Add sysvinit/sysconfig files for redhat family of distros (RHEL/CentOS/SL/etc.)
2014-02-12 11:11:42 -07:00
Adam Miller
e36d4d8821
Merge branch 'master' into maxamillion/add_redhat_sysvinit
...
* master: (64 commits)
Move the canonical run configuration objects to a sub-package
Remove useless code in client implementation of 'run'.
pkg/opts: a collection of custom value parsers implementing flag.Value
Move api-specific code to the api package
Fix the tests, too
Fix the one spot I missed dockerversion
fix underline/heading
New package `nat`: utilities for manipulating the text description of network ports.
rewrite the PostgreSQL example using a Dockerfile, and add details to it
Move even more stuff into dockerversion
fix underline/heading
Move docker version introspection to a sub-package.
add port forwarding notes for mac/boot2docker docs
Update remote_api_client_libraries.rst
Avoid extra mount/unmount during container registration
add a little more information about the docker run -P option
lxc: Drop NET_ADMIN capability in non-privileged containers
devmapper: Remove directory when removing devicemapper device
add a little info on upgrading
point out that ENV DEBIAN_FRONTEND will persist, so its not recommended
...
2014-02-12 12:04:02 -06:00
Adam Miller
2222cba5ac
Added sysvinit/sysconfig files for redhat family of distros (RHEL/CentOS/SL/etc.)
...
Docker-DCO-1.1-Signed-off-by: Adam Miller <admiller@redhat.com > (github: maxamillion)
2014-02-12 12:03:32 -06:00
Guillaume J. Charmes
38e5b4e70f
Simplify code + Allow more generic attr children + remove prefix
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-12 09:29:06 -08:00
Michael Crosby
e941111f33
Merge pull request #7 from creack/implement_create_veth
...
Implement create veth
2014-02-12 11:37:27 -05:00
Alexander Larsson
59347fa66d
Avoid extra mount/unmount during build
...
CmdRun() calls first run() and then wait() to wait for it to exit,
then it runs commit(). The run command will mount the container and
the container exiting will unmount it. Then the commit will
immediately mount it again to do a diff.
This seems minor, but this is actually problematic, as the Get/Put
pair will create a spurious mount/unmount cycle that is not needed and
slows things down. Additionally it will create a supurious
devicemapper activate/deactivate cycle that causes races with udev as
seen in https://github.com/dotcloud/docker/issues/4036 .
To ensure that we only unmount once we split up run() into create()
and run() and reference the mount until after the commit().
With this change docker build on devicemapper is now race-free, and
slightly faster.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-12 16:02:53 +01:00
Chris St. Pierre
85263cdee8
Fix bogus variable reference in mkimage-yum.sh
...
Fixes this: d419da7227 (commitcomment-5344982)chris.a.st.pierre@gmail.com > (github: stpierre)
2014-02-12 08:02:36 -05:00
Guillaume J. Charmes
dce7b6a69c
Merge remote-tracking branch 'mike/add-netlink-functions' into implement_create_veth
...
Conflicts:
pkg/netlink/netlink_linux.go
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-12 04:17:12 -08:00
Guillaume J. Charmes
2d2c237f50
Implement create veth
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-12 04:09:56 -08:00
Sven Dowideit
d9f215eb2a
tell the reader that they need git and make for this tutorial
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-02-12 16:30:18 +10:00
Michael Crosby
d3c084beee
Merge pull request #4085 from shykes/separate-config-hostconfig
...
Move canonical run configuration objects to a sub-package
2014-02-11 23:37:40 -05:00
Michael Crosby
19755bcdae
Merge pull request #4089 from shykes/autopull-useless-code
...
Remove useless code in client implementation of 'run'.
2014-02-11 23:23:12 -05:00
Solomon Hykes
6393c38339
Move the canonical run configuration objects to a sub-package
...
* Config is now runconfig.Config
* HostConfig is now runconfig.HostConfig
* MergeConfig is now runconfig.Merge
* CompareConfig is now runconfig.Compare
* ParseRun is now runconfig.Parse
* ContainerConfigFromJob is now runconfig.ContainerConfigFromJob
* ContainerHostConfigFromJob is now runconfig.ContainerHostConfigFromJob
This facilitates refactoring commands.go and shrinks the core.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-11 20:18:46 -08:00
Solomon Hykes
e3140e1e69
Remove useless code in client implementation of 'run'.
...
This facilitates refactoring commands.go.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-11 20:16:58 -08:00
Victor Vieux
9a9690360c
Merge pull request #4074 from shykes/separate-version
...
Move docker version introspection to a sub-package.
2014-02-11 20:16:00 -08:00
Victor Vieux
28e4de8bfa
Merge pull request #4083 from shykes/api-validate-host
...
Move api-specific code to the api package
2014-02-11 20:10:35 -08:00
Solomon Hykes
0dc9c5531e
Merge pull request #76 from tianon/fix-broken-eagle-tests
...
Fix the tests, too
2014-02-11 20:07:47 -08:00
Solomon Hykes
e6e320acc7
pkg/opts: a collection of custom value parsers implementing flag.Value
...
This facilitates the refactoring of commands.go.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-11 19:59:52 -08:00
Solomon Hykes
e08a1c53aa
Move api-specific code to the api package
...
This facilitates the refactoring of commands.go.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-11 19:59:52 -08:00
Tianon Gravi
0d871840b2
Fix the tests, too
...
Seriously. There's not much codebase left we haven't touched.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-11 19:10:23 -07:00
Michael Crosby
6da1e092dc
Merge pull request #4079 from shykes/separate-nat
...
New package `nat`: utilities for manipulating the text description of network ports
2014-02-11 20:45:58 -05:00
Solomon Hykes
b609e28e5c
Merge pull request #75 from tianon/fix-my-broken-eagle
...
Fix the one spot I missed dockerversion
2014-02-11 17:32:11 -08:00
Tianon Gravi
7ea725fdc5
Fix the one spot I missed dockerversion
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-11 18:23:17 -07:00
Andy Rothfusz
6fd8e5d976
fix underline/heading
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
2014-02-11 16:53:08 -08:00
Solomon Hykes
3ecd8ff0c8
New package nat: utilities for manipulating the text description of network ports.
...
This facilitates the refactoring of commands.go
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-11 16:51:01 -08:00
Andy Rothfusz
e9e4b8dc15
Merge pull request #4034 from SvenDowideit/postgres-example
...
rewrite the PostgreSQL example using a Dockerfile, and add details to it
2014-02-11 16:49:22 -08:00
Sven Dowideit
6b925a4991
Merge pull request #4050 from SvenDowideit/put-back-LGTM
...
bring back the explanation of our LGTM process
2014-02-12 10:41:49 +10:00
Solomon Hykes
619ad84216
Merge pull request #74 from tianon/more-separate
...
Move even more stuff into dockerversion
2014-02-11 16:37:27 -08:00
Sven Dowideit
2ed2ba4e8c
rewrite the PostgreSQL example using a Dockerfile, and add details to it
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-12 10:30:57 +10:00
Andy Rothfusz
7396741757
Merge pull request #3988 from dafyddcrosby/fix_formatting
...
Fix RST formatting
2014-02-11 16:30:21 -08:00
Andy Rothfusz
7fe8b50e2e
Merge pull request #4057 from SvenDowideit/add-P-docs
...
add a little more information about the docker run -P option
2014-02-11 16:27:25 -08:00
Tianon Gravi
da04f49b38
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)
2014-02-11 17:26:54 -07:00
Andy Rothfusz
ff2260099a
Merge pull request #4054 from SvenDowideit/boot2docker-upgrade-doc
...
add a little info on upgrading b2d
2014-02-11 16:23:11 -08:00
Andy Rothfusz
c76a4e3489
fix underline/heading
2014-02-11 16:19:42 -08:00
Andy Rothfusz
3122b4b470
Merge pull request #4020 from cameronboehmer/patch-1
...
add vm port forwarding note/example in osx install docs
2014-02-11 16:18:54 -08:00
Andy Rothfusz
0bcabdbdc7
Merge pull request #4072 from 13W/patch-1
...
Update remote_api_client_libraries.rst
2014-02-11 16:14:22 -08:00
Solomon Hykes
ae3c7dec3b
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)
2014-02-11 16:10:51 -08:00
Andy Rothfusz
9176b6fd88
Merge pull request #4035 from SvenDowideit/dont-env-debian-frontend
...
point out that ENV DEBIAN_FRONTEND will persist, so its not recommended
2014-02-11 15:59:10 -08:00
Cameron Boehmer
49b928c0b0
add port forwarding notes for mac/boot2docker docs
...
Docker-DCO-1.1-Signed-off-by: Cameron Boehmer <cameron.boehmer@gmail.com > (github: cameronboehmer)
2014-02-11 15:26:12 -08:00
Vladimir Bulyga
d35b03ef8d
Update remote_api_client_libraries.rst
...
hello, add please my interface
Docker-DCO-1.1-Signed-off-by: Vladimir <xx@ccxx.cc > (github: 13w)
2014-02-12 01:09:06 +02:00
Michael Crosby
da3e539133
Merge pull request #4067 from alexlarsson/fix-devmapper-race
...
Avoid extra mount/unmount during container registration
2014-02-11 17:13:33 -05:00
Michael Crosby
a66124ec6a
Merge pull request #4055 from alexlarsson/remove-devmapper-dirs
...
devmapper: Remove directory when removing devicemapper device
2014-02-11 17:05:56 -05:00
unclejack
2a9a83cf94
Merge pull request #4049 from vieux/fix_commit
...
fix --run in docker commit
2014-02-11 22:33:27 +02:00
Tianon Gravi
029a045ef5
Merge pull request #3990 from 1uptalent/3989-fix-textmate-syntax
...
Fix textmate syntax bundler organization
2014-02-11 13:16:26 -07:00
Michael Crosby
3c215ba410
Merge pull request #4059 from alexlarsson/no-netadmin-caps
...
lxc: Drop NET_ADMIN capability in non-privileged containers
2014-02-11 14:20:34 -05:00
Alexander Larsson
0c71015dcf
Avoid extra mount/unmount during container registration
...
Runtime.Register() called driver.Get()/Put() in order to read back the
basefs of the container. However, this is not needed, as the basefs
is read during container.Mount() anyway, and basefs is only valid
while mounted (and all current calls satisfy this).
This seems minor, but this is actually problematic, as the Get/Put
pair will create a spurious mount/unmount cycle that is not needed and
slows things down. Additionally it will create a supurious
devicemapper activate/deactivate cycle that causes races with udev as
seen in https://github.com/dotcloud/docker/issues/4036 .
With this change devicemapper is now race-free, and container startup
is slightly faster.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-11 18:02:30 +01:00
Michael Crosby
35821ad78f
Ensure docker cp stream is closes properly
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-11 06:21:53 -08:00
Alexander Larsson
6128dcea4a
devmapper: Remove byHash hack
...
We no longer pass "pool" anywhere that uses byHash() per the last
commit, so we can now remove this hack.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-11 13:02:00 +01:00
Alexander Larsson
eab270395e
devmapper: Fix shutdown warnings
...
Shutdown contains debug warnings like:
[debug] deviceset.go:699 [deviceset docker-0:33-17945897] waitRemove(/dev/mapper/docker-0:33-17945897-pool)
[debug] deviceset.go:380 libdevmapper(3): libdm-common.c:552 (-1) Device /dev/mapper/docker-0:33-17945897-pool not found
This is because shutdown is using removeDeviceAndWait() to remove the pool device and the
wait part fails because the pool is gone.
We fix this by adding a pool specific removal function which avoids all the trickiness of the
normal remove.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-11 12:47:59 +01:00
Michael Crosby
34f5d94b2c
Merge branch 'add-netlink-functions' of github.com:crosbymichael/docker into add-netlink-functions
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-11 03:33:18 -08:00
Michael Crosby
2205707084
Merge pull request #5 from tianon/null-terminators-are-important
...
Add comment clarifying null termination
2014-02-11 12:33:07 -05:00
Tianon Gravi
c626349f65
Add comment clarifying null termination
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-11 10:32:31 -07:00
Michael Crosby
27ed9a9f98
Exec out to ip right now for creating the veth pair
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-11 03:32:35 -08:00
Sven Dowideit
b2146cb0e7
add a little more information about the docker run -P option
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-11 20:34:26 +10:00
Alexander Larsson
02fddffd51
lxc: Drop NET_ADMIN capability in non-privileged containers
...
With this capability set the container can e.g. change the ip address
of his devices to that of another container on the docker0 bridge. In
a quick test I was able to listen to a port on a different ip than the
one docker assigned me, but was not able to hijack an open port
redirection that another container had open. Maybe its possible with
some more knowledge of networking though.
Anyway, network setup is meant to be handled by docker, not the apps,
so I believe denying this is generally in the spirit of docker, and
it closes down potential security issues.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-11 11:17:34 +01:00
Alexander Larsson
eb4578daee
devicemapper: Fix tests on fedora
...
If /dev/loop-control exists on the system running the test then
ioctlLoopCtlGetFree() will be called, but if not it won't. It does
not exist in the standard docker build environment, so the tests
currently require this to not be called. This makes it instead
optional, allowing the tests to run on e.g. Fedora.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-11 09:42:34 +01:00
Alexander Larsson
2343fe4453
devmapper: Remove directory when removing devicemapper device
...
We're currently leaving around lots of empty directories in
/var/lib/docker/devicemapper/mnt/ for removed images and containers.
Fix this by removing the directory when the device is removed.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-11 09:40:13 +01:00
Michael Crosby
f9cd1be6ff
Add more netlink functions for set ns by fd and bring iface down
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-10 22:32:07 -08:00
Sven Dowideit
82863aecab
add a little info on upgrading
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-02-11 14:58:42 +10:00
Sven Dowideit
c4b9e1c9ad
point out that ENV DEBIAN_FRONTEND will persist, so its not recommended
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-11 13:16:54 +10:00
Michael Crosby
4dec36d1ee
Allow add of empty name
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-10 16:41:16 -08:00
Sven Dowideit
5051b8610d
bring back the explaination of our LGTM process
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-02-11 10:10:50 +10:00
Victor Vieux
5d29749e9d
fix --run in docker commit
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-10 23:52:15 +00:00
Andy Rothfusz
2975ba6f73
Merge pull request #4019 from ostezer/fix-installation-windows-doc-title
...
docs: Installation Instruction Title & Description Fixes
2014-02-10 15:26:32 -08:00
Victor Vieux
2dcb48af0f
Merge pull request #3524 from tianon/supplementary-groups
...
Add supplementary groups lookup in sysinit
2014-02-10 14:42:14 -08:00
Victor Vieux
036900a63a
Merge pull request #3871 from jdef/patch-1
...
Update lxc_template.go
2014-02-10 14:38:39 -08:00
Michael Crosby
38eabfa65c
Create veth pair via netlink
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-10 13:37:16 -08:00
O.S.Tezer
10d57b648f
docs: Installation Instruction Title & Description Fixes
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
1. All titles are listed by simple platform names apart from Windows' "Installing Docker On Windows". Changed this to "Windows" to match the rest.
2. Some articles' description (and title) information does not match the majority. Modified them to match the rest (i.e. Please note this project is currently under heavy development. It should not be used in production.)
3. Removed "Linux" from Gentoo & Ubuntu descriptions.
2014-02-10 23:34:56 +02:00
Guillaume J. Charmes
63f0bbaf14
Merge pull request #4026 from crosbymichael/fix-linking-icc
...
Add bidirectional iptables rule back to links
2014-02-10 13:13:28 -08:00
Tianon Gravi
0a0406450f
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)
2014-02-10 13:48:43 -07:00
Guillaume J. Charmes
19e01a6363
Merge pull request #3983 from creack/remove_linux_specific
...
Remove linux specific calls
2014-02-10 12:10:38 -08:00
Guillaume J. Charmes
b42e669a19
Merge pull request #4042 from crosbymichael/allow-empty-cmd
...
Improve no command handling
2014-02-10 11:53:14 -08:00
Michael Crosby
27df18ff11
Improve get if socket loop
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-10 11:36:23 -08:00
Michael Crosby
4482115840
Improve no command handling
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-10 11:04:24 -08:00
Guillaume J. Charmes
66f639e8a6
Merge pull request #4017 from alexlarsson/skip_block_zeroing
...
devmapper: Enable skip_block_zeroing
2014-02-10 10:33:37 -08:00
Michael Crosby
6174bad135
Merge pull request #4031 from tianon/gopath
...
Add slightly better GOPATH detection/handling
2014-02-10 13:06:41 -05:00
Michael Crosby
40ede286b8
Merge pull request #4013 from creack/remove_panic_lxc
...
Remove panic in lxc driver.
2014-02-10 12:52:52 -05:00
Michael Crosby
ccf2b96fbc
Merge pull request #4 from tianon/slight-netlink-cleanup
...
Update NetworkChangeName to be more similar to my original
2014-02-10 01:42:05 -05:00
Tianon Gravi
d3d85d38fb
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)
2014-02-09 18:21:01 -07:00
Tianon Gravi
3a7c144e99
Update NetworkChangeName to be more similar to my original (moving IFNAMSIZ constant outside the function like it should've been)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-09 18:14:17 -07:00
Andrew Williams
95bcb8924a
Adjust test to match its comment
...
Docker-DCO-1.1-Signed-off-by: Andrew Williams <williams.andrew@gmail.com > (github: TheDude05)
2014-02-09 15:36:04 -06:00
Michael Crosby
524416560a
Replace my C code with tianons Go code
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-09 05:54:13 -08:00
Guillaume J. Charmes
3dfc910d77
Remove linux specific calls
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-09 04:23:57 -08:00
Michael Crosby
0cba91e264
Add bidirectional iptables rule back to links
...
Fixes #4014
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-09 01:43:46 -08:00
Alexander Larsson
695719b29a
devmapper: Enable skip_block_zeroing
...
This makes the device mapper not zero out blocks allocated on the
thinp device. This is safe in our use case, as we access the device
via a filesystem that doesn't leak any uninitialized data to userspace.
This partially helps with https://github.com/dotcloud/docker/issues/3280
and should generally improve preformance on the devicemapper backend.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-09 07:29:28 +01:00
Michael Crosby
ee39033073
Use c to change interface name
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-08 20:44:04 -08:00
Tianon Gravi
72c72f91c6
Swap Firefox to Iceweasel so that the Desktop Integration example is simplified and easier to understand
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-08 11:34:11 -07:00
Michael Crosby
e3762e8d69
Add network set interface in namespace by pid
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-08 10:03:16 -08:00
Michael Crosby
a6c791e8a9
Add set master for interface
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-08 09:53:04 -08:00
Guillaume J. Charmes
7c06d5e34e
Remove panic in lxc driver.
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-07 19:09:52 -08:00
Andy Rothfusz
8228e50581
Merge pull request #3987 from SvenDowideit/warn-against-symlinks
...
please, for the love of Docker, do. not. use. symlinks
2014-02-07 18:48:19 -08:00
Guillaume J. Charmes
105188be2e
Merge pull request #3932 from SvenDowideit/no-docker-meeting-channel
...
remove mention of #docker-meeting
2014-02-07 16:28:10 -08:00
Michael Crosby
36aafeb0b4
Merge pull request #3978 from philips/add-philips-as-pkg-systemd-maintainer
...
pkg: systemd: add initial MAINTAINERS
2014-02-07 12:32:21 -05:00
Sven Dowideit
f787bec4a6
please, for the love of Docker, do. not. use. symlinks
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-02-07 20:20:41 +10:00
German DZ
ac06646b1f
Instructions for Textmate's bundle installation
...
Docker-DCO-1.1-Signed-off-by: German Del Zotto <germ@ndz.com.ar > (github: GermanDZ)
2014-02-07 09:30:11 +01:00
German DZ
f289b3a19e
New folder structure to support TextMate2 bundles format
...
Docker-DCO-1.1-Signed-off-by: German Del Zotto <germ@ndz.com.ar > (github: GermanDZ)
2014-02-07 09:29:14 +01:00
Dafydd Crosby
b2945f2776
Fix RST formatting
2014-02-07 00:10:47 -07:00
Andy Rothfusz
31a1a815c4
Merge pull request #3984 from jamtur01/secfaw
...
Added Security FAQ question
2014-02-06 17:40:59 -08:00
James Turnbull
55b74bfe46
Added Security FAQ security
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-02-07 01:42:11 +01:00
Guillaume J. Charmes
547ac42199
Add Freebsd client support
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-06 16:40:39 -08:00
Guillaume J. Charmes
d0fc598ce2
Merge pull request #3948 from alexlarsson/devmapper-unmount
...
Devmapper cleanup and unmount fix
2014-02-06 15:10:06 -08:00
Guillaume J. Charmes
e8740685ce
Remove linux specific calls
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-06 14:13:03 -08:00
Alexander Larsson
693d3f8c6a
devmapper: Fix MountDevice for non-existing Device
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-06 23:08:17 +01:00
Alexander Larsson
304e33a2fe
devmapper: Fix UnmountDevice for non-existing device
...
Properly error out if passed an id that doesn't exist.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-06 22:26:09 +01:00
Tianon Gravi
84285f7539
Merge pull request #3966 from asbjornenge/updated_tmlang
...
Update TextMate & Sublime Text Syntaxt Highlighting with ONBUILD
2014-02-06 14:20:52 -07:00
Tianon Gravi
1c6f909d32
Merge pull request #3977 from tianon/vim-onbuild
...
Add "ONBUILD" highlighting to our vim syntax file
2014-02-06 14:20:09 -07:00
Brandon Philips
15711ed670
pkg: systemd: add initial MAINTAINERS
...
I volunteered for pkg/systemd MAINTAINER and there were no objections
during the #docker-dev meeting. For context I wrote most of the stuff in
here and wrote the dependent calls in api.go. Plus, I actively test the
code via CoreOS.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-02-06 12:04:35 -08:00
Daniel Mizyrycki
c94ad37370
Merge pull request #3913 from mzdaniel/docker-ci-coverage
...
docker-ci: Add new docker coverage report
2014-02-06 20:04:21 +00:00
Daniel Mizyrycki
25d87553f6
docker-ci: Add new docker coverage report
...
Docker-DCO-1.1-Signed-off-by: Daniel Mizyrycki <daniel@docker.com > (github: mzdaniel)
2014-02-06 11:59:29 -08:00
Asbjørn Enge
f6c6f303f8
Added support for single quoted strings
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net > (github: asbjornenge)
2014-02-06 20:50:36 +01:00
Asbjørn Enge
888e8da283
Improved regex
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net > (github: asbjornenge)
2014-02-06 20:48:15 +01:00
Asbjørn Enge
3d86f07f87
Updated readme
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net > (github: asbjornenge)
2014-02-06 20:38:25 +01:00
Asbjørn Enge
647db3938d
Added suppport for the ONBUILD instruction
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net > (github: asbjornenge)
2014-02-06 20:38:20 +01:00
Asbjørn Enge
e95bb0b4a9
Removed the YAML file since I wasn't using it
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net > (github: asbjornenge)
2014-02-06 20:37:49 +01:00
Asbjørn Enge
6561d65438
Added Dockerfile.tmPreferences for hotkey commenting
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net > (github: asbjornenge)
2014-02-06 20:35:45 +01:00
Michael Crosby
22aeae34c1
Merge pull request #3974 from creack/3967-add_content_type-fix
...
Add json content type to /containers/json api endpoint
2014-02-06 14:18:00 -05:00
Michael Crosby
3ff62eb227
Merge pull request #3963 from unclejack/update-contributing
...
Update issue filing & PR submission instructions
2014-02-06 14:17:07 -05:00
Tianon Gravi
e634f23940
Add "ONBUILD" highlighting to our vim syntax file
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-06 11:12:57 -07:00
unclejack
1a12e9fbc6
Merge pull request #3972 from crosbymichael/fix-release-panic
...
Check for nil information return
2014-02-06 19:39:07 +02:00
Guillaume J. Charmes
d5d948a038
Add json content type to /containers/json api endpoint
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-06 09:28:30 -08:00
Guillaume J. Charmes
983edd40fa
Merge pull request #3956 from crosbymichael/no-ping-from-client
...
Do not ping registry from the cli
2014-02-06 08:14:35 -08:00
Guillaume J. Charmes
2a1609d618
Merge pull request #3945 from crosbymichael/fix-brigeiface
...
Fix bad rebase where bridgeiface was removed
2014-02-06 07:38:32 -08:00
Alexander Larsson
2c82fd93d8
devmapper: Handle EBUSY while removing
...
For some reason we seem to get transient EBUSY when removing
thinp devices, which prohibit removing containers. When
this happens we retry a few times which seems to fix the
issue for me.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-06 13:14:49 +01:00
Alexander Larsson
7e25cd5891
devmapper: Use removeDeviceAndWait in DeviceSet.removeDevice()
...
This makes sure the device is removed just like in deactivateDevice.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-06 13:14:49 +01:00
Alexander Larsson
b95c560fdd
devmapper: Move refcounting to DeviceSet
...
We already have some kind of refcounting in DeviceSet, this fleshes
it out to allow it to completely subsume the refcounting in
devmapper.Driver.
This allows us to drop the double refcounting, and the locking inside
devmapper.Driver. This, in particular the locking simplification will
make it easier in the future to parallelize the device mapper.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-06 13:14:42 +01:00
Michael Crosby
bbe382bec4
Check for nil information return
...
Fixes #3912
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-06 03:18:12 -08:00
unclejack
1f6000eaa0
update issue filing & PR submission instructions
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-02-06 11:06:25 +02:00
unclejack
09702f4c31
Merge pull request #3954 from ibuildthecloud/broken-1.6-images-api
...
Fix broken images API for version <1.7
2014-02-06 10:25:14 +02:00
Sven Dowideit
4f7d325c0a
Merge pull request #3888 from therealprologic/master
...
Added installation docs for CRUX as a Docker Host.
2014-02-06 18:15:49 +10:00
Darren Shepherd
55e5e37c4f
Fix broken images API for version <1.7
...
Simple typo, "ID" should be "Id". This is causing the images response
to not have IDs in it.
Docker-DCO-1.1-Signed-off-by: Darren Shepherd <darren.s.shepherd@gmail.com > (github: ibuildthecloud)
2014-02-05 19:09:55 -07:00
Michael Crosby
e2eace9715
Do not ping registry from the cli
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-05 16:49:43 -08:00
James Mills
f5d028c838
Added installation docs for CRUX as a Docker Host.
...
Docker-DCO-1.1-Signed-off-by: James Mills <prologic@shortcircuit.net.au > (github: therealprologic)
2014-02-06 10:37:33 +10:00
Andy Rothfusz
9dd92a9823
Merge pull request #3944 from joeshaw/patch-1
...
Always download things over https
2014-02-05 13:56:41 -08:00
Andy Rothfusz
f9f30f1ced
Merge pull request #3938 from SvenDowideit/workdir-doc-tweak
...
be a little more explicit about what WORKDIR does
2014-02-05 13:54:49 -08:00
Joe Shaw
3841e88625
Always download things over https
...
Docker-DCO-1.1-Signed-off-by: Joe Shaw <joe@joeshaw.org > (github: joeshaw)
2014-02-05 15:46:41 -05:00
Alexander Larsson
dca21dfac7
devmapper: add and use removeDeviceAndWait helper
...
This adds a function that calls the lowlevel removeDevice
and then waits for it to finish.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-05 21:27:12 +01:00
Alexander Larsson
63d4b293e7
devmapper: Rename DeviceSet.RemoveDevice to DeleteDevice
...
"Remove" is a bit overloaded, as it is also what deactivating a
device mapper device is called. Using "delete" is more clear here.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-05 21:27:12 +01:00
Michael Crosby
347dc39427
Fix bad rebase where bridgeiface was removed
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-05 11:20:59 -08:00
Michael Crosby
7fb8738839
Merge pull request #3941 from crosbymichael/merge_release_v0.8.0
...
Merge release v0.8.0
2014-02-05 14:16:25 -05:00
Michael Crosby
5cb45544c6
Change version to v0.8.0-dev
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-05 09:54:34 -08:00
Michael Crosby
3a8fff964c
Merge branch 'release' into merge_release_v0.8.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-05 09:54:15 -08:00
Michael Crosby
fe6406b0f2
Merge pull request #3916 from crosbymichael/bump_v0.8.0
...
Bump to v0.8.0
2014-02-05 12:49:41 -05:00
Sven Dowideit
a17d7d9a73
be a little more explicit about what WORKDIR does
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-05 13:26:49 +10:00
Andy Rothfusz
880dc34c0e
Merge pull request #3933 from proppy/patch-1
...
docs/installation/google: remove -mtu flag
2014-02-04 17:24:18 -08:00
Johan Euphrosine
650200239b
docs/installation/google: remove -mtu flag
2014-02-04 17:19:05 -08:00
Sven Dowideit
d43c85961f
remove mention of #docker-meeting
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-05 10:15:22 +10:00
Michael Crosby
cc3a8c8d8e
Bump to version 0.8.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-04 16:08:57 -08:00
Andy Rothfusz
501d0499f8
Merge pull request #3928 from metalivedev/fixheadings
...
Fixes headings in Table of Contents, link from FAQ.
2014-02-04 14:59:24 -08:00
Andy Rothfusz
fa0afe89ad
Merge pull request #3929 from ostezer/master
...
mac-installation-docs: Update the installation dir.
2014-02-04 14:51:05 -08:00
Michael Crosby
5a49fba15e
Merge pull request #3927 from tianon/release-checklist-mention-contributors
...
Update RELEASE-CHECKLIST to mention how to get a decent contributors list
2014-02-04 14:46:41 -08:00
O.S.Tezer
aed37e70b9
mac-installation-docs: Update the installation dir.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-02-05 00:44:55 +02:00
Andy Rothfusz
18b896e0f0
Fixes headings in Table of Contents, link from FAQ.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
2014-02-04 14:16:27 -08:00
Michael Crosby
9fbb134d87
Merge pull request #3926 from tianon/update-mailmap
...
Update .mailmap and AUTHORS
2014-02-04 13:33:41 -08:00
Tianon Gravi
bd85631ca5
Update .mailmap and AUTHORS
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-04 13:40:56 -07:00
Andy Rothfusz
3455c6f470
Merge pull request #3918 from ostezer/master
...
docs: Requirements And Installation on Mac OS X 10.6 Snow Leopard
2014-02-04 12:38:51 -08:00
Tianon Gravi
bac7e741bf
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)
2014-02-04 13:34:24 -07:00
O.S.Tezer
a9b325e5b0
docs: Installation on Mac OS X 10.6 Snow Leopard
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-02-04 22:26:06 +02:00
Guillaume J. Charmes
81b2940c89
Merge pull request #3254 from shykes/onbuild
...
New build instruction: ONBUILD defines a trigger to execute when extending an image with a new build
2014-02-04 11:38:27 -08:00
Solomon Hykes
ded9e0d6df
builder: clearly display ONBUILD triggers during a build.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-04 19:11:56 +00:00
unclejack
6ed7461eac
Merge pull request #3557 from unclejack/improve_vagrantfile
...
improve the Vagrant VMs: bump RAM to 512 MB & correct forwarded ports
2014-02-04 10:23:52 -08:00
unclejack
495135b68a
Merge pull request #3922 from jpoimboe/iptables-public-dest-port-fix
...
iptables: use dest_addr and dest_port for public port FORWARD rule
2014-02-04 10:06:43 -08:00
Andy Rothfusz
23959e6cf8
Merge pull request #3919 from SvenDowideit/missing-quote
...
missing quote quota
2014-02-04 10:03:26 -08:00
Josh Poimboeuf
ea63ade772
iptables: use dest_addr and dest_port for public port FORWARD rule
...
Docker-DCO-1.1-Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com > (github: jpoimboe)
2014-02-04 11:32:50 -06:00
unclejack
297001f515
improve the Vagrant VMs
...
This bumps the VM memory and corrects forwarded ports when they're used
already.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-02-04 12:26:14 +02:00
Tianon Gravi
3fda1819ee
Merge pull request #3920 from SvenDowideit/hack-spelling
...
Fix hack/MAINTAINERS.md spelling problems
2014-02-03 21:34:51 -08:00
Sven Dowideit
df4682907d
i was reading, and it sprang out at me :)
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-02-04 15:32:19 +10:00
Sven Dowideit
64426c74f2
missing quote quota
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-02-04 15:29:47 +10:00
Tianon Gravi
cb0ac55b5b
Merge pull request #3897 from sandaya/master
...
Update mkimage-arch.sh to set proper permissions on rootfs directory
2014-02-03 18:42:58 -08:00
Samuel Andaya
736bf3f7e6
Update mkimage-arch.sh
...
mktemp creates a root directory ("/") with permissions set to 700. Default should be 755 so other users in the container can access its subdirs (e.g http user for nginx for /srv/http/test/index.html).
Docker-DCO-1.1-Signed-off-by: Samuel Andaya <samuel@andaya.net > (github: sandaya)
2014-02-03 21:26:47 -05:00
Solomon Hykes
9f994c9646
New build instruction: ONBUILD defines a trigger to execute when extending an image with a new build
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-04 01:31:19 +00:00
Solomon Hykes
a51f5a287b
Builder: extract the execution of a single build step into buildFile.BuildStep
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-04 01:23:01 +00:00
unclejack
b5d6208ccf
Merge pull request #3915 from crosbymichael/no-double-put
...
No no put put
2014-02-03 16:40:44 -08:00
Guillaume J. Charmes
b56440fa24
Merge pull request #3887 from proppy/detect-network-mtu
...
docker: detect defaultNetworkMtu from default route
2014-02-03 16:35:15 -08:00
unclejack
5fcd4efd26
Merge pull request #3188 from keyvanfatehi/vagrant-port-forwarding-list
...
Vagrantfile port forwarding made more flexible (w/ comments)
2014-02-03 16:29:47 -08:00
Michael Crosby
02fdc194fc
Fix unmounts out of container export funcs
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-03 16:14:16 -08:00
Michael Crosby
d277a4c0f8
Do not call Put twice and do not call it on defer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-03 16:14:02 -08:00
Andy Rothfusz
8beca66741
Merge pull request #3883 from metalivedev/fix-3879
...
Fixes #3879 by updating embedding of ascii.io (now asciinema.io)
2014-02-03 16:09:54 -08:00
Keyvan Fatehi
d8718e435d
Vagrantfile port forwarding usages documented. Added usage via envvar FORWARD_PORTS for custom port or list of comma-separated ports
...
Docker-DCO-1.1-Signed-off-by: Keyvan Fatehi <keyvanfatehi@gmail.com > (github: keyvanfatehi)
2014-02-03 16:07:52 -08:00
Andy Rothfusz
fca2f3e742
Updated width to 815 per comment.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
2014-02-03 16:06:29 -08:00
Johan Euphrosine
ab1482e9c2
docs/cli: add mtu option
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: google)
2014-02-03 16:01:38 -08:00
Johan Euphrosine
92e61f89aa
docker/config: update -mtu flag default
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: google)
2014-02-03 15:36:39 -08:00
Johan Euphrosine
1b9c5edc6c
networkdriver: add ErrNoDefaultRoute
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: google)
2014-02-03 14:27:59 -08:00
unclejack
4e9164ff5f
Merge pull request #3908 from crosbymichael/fix-login-prompt
...
Fix login prompt on push and pull because of error message
2014-02-03 14:19:14 -08:00
Guillaume J. Charmes
a9860d8553
Merge pull request #3911 from crosbymichael/fix-remove-volume
...
Fix comparing binds and volume ids from other containers
2014-02-03 14:03:57 -08:00
Michael Crosby
720c5774e9
Fix comparing binds and volume ids from other containers
...
Currently comparing volume ids for binds and other containers are broken
Fixes #3749
Fixes #3885
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-03 13:18:10 -08:00
James DeFelice
17c124baf6
Update lxc_template.go
...
If networking is disabled, but then pipework is used later to add nics, the network still doesn't function. Using flags=up for empty networking fixes this.
Docker-DCO-1.1-Signed-off-by: James DeFelice <james.defelice@ishisystems.com > (github: jdef)
2014-02-03 16:14:15 -05:00
Michael Crosby
0fa9199f78
Fix login prompt on push and pull because of error message
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-03 11:38:34 -08:00
Tianon Gravi
88d66600b3
Merge pull request #3906 from tianon/unprefix-ubuntu
...
Remove stackbrew prefix on ubuntu images now that they're reasonably up-to-date and stable
2014-02-03 10:28:50 -08:00
Tianon Gravi
f4a7c43776
Remove stackbrew prefix on ubuntu images now that they're reasonably up-to-date and stable
...
Everyone probably wants to run `docker pull ubuntu` before building with this change.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-03 11:08:35 -07:00
Michael Crosby
6863145148
Merge pull request #3904 from alexlarsson/fix-docker-commit-output
...
Fix docker commit output
2014-02-03 10:00:53 -08:00
Michael Crosby
9431b8d503
Merge pull request #3893 from tianon/clean-up-btrfs-error-messages
...
Fix several btrfs driver error messages
2014-02-03 09:51:41 -08:00
Michael Crosby
fb796900fb
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)
2014-02-03 09:41:11 -08:00
Tianon Gravi
f7f8e3c2b3
Fix several btrfs driver error messages
...
Several of the error messages were wrong, but not one of them was helpful, so this fixes them to include the important information (the actual error), and a correct description of which operation failed.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-03 09:12:18 -07:00
Tianon Gravi
62aa446101
Merge pull request #3899 from tianon/do-not-strip-binaries
...
Update PACKAGERS.md to explicitly talk about stripping
2014-02-03 07:08:49 -08:00
Alexander Larsson
b61c1d0d42
Fix docker commit output
...
The id is returned as Id, not ID, so print the right thing.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-03 14:59:09 +01:00
Tianon Gravi
7ffd2b0785
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)
2014-02-02 22:47:42 -07:00
Tianon Gravi
6922f1be08
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)
2014-02-01 23:23:33 -07:00
Johan Euphrosine
4d0a026c98
docker: detect defaultNetworkMtu from default route
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: google)
2014-02-01 03:46:37 -08:00
Tianon Gravi
e8963748fc
Consolidate a bunch of the supplementary-groups tests to cut down on the number of RUN lines in a single Dockerfile within TestBuild
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-31 20:15:24 -07:00
Michael Crosby
4ffc52385c
Use type switch instead of reflection
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-31 20:15:24 -07:00
Tianon Gravi
ee93f6185b
Move UserLookup functionality into a separate pkg/user submodule that implements proper parsing of /etc/passwd and /etc/group, and use that to add support for "docker run -u user:group" and for getting supplementary groups (if ":group" is not specified)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-31 20:15:24 -07:00
Victor Vieux
a446b34719
Merge pull request #3832 from jlhawn/3831-auth-tests-server-address
...
Prevent Tests from creating users on Prod Index
2014-01-31 18:34:13 -08:00
Guillaume J. Charmes
c9f6e446ee
Merge pull request #3881 from crosbymichael/no-all-number
...
Do not generate all numberic truncated ids
2014-01-31 18:07:01 -08:00
Andy Rothfusz
b0f4ad431d
Fixes #3879 by updating embedding of ascii.io (now asciinema.io)
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
2014-01-31 18:02:45 -08:00
Guillaume J. Charmes
f9b4146ad4
Merge pull request #3868 from 1uptalent/3867-allow-pax-global-extended-headers-to-passthrough
...
FIX 3867 allow pax global extended headers to passthrough
2014-01-31 17:54:08 -08:00
Michael Crosby
9b7054fd0b
Do not generate all numberic truncated ids
...
Fixes #3869
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-31 17:37:13 -08:00
Guillaume J. Charmes
87c1403948
Merge pull request #3880 from vieux/fix_docker_login
...
fix docker login
2014-01-31 17:31:27 -08:00
Victor Vieux
31ee45e6ae
Merge pull request #3882 from vieux/fix_compat_api
...
fix api with old version
2014-01-31 17:25:39 -08:00
Victor Vieux
e43236c78a
fix api with old version
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-01 01:24:39 +00:00
Guillaume J. Charmes
819c2e3eca
Merge pull request #3872 from crosbymichael/network-driver
...
Remove networking out of core and into a driver
2014-01-31 17:22:37 -08:00
Victor Vieux
d22a39db26
fix docker login
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-01 01:14:59 +00:00
Victor Vieux
23815414ea
Merge pull request #3878 from vieux/remove_REMOTE_TODO.md
...
remove REMOTE_TODO.md
2014-01-31 15:50:57 -08:00
Victor Vieux
bf1f655fa2
remove REMOTE_TODO.md
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-31 23:50:34 +00:00
Michael Crosby
6a1ee89d2d
Merge pull request #3827 from vieux/mova_api_package
...
Move api into sub package
2014-01-31 15:39:33 -08:00
Victor Vieux
9eea7f28f0
Move serveapi to api/api.go
...
Remove api import from server.go
Rename initapi to init server
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-31 23:06:00 +00:00
Victor Vieux
78189c9bcf
Merge pull request #3876 from dotcloud/fix_panic_mflag
...
fix panic in mflag
2014-01-31 14:43:16 -08:00
Michael Crosby
cb3bd91689
Fix IP case for BridgeIP
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-31 12:18:45 -08:00
Michael Crosby
50fea89782
Fix links test to not accept bridge
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-31 12:07:51 -08:00
Michael Crosby
a11bee44d7
Update code from pr #3842 post rebase
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-31 12:04:44 -08:00
Michael Crosby
1d4de9ce1f
Fix port mapping unit tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-31 12:04:44 -08:00
Michael Crosby
167403988d
Move network aspect of links into driver as a job
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-31 12:04:44 -08:00
Michael Crosby
2df0166107
Implement requesting the name ip
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-31 12:04:44 -08:00
Michael Crosby
49b9813035
Fix integration tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-31 12:04:44 -08:00
Michael Crosby
2d8709696c
Fix sending []byte in job env
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-31 12:04:44 -08:00
Michael Crosby
c712e74b45
Update core calls to network drivers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-31 12:04:44 -08:00
Michael Crosby
90494600d3
Finish moving networking information into driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-31 12:04:44 -08:00
Michael Crosby
53ee1daa69
Merge pull request #3841 from alexlarsson/separate-base-fs
...
Separate out graphdriver mount and container root
2014-01-31 11:49:14 -08:00
Victor Vieux
523341d994
Merge pull request #3857 from creack/remove_darwin_files
...
Remove all darwin specific files and use more generic _unsupported with build tags.
2014-01-31 11:48:10 -08:00
Victor Vieux
65794a2c49
fix panic in mflag
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-31 11:39:29 -08:00
Michael Crosby
674ee1bc8e
Merge pull request #3828 from tianon/add-user-email-to-dockerfile
...
Add dummy "user.email" setting in our Dockerfile for smooth in-container merge commits
2014-01-31 11:03:17 -08:00
Victor Vieux
b881a6c3c2
merge master
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-31 19:00:06 +00:00
Michael Crosby
f267938fb8
Merge pull request #3844 from clkao/lxc-kill-deprecation
...
Use lxc-stop -k instead of lxc-kill
2014-01-31 10:57:40 -08:00
Guillaume J. Charmes
ff6409382b
Merge pull request #4 from tianon/cross-compile-and-release-linux-i386-and-arm-clients
...
Update/fix build tags, Dockerfile, and release.sh for proper building and releasing of linux/386 and linux/arm cross-compiled client binaries
2014-01-31 10:51:25 -08:00
Victor Vieux
51d280f944
merge master
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-31 18:43:34 +00:00
Michael Crosby
643c7dc25d
Merge pull request #3829 from vieux/fix_api_regression
...
Fix ID -> Id api
2014-01-31 10:38:57 -08:00
Andy Rothfusz
70ab72ff32
Merge pull request #3864 from SvenDowideit/lxc-kill-script-workaround-doc
...
add a known issue for lxc-1.0.0.beta3 and beyond for removeal of lxc-kil...
2014-01-31 10:27:04 -08:00
Andy Rothfusz
feea1dda41
Merge pull request #3861 from metalivedev/fixkerneldeps
...
Fixed link to kernel dependencies.
2014-01-31 10:25:25 -08:00
unclejack
5258f833bc
Merge pull request #3866 from crosbymichael/dont-allocate-1
...
Do not allocate networks first ip
2014-01-31 09:47:28 -08:00
unclejack
35ef0d37c2
Merge pull request #3800 from vieux/cleanup_jobs
...
Cleanup jobs
2014-01-31 06:55:12 -08:00
Abel Muiño
ce74c8b4d2
Ignore tar.TypeXGlobalHeader
...
Docker-DCO-1.1-Signed-off-by: Abel Muiño <amuino@gmail.com > (github: amuino)
2014-01-31 14:57:30 +01:00
Abel Muiño
7b2ec7fb2d
Unit test ensuring that a tar.TypeXGlobalHeader does not cause an error
...
Docker-DCO-1.1-Signed-off-by: Abel Muiño <amuino@gmail.com > (github: amuino)
2014-01-31 14:57:18 +01:00
Tianon Gravi
065dd231dd
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)
2014-01-31 03:16:42 -07:00
unclejack
59ec012efc
Merge pull request #3125 from rjeczalik/master
...
vagrant: added PRIVATE_NETWORK env var
2014-01-31 01:06:47 -08:00
Tianon Gravi
b4604ae7cf
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
2014-01-31 00:56:30 -08:00
Tianon Gravi
56317c74f7
Merge pull request #3760 from tianon/better-nondocker-warning
...
Update hack/make.sh with slightly clearer output and a more precise "are we in the Docker container?" check
2014-01-31 00:54:44 -08:00
Tianon Gravi
d009cb0bed
Merge pull request #3848 from tianon/fix-yaml-space-parsing
...
Fix fun Travis DCO check YAML parsing issues (especially with commit messages that start with any kind of whitespace, like this one intentionally does)
2014-01-31 00:53:47 -08:00
Michael Crosby
d86c1b064d
Not not allocate networks first ip
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-30 23:10:19 -08:00
Victor Vieux
8fbdb7b59e
add setSubEnv and getSubEnv
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-31 04:01:46 +00:00
Victor Vieux
24086fa75d
job.error\* now return engine.StatusErr
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-31 04:01:46 +00:00
Victor Vieux
2b52d6e801
Remove api_params.go
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-31 03:59:14 +00:00
Victor Vieux
fc2f998822
remove some mkServerFromEngine
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-31 03:34:50 +00:00
Solomon Hykes
a0d82b17c7
Merge pull request #3863 from vieux/default_getint_0
...
changed default value of getenvint to 0. fix tests
2014-01-30 19:04:46 -08:00
Sven Dowideit
630459f2b8
add a known issue for lxc-1.0.0.beta3 and beyond for removeal of lxc-kill see #3844
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-01-31 12:30:16 +10:00
Victor Vieux
1498cd4e05
use exists
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-31 02:21:59 +00:00
Victor Vieux
28b5ae8cc4
changed default value of getenvint to 0. fix tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-31 02:06:08 +00:00
Rafal Jeczalik
ce423cc9a8
vagrant: added PRIVATE_NETWORK env var
...
Docker-DCO-1.1-Signed-off-by: Rafal Jeczalik <rjeczalik@gmail.com > (github: rjeczalik)
2014-01-31 02:03:57 +01:00
Tianon Gravi
7ced204372
Merge pull request #3860 from vieux/integration_makefile
...
Add "make test-integration"
2014-01-30 16:10:27 -08:00
Andy Rothfusz
e64a9a3bad
Merge pull request #3758 from metalivedev/2720-running
...
Fixes 2720
2014-01-30 16:09:19 -08:00
Andy Rothfusz
98518bbcad
Fixed link to kernel dependencies. Wrapped long lines. Removed old tar dependency from list.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
2014-01-30 16:03:13 -08:00
Victor Vieux
e4b3b391d6
Merge pull request #3858 from vieux/fix_testexitcode
...
fix TestExitCode
2014-01-30 15:52:28 -08:00
Victor Vieux
4326e541f8
add make test-integration
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-30 23:50:23 +00:00
Guillaume J. Charmes
9ae51c7403
Merge pull request #3859 from rogaha/add_missing_attributes
...
- Fixed the last cli.call's parameter from CmdSearch
2014-01-30 15:44:36 -08:00
Roberto G. Hashioka
2655a108e1
- Fixed the last cli.call's parameter from CmdSearch
...
Docker-DCO-1.1-Signed-off-by: Roberto Hashioka <roberto.hashioka@docker.com > (github: rogaha)
2014-01-30 23:21:42 +00:00
Guillaume J. Charmes
45dd051e8e
Remove all darwin specific files and use more generic _unsupported with build tags.
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-30 23:10:56 +00:00
Victor Vieux
720f64af18
fix TestExitCode
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-30 22:59:21 +00:00
Victor Vieux
9481afa617
Merge pull request #3854 from vieux/fix_tests
...
remove TestAllocateTCPPortLocalhost faillure in tests
2014-01-30 13:59:32 -08:00
Victor Vieux
8e619e13ca
remove TestAllocateTCPPortLocalhost faillure in tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-30 21:53:32 +00:00
Victor Vieux
0c8ddd502e
Merge pull request #3833 from vieux/fix_env_conversion_issues
...
Fix env conversion issues in env
2014-01-30 13:31:25 -08:00
Victor Vieux
9261511aa5
refactor all *FromJob functions
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-30 20:45:32 +00:00
Tianon Gravi
c8d1596902
Fix fun Travis DCO check YAML parsing issues (especially with commit messages that start with any kind of whitespace, like this one intentionally does)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-30 12:27:45 -07:00
Victor Vieux
0942e5c89c
Merge pull request #3842 from jpoimboe/iptables-insert-masq
...
network: insert masq rule
2014-01-30 11:26:32 -08:00
Chia-liang Kao
b111fc3646
Use lxc-stop -k when lxc-kill is not found
...
lxc-kill was removed in lxc/lxc@33ddfc2
Docker-DCO-1.1-Signed-off-by: Chia-liang Kao <clkao@clkao.org > (github: clkao)
2014-01-31 03:22:22 +08:00
Andy Rothfusz
43b7667dcc
Merge pull request #3836 from SvenDowideit/mint-cgroups-lite-docs
...
Add troubleshooting for missing cgroups on mint 16
2014-01-30 10:58:26 -08:00
Victor Vieux
c7b415d3b4
Merge pull request #3846 from tianon/unclejack-maintainer
...
Make unclejack the official Vagrantfile maintainer
2014-01-30 10:55:38 -08:00
Tianon Gravi
238dba831a
Make unclejack the official Vagrantfile maintainer
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-30 11:51:25 -07:00
Michael Crosby
637a1dcab6
Merge pull request #3718 from alexlarsson/btrfs
...
Add btrfs support to docker
2014-01-30 10:00:44 -08:00
Josh Poimboeuf
cc382ec628
network: insert masq rule
...
This fixes IP masquerading on systems with reject rules at the end of
the POSTROUTING table, by inserting the rule at the beginning of the
table instead of adding it at the end.
Docker-DCO-1.1-Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com > (github: jpoimboe)
2014-01-30 11:06:28 -06:00
Alexander Larsson
fab19d197c
Separate out graphdriver mount and container root
...
This separates out the directory as returned from the graphdriver (the
"base" fs) from the root filesystem of the live container. This is
necessary as the "diff" operation needs access to the base filesystem
without all the mounts that the running container needs (/.dockerinit,
volumes, etc).
We change container in the following way:
Container.RootfsPath() returns the the directory which will be used as
the root in a running container. It is always of the form
"/var/lib/docker/container/<id>/root" and is a private bind mount to
the base filesystem. It is only available while the container is running.
Container.BasefsPath() returns the raw directory from the graph driver
without the container runtime mounts. It is availible whenever the
container is mounted (in between a container.Mount()/Unmount() pair,
which are properly refcounted).
This fixes issue #3840
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-30 16:43:53 +01:00
Alexander Larsson
fc1169a220
pkg/mount: Add "private" flag
...
This allows "mount --make-private" functionallity.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-30 16:41:45 +01:00
Sven Dowideit
626a2e1112
Add troubleshooting for missing cgroups on mint 16 #3602
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-01-30 20:53:27 +10:00
James Turnbull
41c10fb256
Merge pull request #3835 from thinkingbox/master
...
Fix typo
2014-01-29 23:55:36 -08:00
Piergiuliano Bossi
7d95ce6ddd
Fix typo
...
Docker-DCO-1.1-Signed-off-by: Piergiuliano Bossi <pgbossi@gmail.com > (github: thinkingbox)
2014-01-29 23:07:23 -05:00
Tianon Gravi
ab50985ac9
Merge pull request #3834 from philips/fix-socket-activation-systemd
...
contrib: systemd: make socket-activation Restart same as the main service file
2014-01-29 17:46:25 -08:00
Brandon Philips
4dab34c204
contrib: systemd: make socket-activation Restart=always
...
Do as was done to f09a78cd21brandon.philips@coreos.com > (github: philips)
2014-01-29 17:42:32 -08:00
Tianon Gravi
de8480f656
Merge pull request #3531 from lsm5/docker-systemd
...
ExecStartPre commands updated in systemd service file
2014-01-29 17:38:10 -08:00
Josh Hawn
c914abaf15
Prevent Tests from creating users on Prod Index
...
The integration tests had previously used the environment variable
DOCKER_INDEX_URL but it was apparently removed several months ago.
Change the integration auth tests to specify the ServerAddress field
of the AuthConfig struct to use the staging deployment of the index.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2014-01-29 17:18:11 -08:00
Victor Vieux
187646127f
fix convertion issues
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-30 00:56:42 +00:00
Victor Vieux
5b82a1b726
add tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-30 00:55:29 +00:00
Tianon Gravi
95dff84728
Merge pull request #3734 from stpierre/mkimage-yum
...
Added new mkimage-yum.sh script to create CentOS base images
2014-01-29 14:52:51 -08:00
Victor Vieux
54072dbbd6
fix ID -> Id api
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-29 20:31:49 +00:00
Tianon Gravi
94c5f51c4a
Add dummy "user.email" setting in our Dockerfile for smooth in-container merge commits
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-29 13:13:32 -07:00
unclejack
6013cbdce8
Merge pull request #3810 from jpoimboe/iptables-forward-public-ports
...
network: add publicly mapped ports to FORWARD table
2014-01-29 11:53:26 -08:00
Victor Vieux
f556cd4186
move api to it's own package
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-29 19:26:54 +00:00
Michael Crosby
6fdc543443
Merge pull request #3819 from crosbymichael/move-port-mapper
...
Move port mapper out of core and into network drivers
2014-01-29 11:16:51 -08:00
Victor Vieux
7b7f7e4436
add setSubEnv and getSubEnv
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-29 18:53:43 +00:00
Victor Vieux
55d7aa1b49
job.error\* now return engine.StatusErr
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-29 18:52:55 +00:00
Victor Vieux
217ad5e5e6
Remove api_params.go
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-29 18:52:54 +00:00
Michael Crosby
c00cb1aca1
Merge pull request #3808 from alexlarsson/execdriver-get-pids-for-container
...
execdriver: Make GetPidsForContainer() a driver call
2014-01-29 10:38:10 -08:00
Michael Crosby
4a35146461
Merge pull request #3820 from vieux/remove_runtime_from_api
...
Remove runtime from api
2014-01-29 10:35:27 -08:00
Tianon Gravi
e1b210bee9
Merge pull request #3588 from tianon/debootstrap-tweaks
...
Add a few small tweaks to mkimage-debootstrap, especially to help with lucid
2014-01-29 08:42:14 -08:00
Lokesh Mandvekar
a9d0bbcfc6
remove ip fowarding from systemd (fixed: commit #3801 )
...
Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com > (github: lsm5)
2014-01-29 11:06:23 -05:00
Lokesh Mandvekar
f09a78cd21
ExecStartPre commands updated
...
Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com > (github: lsm5)
systemd service no longer does '/bin/mount/ --make-rprivate /'.
Core issue fixed by Alex Larsson (commit 157d99a
2014-01-29 11:06:23 -05:00
Tianon Gravi
6cfe778c2c
Make get.docker.io install directions slightly better by telling user exactly how to add themselves to the "docker" group
...
As a bonus, if the user has run this script the way we recommend (ie, without "sudo" or "su", run as their user), we can actually give them the exact command they'll need with their correct username substituted appropriately.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-29 00:10:39 -07:00
Andy Rothfusz
c82a2d1adf
Merge pull request #3813 from jpoimboe/update-ip_forward-docs
...
docs: remove ip_forward enabling step
2014-01-28 18:08:22 -08:00
Andy Rothfusz
f3a032f27b
Address feedback from @jamtur01.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
2014-01-28 17:32:05 -08:00
Victor Vieux
abd64a2b00
move warnings to the job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-29 01:17:55 +00:00
Michael Crosby
b3b12f0059
Move port mapper tests out of core and into portmapper
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-28 17:10:13 -08:00
Victor Vieux
d41844ed2d
remove enableCors from the config and move it as a job arg
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-29 00:20:51 +00:00
Michael Crosby
99756ef11f
Initial move of port mapper code into sub pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-28 15:42:46 -08:00
Brandon Philips
8458f99a38
fix(CONTRIBUTING): Developer Certificate of Origin w/o Grant
...
In 7fb55f7725brandon.philips@coreos.com > (github: philips)
2014-01-28 13:50:03 -08:00
Victor Vieux
fc697e3fd7
Merge pull request #3794 from vieux/fix_commands_error
...
check for errors in call, not readBody
2014-01-28 12:57:02 -08:00
Michael Crosby
2723133a69
Merge pull request #3105 from philips/add-socket-activation
...
Add socket activation
2014-01-28 11:38:25 -08:00
Guillaume J. Charmes
556091ef8b
Merge pull request #3811 from jpoimboe/remove-ip_forward-warning
...
remove ip_forward warning
2014-01-28 11:37:13 -08:00
Josh Poimboeuf
aeb2f479fa
docs: remove ip_forward enabling step
...
Now that docker sets /proc/sys/net/ipv4/ip_forward by default, remove
the step to enable it in the installation docs.
Docker-DCO-1.1-Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com > (github: jpoimboe)
2014-01-28 13:29:27 -06:00
Josh Poimboeuf
ef6c0d5341
remove ip_forward warning
...
Now that docker sets /proc/sys/net/ipv4/ip_forward by default (unless
the user manually specifies "-ip-forward=false"), there's no need to
warn if its disabled.
Docker-DCO-1.1-Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com > (github: jpoimboe)
2014-01-28 13:27:56 -06:00
Guillaume J. Charmes
4ab59179e7
Merge pull request #3801 from tianon/ip-forward
...
Add --ip-forward flag to daemon (enabled by default)
2014-01-28 11:17:45 -08:00
Josh Poimboeuf
db250f709a
network: add publicly mapped ports to FORWARD table
...
Allow publicly mapped ports to be made public beyond the host. This is
needed for distros like Fedora and RHEL which have a reject all rule at
the end of their FORWARD table.
Docker-DCO-1.1-Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com > (github: jpoimboe)
2014-01-28 13:11:49 -06:00
Guillaume J. Charmes
d4ea6308fd
Merge pull request #3759 from jpoimboe/links-iptables-cleanup
...
network: remove unnecessary links iptables rule for return traffic
2014-01-28 11:10:36 -08:00
Guillaume J. Charmes
13ee6d8eee
Merge pull request #3807 from pwaller/fix-unclear-error
...
Fix unclear error message when deleting container
2014-01-28 10:35:09 -08:00
Michael Crosby
09ed7e8878
Merge pull request #3805 from alexlarsson/execdriver-drop-getexitcode
...
exexdriver: Make Command.GetExitCode an internal call
2014-01-28 10:34:00 -08:00
Alexander Larsson
9ad70528b7
exexdriver: Make Command.GetExitCode an internal call
...
This code only works for backends that directly spawn the child
via the Command. It will not work for the libvirt backend. So
we move this code into the individual backends that need it.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-28 19:20:35 +01:00
Alexander Larsson
335bc39c9a
execdriver: Make GetPidsForContainer() a driver call
...
The current implementation is lxc specific.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-28 16:21:49 +01:00
Peter Waller
70c1781e07
Fix unclear error message when deleting container
...
I was getting the following error:
```
$ bundles/0.7.6-dev/binary/docker-0.7.6-dev run -rm -v=/var/run:/foo base echo hi
hi
2014/01/28 14:24:46 Error: container_delete: No such id: run
```
This commit makes the true origin of the error clearer. Issue #3806 is
tracking the cause of the error.
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net > (github: pwaller)
2014-01-28 14:28:13 +00:00
Alexander Larsson
a1851a6d3e
btrfs: Add comment to Put()
...
Document why we don't need to do anything in Put().
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-28 09:56:51 +01:00
Tianon Gravi
cabe624c82
Add --ip-forward flag to daemon (enabled by default) which automatically sets "net.ipv4.ip_forward" to 1
...
See also https://groups.google.com/d/topic/docker-dev/DCjF5Prx7HA/discussion
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-27 21:35:05 -07:00
Brandon Philips
4e5859e830
fix(api): , _ removed to simplify code in range
...
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-01-27 17:18:09 -08:00
Brandon Philips
7839350dd5
chore(coreos/go-systemd): copy to github.com/dotcloud/docker/systemd/pkg/activation
...
Via https://github.com/dotcloud/docker/pull/3105#issuecomment-32807547
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-01-27 17:18:09 -08:00
Brandon Philips
def0952606
chore(systemd): use activation.Listeners instead of Files
...
Use this Listeners() API that was exposed to save a few more lines of
boiler plate code.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-01-27 17:18:09 -08:00
Brandon Philips
f82d1291cc
vendor: bump github.com/coreos/go-systemd/activation
...
tests now work in the Docker tree with
`go test github.com/coreos/go-systemd/activation`
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-01-27 17:18:09 -08:00
Brandon Philips
1603039a71
chore(*): go fmt
...
I noticed that travis was failing, go fmt to make it happy.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-01-27 17:18:09 -08:00
Brandon Philips
1f44921c51
fix(contrib/init/systemd): remove mount rprivate
...
Docker does this now via 157d99a727brandon.philips@coreos.com > (github: philips)
2014-01-27 17:18:09 -08:00
Brandon Philips
2fe7588af7
fix(cli.rst): add missing underscores
...
As suggested by @metalivedev
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-01-27 17:18:09 -08:00
Brandon Philips
7f9d3268bf
Allow fd:// like unix:// and tcp://
...
Somthing like 20605eb310brandon.philips@coreos.com > (github: philips)
2014-01-27 17:18:09 -08:00
Brandon Philips
566fb31c88
Move listenfd to utility package
...
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-01-27 17:18:09 -08:00
Brandon Philips
6acc99889d
fix(docs): add Systemd in front of socket activation
...
Suggested by SvenDowideit.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-01-27 17:18:09 -08:00
Brandon Philips
4a90f00ab7
docs: improve the socket activation cli docs
...
as suggested by SvenDowideit expand the docs to have more information on
socket activation.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-01-27 17:18:09 -08:00
Brandon Philips
cfeb1f0f65
fix(docs): fixup based on changes in master
...
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-01-27 17:18:09 -08:00
Brandon Philips
87fb2c973d
server: add socket activation
...
This adds the ability to socket activate docker by passing in
`-H fd://*` along with examples systemd configuration files.
The fastest way to test this is to run:
```
/usr/lib/systemd/systemd-activate -l 127.0.0.1:2001 /usr/bin/docker -d -H 'fd://*'
docker -H tcp://127.0.0.1:2001 ps
```
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-01-27 17:17:07 -08:00
Brandon Philips
e996daeed0
vendor: add github.com/coreos/go-systemd/activation
...
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-01-27 17:17:07 -08:00
Michael Crosby
ed12818f99
Merge pull request #3789 from pwaller/issue-3674
...
Fix for #3674 Can't `rm` containers when disk full
2014-01-27 17:00:16 -08:00
Michael Crosby
eaca205942
Merge pull request #3796 from tianon/dockerfile-btrfs
...
Update Dockerfile to be based on 13.10 instead of 12.04, add linux-libc-dev dep, remove s3cmd backports nonsense
2014-01-27 16:54:06 -08:00
Tianon Gravi
94566b748e
Update Dockerfile to be based on 13.10 instead of 12.04 so that we can remove our s3cmd backports need, and so we can have the new linux-libc-dev dependency we need for compiling the btrfs driver without nasty APT hackery
...
In addition, we've now hard-coded LXC version 0.8 compiled from source so that we can have the most stable dev environment possible.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-27 17:18:33 -07:00
Guillaume J. Charmes
1ddd815191
Merge pull request #3798 from vieux/3777_fix
...
fix mflag import
2014-01-27 15:31:54 -08:00
Victor Vieux
abbae8f764
check for errors in call, not readBody
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-27 23:31:04 +00:00
Victor Vieux
c4e7b0e4d5
fix mflag import
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-27 23:29:56 +00:00
Andy Rothfusz
07c4eda46a
Fix 2720 -- Expanded documentation for docker run.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
2014-01-27 14:44:24 -08:00
Peter Waller
c4c558d138
Add Peter Waller <p@pwaller.net> to AUTHORS
...
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net > (github: pwaller)
2014-01-27 22:21:58 +00:00
Guillaume J. Charmes
77d4df1e0b
Merge pull request #3787 from pwaller/issue-3786
...
Fix for issue #3786 `docker rm` unmounts in the wrong order
2014-01-27 13:41:14 -08:00
Victor Vieux
99dd387fd7
Merge pull request #3784 from 1uptalent/3783_release_push_lock
...
FIX #3783 : Release the push lock after the image push is completed
2014-01-27 13:40:28 -08:00
Victor Vieux
f4b75e06bc
Merge pull request #3790 from crosbymichael/move-port-allocators
...
Move port allocators into network driver
2014-01-27 13:36:33 -08:00
Peter Waller
6f3d8d3908
Fix for #3674 Can't rm containers when disk full
...
Rather than creating a new directory and moving it there before
deleting that new directory, just move the directory we intend to
delete.
In the old way, the Mkdirall could fail, which meant that you
couldn't delete containers when the disk was full.
Tested.
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net > (github: pwaller)
2014-01-27 21:34:11 +00:00
Victor Vieux
91b11dd156
Merge pull request #3776 from fabiofalci/container_list_test
...
Improve test for container list `ps`
2014-01-27 13:32:23 -08:00
Andy Rothfusz
bbfc531b51
Merge pull request #3542 from SvenDowideit/curl-prepare-commit-msg
...
move the contributing hook into contrib, and use curl in the same way as the gofmt above
2014-01-27 12:09:03 -08:00
Andy Rothfusz
093531ddb7
Merge pull request #3781 from mattymo/patch-1
...
Clean up grammar on puppet.rst
2014-01-27 12:06:43 -08:00
Andy Rothfusz
adae0b248d
Merge pull request #3773 from mnaberez/supervisord-apache2-example
...
Use exec to replace bash with apache2 after environment is set up
2014-01-27 12:01:59 -08:00
Andy Rothfusz
ef37fdd1a8
Merge pull request #3770 from aaronfeng/fix-image-name-pos
...
move image name into correct position
2014-01-27 11:56:36 -08:00
Victor Vieux
f9e9637a9f
Merge pull request #3756 from crosbymichael/fix-register-nobridge
...
Refactor and fix register interface when bridge does not exist
2014-01-27 10:40:42 -08:00
Peter Waller
32753c3d24
Fix for issue #3786
...
This is a fix for the case that one mount is inside another mount and
docker can't then delete the resulting container.
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net > (github: pwaller)
2014-01-27 17:31:25 +00:00
Abel Muiño
77a34920b2
Release the push lock at the end
...
Docker-DCO-1.1-Signed-off-by: Abel Muiño <amuino@gmail.com > (github: amuino)
2014-01-27 16:22:59 +01:00
mattymo
551e1a766c
Update puppet.rst
2014-01-27 18:21:48 +03:00
mattymo
03d9984f17
Clean up grammar on puppet.rst
2014-01-27 15:13:17 +03:00
Fabio Falci
1ee1dc2340
Improve test for container list ps
...
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: fabiofalci)
2014-01-26 23:14:50 +00:00
Michael Crosby
5e69b3837b
Fix issues from rebase on master
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-26 14:07:43 -08:00
Michael Crosby
da61b99b39
Simplify logic for registering ports
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-26 14:01:38 -08:00
Michael Crosby
ac2a4e6410
Refactor to support multiple ip addresses
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-26 14:01:38 -08:00
Guillaume J. Charmes
da30eb7c20
Remove std sort and use custom sort for performances
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-26 14:01:38 -08:00
Michael Crosby
303ed3c830
Add port allocator and move ipset into orderedintset
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-26 14:01:38 -08:00
Tianon Gravi
b994c13159
Update hack/make.sh with slightly clearer output and a more precise "are we in the Docker container?" check
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-26 13:24:03 -07:00
Mike Naberezny
2ba2a8ae40
Use exec to replace bash with apache2 after environment is set up
...
Docker-DCO-1.1-Signed-off-by: Mike Naberezny <mike@naberezny.com > (github: mnaberez)
2014-01-26 11:53:22 -08:00
James Turnbull
ffdc2d2657
Merge pull request #3771 from srt32/patch-1
...
Update README.md typo
2014-01-26 09:07:00 -08:00
Aaron Feng
31e5958009
move image name into correct position
...
Docker-DCO-1.1-Signed-off-by: Aaron Feng <aaron.feng@gmail.com > (github: aaronfeng)
2014-01-26 08:11:30 -05:00
Simon Taranto
33ee78004f
Update README.md
...
Docker-DCO-1.1-Signed-off-by: Simon Taranto <simon.taranto@gmail.com > (github: srt32)
2014-01-26 00:08:55 -07:00
Josh Poimboeuf
5c04f1bcc7
network: remove unnecessary links iptables rule for return traffic
...
Currently there are two iptables rules per port for each link: one to
allow the parent to connect to the child's port, and another one to
allow return traffic from the child back to the parent. The second rule
shouldn't be needed because the "ctstate RELATED,ESTABLISHED" rule can
already allow all established traffic.
So this patch does the following:
1. Move the RELATED,ESTABLISHED rule to be _before_ the potential
inter-container communication DROP rule so it will work for
inter-container traffic as well. Since we're inserting, everything
is reversed chronologically so it should be inserted _after_ we
insert the DROP. This also has a small performance benefit because
it will be processed earlier and it's generally one of the most
commonly used rules.
2. Get rid of the unnecessary return traffic rule per link.
3. Also move the other "Accept all non-intercontainer outgoing packets"
rule to earlier. This gives a small performance benefit since it's
also a commonly used rule, and it makes sense to logically group it
next to the ctstate rule.
Docker-DCO-1.1-Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com > (github: jpoimboe)
2014-01-24 21:20:34 -06:00
Guillaume J. Charmes
b1d26985d0
Update tests to have custom routes
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-24 17:18:48 -08:00
Guillaume J. Charmes
eedaf08eb8
Merge branch 'fix-register-nobridge' of https://github.com/crosbymichael/docker into crosbymichael-fix-register-nobridge
2014-01-24 17:02:19 -08:00
Victor Vieux
e6ae8f6d21
Merge pull request #3757 from vieux/auth_job
...
move auth to a job
2014-01-24 16:54:48 -08:00
Victor Vieux
1f8b1bb84e
move auth to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-24 16:51:02 -08:00
Victor Vieux
e2003fea3a
Merge pull request #3728 from vieux/container_job
...
Move containers to a job
2014-01-24 16:10:46 -08:00
Victor Vieux
5ea2986ce5
Move containers to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-24 16:07:42 -08:00
Victor Vieux
748a009cc4
Merge pull request #3727 from vieux/push_job
...
push job
2014-01-24 15:42:22 -08:00
Victor Vieux
e8ee18fa29
push job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-24 15:34:08 -08:00
Victor Vieux
4a708f9f5b
Merge pull request #3739 from vieux/events_jobs
...
move events to job
2014-01-24 15:32:25 -08:00
Victor Vieux
5cc6312bfc
move events to job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-24 15:28:17 -08:00
Victor Vieux
59df776469
Merge pull request #3621 from vieux/inspect_job
...
Inspect job
2014-01-24 15:22:20 -08:00
Victor Vieux
5fd8aa02ba
merge 2 jobs, no more buffer
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-24 15:13:30 -08:00
Victor Vieux
a7e9baaf89
update attach to use the new job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-24 15:11:38 -08:00
Victor Vieux
134435a79c
move inspect to 2 jobs
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-24 15:11:38 -08:00
Victor Vieux
22fb3e0f38
Merge pull request #3645 from vieux/rmi_job
...
Move rmi to a job
2014-01-24 15:10:02 -08:00
Victor Vieux
f41e0cf048
fix error handling
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-24 14:59:46 -08:00
Victor Vieux
177f658882
remove buffer
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-24 14:57:18 -08:00
Victor Vieux
564e6bc780
Move docker rmi to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-24 14:55:11 -08:00
Victor Vieux
4a96c329c0
Merge pull request #3725 from vieux/pull_import_job
...
Pull import job
2014-01-24 14:47:40 -08:00
Victor Vieux
35641f0ec7
remove useless flush method
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-24 14:46:31 -08:00
Victor Vieux
90e9a2d85a
fix flush
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-24 14:46:31 -08:00
Victor Vieux
9dcbdbc4b1
move pull and import to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-24 14:46:31 -08:00
Victor Vieux
9d44298c5e
Merge pull request #3741 from vieux/build_job
...
move build to a job
2014-01-24 11:34:32 -08:00
Victor Vieux
56ec121925
Merge pull request #3726 from vieux/attach_stderr
...
don't user os.Stderr in attach
2014-01-24 10:55:55 -08:00
James Turnbull
f1fbf5f219
Merge pull request #3748 from metalivedev/fixarticles
...
Fix TOC for Articles
2014-01-24 10:01:54 -08:00
Andy Rothfusz
6cae33ca0f
Fix TOC for Articles
2014-01-23 18:55:26 -08:00
Victor Vieux
641005777a
Merge pull request #3747 from crosbymichael/move-networking
...
Move IP Allocator into sub package and out of the core
2014-01-23 16:43:21 -08:00
Victor Vieux
42e35ecff3
remove useless anonymous field mentions
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-23 16:20:51 -08:00
Victor Vieux
415379e45d
move build to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-23 16:08:05 -08:00
Andy Rothfusz
a71e7fe8ab
Merge pull request #3730 from SvenDowideit/JSON-RUN-format-docs
...
talk about the new exec form of RUN (Closes #3723 ) implemented by #3558
2014-01-23 15:54:00 -08:00
Victor Vieux
0dd856ee7f
Merge pull request #3724 from creack/extract-lxc-phase-2
...
Refactor process to command
2014-01-23 15:28:45 -08:00
Victor Vieux
f948820d03
Merge pull request #3743 from pmorie/typo
...
Fix typo in comment in container.go
2014-01-23 15:15:18 -08:00
Paul Morie
2f57eb0410
Fix typo in container.go
...
Docker-DCO-1.1-Signed-off-by: Paul Morie <pmorie@gmail.com > (github: pmorie)
2014-01-23 18:10:33 -05:00
Michael Crosby
ec73c23231
Refactor and fix register interface when bridge does not exist
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-23 14:39:10 -08:00
Victor Vieux
1896934616
Merge pull request #3742 from vieux/update_todo
...
no more TODO
2014-01-23 12:57:00 -08:00
Victor Vieux
5d71ad8b19
no more TODO
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-23 12:55:58 -08:00
Victor Vieux
4e08bb5629
Merge pull request #3740 from tianon/fix-mflag-dyntest
...
Fix mflag test issue with "ResetForTesting"
2014-01-23 12:09:08 -08:00
Tianon Gravi
f60eee4894
Fix mflag test issue with "ResetForTesting" (which only showed up under dyntest for some odd reason)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-23 13:03:17 -07:00
Victor Vieux
7687b3cec1
Merge pull request #3738 from vieux/update_todo
...
update REMOTE_TODO.md
2014-01-23 10:51:38 -08:00
Victor Vieux
4d4339c6de
update REMOTE_TODO.md
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-23 10:50:11 -08:00
Chris St. Pierre
fd2403b830
fix shebang in mkimage-yum.sh
...
Docker-DCO-1.1-Signed-off-by: Chris St. Pierre <chris.a.st.pierre@gmail.com > (github: stpierre)
2014-01-23 12:01:24 -05:00
Michael Crosby
ea5b3e193b
Finalize core changes with new package
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-23 05:22:32 -08:00
Chris St. Pierre
d419da7227
Added new mkimage-yum.sh script to create CentOS base images
...
mkimage-rinse.sh requires rinse, which is not readily available on
CentOS or Fedora. Plus, creating a base image is trivial with yum
alone.
Docker-DCO-1.1-Signed-off-by: Chris St. Pierre <chris.a.st.pierre@gmail.com > (github: stpierre)
2014-01-23 07:09:44 -05:00
Michael Crosby
9d11db0f8c
Update code for new test cases
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-23 02:22:13 -08:00
Michael Crosby
fccca3542b
Move tests from core into ipallocator
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-23 01:31:38 -08:00
Michael Crosby
648357ffdf
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-01-23 00:28:35 -08:00
Tianon Gravi
210db8e846
Merge pull request #3720 from therealprologic/master
...
Add script for building CRUX base images
2014-01-22 21:28:51 -08:00
Sven Dowideit
bfc1043f36
talk about the new exec form of RUN ( Closes #3723 ) implemented by #3558
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-01-23 14:00:16 +10:00
James Mills
d247b7d426
Added script for building Base Docker CRUX images
...
Docker-DCO-1.1-Signed-off-by: James Mills <prologic@shortcircuit.net.au > (github: therealprologic)
2014-01-23 13:53:19 +10:00
Michael Crosby
79bb8212e0
Implement pos for set and add unit tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-22 19:34:47 -08:00
Michael Crosby
6bc05899aa
Finish implementation and begin working on tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-22 18:05:20 -08:00
Michael Crosby
78b3d89f87
Merge remote-tracking branch 'fork/stack_set' into move-networking
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-22 17:20:52 -08:00
Guillaume J. Charmes
3e3abdd770
Use int32 instead of string for ip set
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-22 17:20:19 -08:00
Michael Crosby
9c29376fcb
Merge remote-tracking branch 'fork/stack_set' into move-networking
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-22 17:13:13 -08:00
Guillaume J. Charmes
18df387bf8
Implement PullBack()
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-22 17:12:28 -08:00
Michael Crosby
b58c1a6438
Merge remote-tracking branch 'fork/stack_set' into move-networking
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-22 16:24:55 -08:00
Michael Crosby
e048c28159
Merge remote-tracking branch 'fork/stack_set' into move-networking
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-22 16:13:59 -08:00
Guillaume J. Charmes
43bcbf06a6
Implement Containers in set
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-22 16:13:28 -08:00
Michael Crosby
d32777f6b1
Implement get next ip
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-22 16:13:22 -08:00
Guillaume J. Charmes
63d18d875b
Implement basic stack for ips
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-22 16:00:53 -08:00
Victor Vieux
e7a9d23640
don't user os.Stderr in attach
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-22 15:54:22 -08:00
Michael Crosby
9e2e8a923c
WIP for ip allocator
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-22 15:52:39 -08:00
Michael Crosby
8723a8a89e
Populate command in ghost state to pass to RestoreCommand
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-22 14:05:01 -08:00
Michael Crosby
ba8ca59862
Compile driver interface changes
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-22 14:05:01 -08:00
Guillaume J. Charmes
75e0357d69
Populate Command self cointainer (toward Restore())
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-22 14:04:55 -08:00
Alexander Larsson
e51af36a85
Add experimenta btrfs driver
...
This is an experimental btrfs driver. To use it you must have
/var/lib/docker mounted on a btrfs filesystem and explicitly
specify DOCKER_DRIVER=btrfs in the docker daemon environment.
It works by using subvolumes for the docker image/container layers.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-22 21:44:09 +01:00
Andy Rothfusz
700db10c85
Merge pull request #3716 from johngmyers/patch-1
...
Grammar fixes and wording improvements
2014-01-22 12:01:13 -08:00
Andy Rothfusz
9a2e673f4f
Merge pull request #3713 from SvenDowideit/document-bind-mount-file
...
bind mounts work for files - give an example, as its very very useful.
2014-01-22 11:54:41 -08:00
Michael Crosby
2a6e93a6fb
Merge pull request #3558 from tianon/buildfile-run-json
...
Add support for RUN [""] in Dockerfiles
2014-01-22 11:51:34 -08:00
Guillaume J. Charmes
f61a91f50a
Merge pull request #3073 from alexlarsson/refcount-driver-mounts
...
Refcount driver mounts
2014-01-22 11:42:17 -08:00
Guillaume J. Charmes
44a0bab304
Merge pull request #3712 from plietar/kill-signal
...
Add a -s option to the kill command to specify a signal.
2014-01-22 11:38:16 -08:00
Michael Crosby
639d2ecd4f
Merge pull request #3682 from alexlarsson/implement-tar
...
Implement tar in Go
2014-01-22 11:23:47 -08:00
Guillaume J. Charmes
4ccf423f42
Merge pull request #3695 from chazomaticus/3628-ignore-kernel-flavor
...
ignore non-numeric characters when parsing kernel version
2014-01-22 11:19:05 -08:00
Charles Lindsay
dea3c2655d
Add comment about ignoring Sscanf error
...
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
2014-01-22 09:32:50 -08:00
Sven Dowideit
7c55cbd4c9
move the contributing hook into hack, and use curl in the same way as the gofmt above
...
and remove the fmt-check one we don't document
tianon tells me they're called GitHub, not Github :)
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-01-22 21:31:42 +10:00
Sven Dowideit
0f5ad430c4
change the documentation only - It looks like we have a number of cmdline params to completely update from the code version
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-01-22 21:29:05 +10:00
John Gardiner Myers
1c06a91964
Wording improvements
...
Docker-DCO-1.1-Signed-off-by: John Gardiner Myers <jgmyers@proofpoint.com > (github: johngmyers)
2014-01-21 22:40:33 -08:00
John Gardiner Myers
f3cb808e9d
Grammar and punctuation fixes
...
Docker-DCO-1.1-Signed-off-by: John Gardiner Myers <jgmyers@proofpoint.com > (github: johngmyers)
2014-01-21 22:40:06 -08:00
Paul Lietar
1f75a0bf43
Add a --signal option to the kill command to specify a signal.
...
Docker-DCO-1.1-Signed-off-by: Paul Lietar <paul@lietar.net > (github: plietar)
2014-01-22 06:10:52 +00:00
Michael Crosby
3cb5bc5ae5
Merge pull request #3708 from creack/fix_run_exit_code
...
Fix issue with exit code in non-tty mode.
2014-01-21 18:15:01 -08:00
Guillaume J. Charmes
fd38de2818
Fix issue with exit code in non-tty mode.
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-21 18:05:03 -08:00
Victor Vieux
4c1879f919
Merge branch 'add_missing_attributes' of https://github.com/rogaha/docker into rogaha-add_missing_attributes
...
Conflicts:
api.go
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-21 18:01:19 -08:00
Tianon Gravi
572002a715
Merge pull request #3707 from bkcsoft/fix-bash-hashbangs
...
Update bash shebangs to use "/usr/bin/env bash" for increased portability
2014-01-21 17:30:52 -08:00
Kim BKC Carlbacker
b1953baba2
This should make all bash-scripts run on pretty much any posix-system (with bash installed ofc...)
...
Docker-DCO-1.1-Signed-off-by: Kim BKC Carlbacker <kim.carlbacker@gmail.com > (github: bkcsoft)
2014-01-22 02:21:56 +01:00
Guillaume J. Charmes
cb33f739a1
Merge pull request #3705 from crosbymichael/fix-die-event
...
Fix die command when monitor returns
2014-01-21 17:13:29 -08:00
Michael Crosby
0b789ca844
Merge pull request #3706 from creack/fix_wait_stopped
...
Fix wait on stopped container (after docker restart) + add Unit test for that case
2014-01-21 17:03:35 -08:00
Guillaume J. Charmes
0376a69cb1
Fix wait on stopped container (after docker restart) + add Unit test for that case
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-21 16:49:24 -08:00
Michael Crosby
980000071d
Merge pull request #2655 from mpetazzoni/create-local-bind-dirs
...
Automatically create non-existent bind-mounted host directories
2014-01-21 16:27:20 -08:00
Michael Crosby
80f128a6ea
Fix die command when monitor returns
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-21 16:18:57 -08:00
Maxime Petazzoni
47d1413d7a
Documentation about automatic bind-mount dir creation
...
Docker-DCO-1.1-Signed-off-by: Maxime Petazzoni <max@signalfuse.com > (github: mpetazzoni)
2014-01-21 16:05:30 -08:00
Maxime Petazzoni
3e96f46b30
Automatically create non-existent bind-mounted directories on the host
...
Fixes #1279 .
Docker-DCO-1.1-Signed-off-by: Maxime Petazzoni <max@signalfuse.com > (github: mpetazzoni)
2014-01-21 16:05:29 -08:00
Michael Crosby
b417f79c00
Merge pull request #3704 from vieux/json_api_return_valid
...
Switch back to the valid json format
2014-01-21 15:35:06 -08:00
Victor Vieux
be6aeda1e4
Merge pull request #3640 from proppy/networkgetroutes-add-default
...
netlink: add default Route to NetworkGetRoutes
2014-01-21 15:20:16 -08:00
Victor Vieux
e3461bc8d6
switch back to the valid json format
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-21 15:06:23 -08:00
Andy Rothfusz
62c4563987
Merge pull request #3688 from shykes/docs-simplify-basic-usage
...
Simplify basic usage docs
2014-01-21 11:41:32 -08:00
Guillaume J. Charmes
e56562c35e
Merge pull request #3566 from tianon/fix-volume-symlinks
...
Fix symlink mounting issues
2014-01-21 11:37:05 -08:00
Victor Vieux
9164ba6516
Merge pull request #3686 from vieux/load_job
...
Load job
2014-01-21 11:29:15 -08:00
Victor Vieux
f2f44b91a8
move load to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-21 11:28:45 -08:00
Andy Rothfusz
ba4ae40445
Merge pull request #3690 from shykes/cleanup-maintainers
...
Cleanup maintainers
2014-01-21 11:18:23 -08:00
Michael Crosby
f98a596be9
Merge pull request #3698 from alexlarsson/fix-shared-root
...
Fix handling of shared roots
2014-01-21 11:09:36 -08:00
Andy Rothfusz
fb919137be
Merge pull request #3687 from shykes/docs-intro
...
docs: harmonize intro paragraph with website
2014-01-21 11:02:55 -08:00
Andy Rothfusz
31274ffccb
Merge pull request #3700 from jamtur01/fixedtoc
...
Fixed commandline/index warning in TOC
2014-01-21 10:52:13 -08:00
Tianon Gravi
678d76fa9c
Merge pull request #3671 from tianon/completion-ignore-stderr
...
Update bash completion to ignore stderr output of docker binary
2014-01-21 10:40:23 -08:00
Charles Lindsay
cce099aa34
Re-add kernel Flavor tests
...
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
2014-01-21 09:56:53 -08:00
Tianon Gravi
b23e6e99b3
Merge pull request #3459 from Barthalion/master
...
Fix mkimage-arch.sh to generate cleaner Arch Linux images and do so with cleaner code
2014-01-21 07:11:57 -08:00
Bartłomiej Piotrowski
4137a0ea32
mkimage-arch: provide and use own pacman.conf
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
2014-01-21 14:22:56 +01:00
James Turnbull
fabf96b8ff
Fixed commandline/index warning in TOC
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-01-21 08:22:51 -05:00
Bartłomiej Piotrowski
787ff55283
mkimage-arch: use hash to check if command is available
...
Apart from having more predictable return codes on various operating
systems, it additionally caches the path to application.
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
2014-01-21 14:22:47 +01:00
Bartłomiej Piotrowski
da4ba80733
mkimage-arch: don't generate ISO-8859-1 locale
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
2014-01-21 14:22:39 +01:00
Bartłomiej Piotrowski
c6535d272c
mkimage-arch: unify usage of brackets around variables
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
2014-01-21 14:22:33 +01:00
Bartłomiej Piotrowski
a4e6e9bd41
mkimage-arch: remove $DEV instead of renaming it
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
2014-01-21 14:22:26 +01:00
Bartłomiej Piotrowski
c138c335a5
mkimage-arch: use mktemp to create ROOTFS directory
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
2014-01-21 14:21:43 +01:00
Alexander Larsson
f918fca3bf
archive: Always end directory filenames in tars with /
...
This matches what tar does, and without it the tarsum created
by the registry will not match the docker one.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-21 12:52:05 +01:00
Alexander Larsson
5fe26ee426
aufs: Unmount inactive devices
...
This implements the new Put() operation such that
Get()/Put() maintains a refcount for each ID, mounting
only on first Get() and unmounting on the last Get().
This means we avoid littering the system with lots of mounts
and free resources related to them.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-21 11:26:11 +01:00
Alexander Larsson
886f650d9b
devicemapper: Unmount inactive devices
...
This implements the new Put() operation such that
Get()/Put() maintains a refcount for each ID, mounting
only on first Get() and unmounting on the last Get().
This means we avoid littering the system with lots of mounts
and active devicemapper devices and free resources related
to them.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
asdfljk
2014-01-21 11:26:11 +01:00
Alexander Larsson
191aa17d16
Remove container.EnsureMounted
...
This was deprecated already and all it did was call Mount().
The use of this was a bit confusing since we need to pair Mount/Unmount
calls which wasn't obvious with "EnsureMounted".
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-21 11:26:11 +01:00
Alexander Larsson
bcaf6c2359
Add Put() to graphdriver API and use it
...
This makes all users of Put() have a corresponding call
to Get() which means we will be able to track whether
any particular ID is in use and if not unmount it.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-21 11:25:37 +01:00
Alexander Larsson
bde2d3aef7
integration: Fix TestGetContainersExport
...
The tar changes made the name of the file in the tar archive
change from "./test" to "test", update the test to the new name.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-21 10:41:08 +01:00
Alexander Larsson
08ab554195
Fix handling of shared roots
...
If rootIsShared() is detected we apply the shell stuff to early, before
the real command and arguments are added to the parameters. This
means they get passed on to unshare rather than docker-init, breaking
docker on e.g. fedora like:
goroutine 1 [running]:
runtime.panic(0x678340, 0x9b3fd7)
/usr/lib64/golang/src/pkg/runtime/panic.c:266 +0xb6
github.com/dotcloud/docker/execdriver/lxc.func·001(0xc21000a1b0, 0xc21001eab0, 0x7fff24715faf)
/home/alex/vcs/go/src/github.com/dotcloud/docker/execdriver/lxc/driver.go:41 +0x525
github.com/dotcloud/docker/sysinit.executeProgram(0xc21000a1b0, 0xc21000a1b0, 0xa)
/home/alex/vcs/go/src/github.com/dotcloud/docker/sysinit/sysinit.go:34 +0xca
github.com/dotcloud/docker/sysinit.SysInit()
/home/alex/vcs/go/src/github.com/dotcloud/docker/sysinit/sysinit.go:88 +0x791
main.main()
/home/alex/vcs/go/src/github.com/dotcloud/docker/dockerinit/dockerinit.go:14 +0x1a
The fix is to construct the full params array before escaping it.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-21 10:22:13 +01:00
Solomon Hykes
fdf43f5de1
docs: harmonize intro paragraph with website
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-21 07:33:26 +00:00
Solomon Hykes
ae2af201f3
Docs: fix capitalization of "Docker"
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-21 07:27:55 +00:00
Charles Lindsay
b78ae3b652
Re-add Flavor to KernelVersionInfo
...
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
2014-01-20 21:26:23 -08:00
Charles Lindsay
5b97e00438
Use Sscanf instead of regexp
...
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
2014-01-20 21:02:37 -08:00
Roberto G. Hashioka
d16691e3ad
- Ajusted server.go with gofmt
...
Docker-DCO-1.1-Signed-off-by: Roberto Hashioka <roberto.hashioka@docker.com > (github: rogaha)
2014-01-21 04:11:40 +00:00
Roberto G. Hashioka
2cfd696b9b
Added missing attributes to api search calls:
...
- Added an argument to the call() method in order to control the auth sharing
- Enabled it only for search. Pulls and pushes were enabled already.
- Grouped a few variable declarations
Docker-DCO-1.1-Signed-off-by: Roberto Hashioka <roberto.hashioka@docker.com > (github: rogaha)
2014-01-21 04:06:19 +00:00
Charles Lindsay
14b2b2b7c2
Fix apparent typo
...
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
2014-01-20 19:49:40 -08:00
Charles Lindsay
d2c9c1036b
Remove Flavor from KernelVersionInfo
...
Also change to parsing it with regexp to keep things simple.
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
2014-01-20 19:49:39 -08:00
Charles Lindsay
fc30346086
Add failing test for odd kernel version
...
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
2014-01-20 19:49:39 -08:00
Tianon Gravi
a37ffa4041
Merge pull request #3662 from tianon/add-udev-to-deb
...
Add udev rules file to our generated deb package
2014-01-20 19:44:05 -08:00
Solomon Hykes
c24d128bb5
Docs: move advanced topic "create your own base image" out of basic user guide
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-21 03:43:16 +00:00
Solomon Hykes
589e1a9bdc
docs: "first steps with docker" is a better title than "learn basic commands"
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-21 03:43:16 +00:00
Solomon Hykes
76eee50a67
docs: add standard 'check your docker install' paragraph to the 'hello world' examples.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-21 03:43:16 +00:00
Solomon Hykes
cf5504eed5
docs: move a sysadmin-focused topic out of the basic usage manual and into installation docs (setting up a user group for non-root access)
...
docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-21 03:43:16 +00:00
Solomon Hykes
cf17816083
docs: simplify basic usage doc, step 1: check your docker install
...
docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-21 03:43:16 +00:00
Solomon Hykes
1fe426641d
Remove myself as sole maintainer of api reference docs.
...
Please still ping me before changing APIs :)
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-20 18:49:13 -08:00
Solomon Hykes
230554695a
Remove Ken from docs maintainers (he's busy on other things)
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-20 18:48:59 -08:00
Andy Rothfusz
90b52b7e06
Reordering to make FAQ last
2014-01-20 17:11:03 -08:00
Andy Rothfusz
acf43b4da7
Merge pull request #3618 from shykes/docs-cleanup-install
...
Docs cleanup install
2014-01-20 17:10:02 -08:00
Andy Rothfusz
b38d3154c8
Merge pull request #3600 from SvenDowideit/ghost-status-doc
...
Ghost status doc
2014-01-20 16:51:47 -08:00
Victor Vieux
497e7d651a
update todo
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-20 16:09:07 -08:00
Guillaume J. Charmes
12468f2bc8
Rename Process to Command
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-20 16:05:07 -08:00
Victor Vieux
ffe78e82c3
Merge pull request #3442 from DevTable/master
...
Fix support for registry auth with Dockerfile build.
2014-01-20 15:50:14 -08:00
Jake Moshenko
6e6ff85362
Fix support for registry auth with Dockerfile build.
...
Docker-DCO-1.1-Signed-off-by: Jake Moshenko <jake@devtable.com > (github: jakedt)
2014-01-20 18:35:14 -05:00
Michael Crosby
37c1c7cf7a
Merge pull request #3685 from pnasrat/3679-cgroups-outside-lxc
...
Move Resources into exec driver
2014-01-20 15:35:06 -08:00
Guillaume J. Charmes
c2501942cf
Merge pull request #3684 from crosbymichael/push-multiple-tags
...
Push multiple tags for repository
2014-01-20 15:24:53 -08:00
Solomon Hykes
45e8d1f4c0
docs: reuse official dependencies list from packager's guide for custom binary install docs
2014-01-20 23:17:40 +00:00
Solomon Hykes
4e54dd245a
docs: remove out-of-date kernel requirements document.
...
Requirements differ from platform to platform depending on the plugins used, and so should be documented separately for each target platform
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-20 23:11:30 +00:00
Solomon Hykes
dd786eefbb
docs: instead of a top-level 'upgrading docker' doc, add an 'upgrades' paragraph to each installation target
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-20 23:11:30 +00:00
Solomon Hykes
29e6868cc3
docs: change topic of windows install docs to 'install docker on windows'
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-20 23:11:30 +00:00
Solomon Hykes
c56e3b8569
docs: move 'vagrant' install docs to the more accurate 'mac' install docs
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-20 23:11:30 +00:00
Solomon Hykes
d8a71635d4
docs: move security article to a new 'articles' section
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-20 23:11:30 +00:00
Paul Nasrat
71c1646ba3
Don't expose cgroups via the execdriver API.
...
Use Resources to represent container limits rather than a cgroup specific field.
Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com > (github: pnasrat)
2014-01-20 17:06:24 -05:00
Michael Crosby
fbd374f30b
Merge pull request #3681 from pnasrat/extract-cgroups-pkg
...
Extract cgroups into pkg sub dir
2014-01-20 14:00:44 -08:00
Andy Rothfusz
6dfbbaa4ff
Merge pull request #3650 from tianon/fix-doc-man-generation
...
Fix docs man page generation and add Dockerfile man page
2014-01-20 13:44:01 -08:00
Michael Crosby
a2aab7757e
Make sure new repositories can be pushed with multiple tags
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-20 13:39:35 -08:00
Alexander Larsson
8a4824d1ad
hack: Remove GNU Tar requirement
...
We no longer call out to tar, so this is not needed.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-20 20:35:16 +01:00
Tianon Gravi
6ed9b06e07
Fix Travis build errors by bumping our python module versions to be newer
...
See also https://bitbucket.org/birkenfeld/sphinx/issue/1281/sphinx-113-not-build-proper-manpages
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-20 12:30:18 -07:00
Alexander Larsson
5ea48aa7f8
Implement TarFilter in go, rather than calling out to tar
...
This uses a plain filepath.Walk + addTarFile to create a tar file,
optionially compressing it with gzip.
Unfortunately go only has gzip compression support, not bzip2 or xz.
However, this is not a regression, as docker currently uses *no*
compression for TarFilter(). The only compression of tarfiles
currently happens in utils/tarsum.go, and that manually does gzip
compression.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-20 20:26:20 +01:00
Alexander Larsson
bab8efbf05
Simplify addTarFile
...
We can use tar.FileInfoHeader to do much of the work.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-20 20:26:20 +01:00
Alexander Larsson
5b77e51e0a
archive: Extract code from ExportChanges to addTarFile()
...
This is the code that takes a normal file and adds it to a TarWriter.
We extract it so that we can share it with Tar().
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-20 20:26:20 +01:00
Alexander Larsson
4fb1db7f74
archive: Remove unused features
...
This simplifies that code that calls out to tar by removing support
for now unused features.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-20 20:26:20 +01:00
Michael Crosby
03a25c0800
Merge branch 'fix-registry-push-tags' of https://github.com/codeaholics/docker into codeaholics-fix-registry-push-tags
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-20 11:23:09 -08:00
Paul Nasrat
2553029959
Extract cgroups pkg.
...
Initial move before enhancing cgroups package.
Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com > (github: pnasrat)
2014-01-20 14:15:44 -05:00
Victor Vieux
69be8adb68
Merge pull request #3665 from vgeta/3450-fix
...
Fixes Issue #3450
2014-01-20 11:10:54 -08:00
Guillaume J. Charmes
b563c0c02b
Merge pull request #3292 from alexlarsson/export-changes-manual
...
Don't shell out to tar for ExportChanges
2014-01-20 11:08:16 -08:00
Michael Crosby
0f0e582490
Merge pull request #3680 from pnasrat/extract-mount-pkg
...
Extract mount into pkg.
2014-01-20 11:04:16 -08:00
Paul Nasrat
2e094db639
Extract mount into pkg.
...
Mount is self contained and generic, it should be in pkg, to allow other pkg modules to use it.
Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com > (github: pnasrat)
2014-01-20 13:59:29 -05:00
Guillaume J. Charmes
3aa27eb055
Merge pull request #3295 from alexlarsson/implement-untar
...
Implement UnTar via archive/tar
2014-01-20 10:54:42 -08:00
Guillaume J. Charmes
a431f1703d
Merge pull request #3678 from creack/sysinfo_update
...
Add MAINTAINER and remove docker/utils dep from pkg/sysinfo
2014-01-20 10:39:37 -08:00
Michael Crosby
f87a67a3a8
Merge pull request #3649 from vieux/remove_buffers
...
refactor, remove useless buffers
2014-01-20 10:29:54 -08:00
Tianon Gravi
274863f221
Update Travis to also compile the man page(s) now that they compile properly again
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-20 11:29:24 -07:00
Tianon Gravi
1c152f443d
Add Dockerfile man page generation from our Dockerfile reference page
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-20 11:29:07 -07:00
Tianon Gravi
10fc518fba
Fix docs manpage generation
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-20 11:29:07 -07:00
Tianon Gravi
4fb507d756
Merge pull request #3656 from tianon/travis-test-docs
...
Update Travis to also test compiling the docs
2014-01-20 10:28:44 -08:00
Tianon Gravi
fe02d58927
Update Travis to also test compiling the docs
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-20 11:24:38 -07:00
Tianon Gravi
3bd36157a1
Merge pull request #3652 from tianon/fix-travis-on-non-master-prs
...
Fix Travis for PRs against non-master (like release, for example)
2014-01-20 10:21:50 -08:00
Guillaume J. Charmes
ff662446f7
Add MAINTAINER and remove docker/utils dep from pkg/sysinfo
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-20 10:20:29 -08:00
Tianon Gravi
9152aab653
Update bash completion to ignore stderr output of docker binary
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-20 01:26:01 -07:00
Victor Vieux
cfd3d02737
Merge pull request #3669 from tianon/new-flags-completion
...
Update New Flags Completion
2014-01-20 00:12:40 -08:00
Tianon Gravi
7379a22a8d
Fix symlink mounting issues by evaluating symlinks directly on the LHS of a bind-mount -v and by FollowSymlinkInScope on the RHS just before mounting
...
Tested successfully with variations around mounting /var/run and /var/run/docker.sock inside a "debian" container directly at /var/run/docker.sock where /var/run is a symlink to "/run" on both the host and in the container.
Fixes #3262
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-20 00:38:54 -07:00
Tianon Gravi
fb981bdace
Switch docker run --username to docker run --user which is more accurate (while we can still do so without breaking anyone's scripts)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-20 00:28:55 -07:00
Tianon Gravi
c6e43154f1
Resync bash completion to include all flags defined in the code, and to autocomplete properly on all parameters that are reasonably possible to do so on today
...
This also includes several new minor features that are interesting, so do explore a little. :)
Finally, this also fixes a few bugs where commands would complete parameters that they won't necessarily accept. We still have a few of these cases, but they're reduced to a minimum now.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-20 00:28:55 -07:00
vgeta
e45b87031c
Fixes Issue# 3450
...
Docker-DCO-1.1-Signed-off-by: Gopikannan Venugopalsamy <gopikannan.venugopalsamy@gmail.com > (github: vgeta)
2014-01-19 17:48:54 -08:00
Sven Dowideit
b8cca8138b
add a little info about ghosts
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-01-20 10:37:06 +10:00
Tianon Gravi
595b8f2986
Add udev rules file to our generated deb package
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-19 17:27:43 -07:00
Michael Crosby
a60f0a0754
Merge pull request #3256 from alexlarsson/blkdiscard
...
Discard all data on devicemapper devices when deleting them
2014-01-18 10:12:10 -08:00
Tianon Gravi
980e0bf52c
Fix Travis for PRs against non-master (like release, for example)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-18 10:41:37 -07:00
Victor Vieux
455495f7ca
refactor, remove useless buffers
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-17 18:54:02 -08:00
Victor Vieux
dc359e07d3
Merge pull request #3638 from tianon/update-mailmap-authors
...
Update .mailmap and AUTHORS - we're up to 316 unique contributors by my count!
2014-01-17 18:19:41 -08:00
Guillaume J. Charmes
fec97e72db
Merge pull request #3580 from crosbymichael/extract-lxc
...
Move LXC into a sub pkg and provide initial execution driver interface
2014-01-17 18:10:10 -08:00
Michael Crosby
d5112ffce6
Fix rebase for init error
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:58 -08:00
Michael Crosby
5c30c4379a
Add todos for driver changes
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:58 -08:00
Michael Crosby
97c8450705
Make sure drivers are registerd within sysinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:58 -08:00
Michael Crosby
cdfebc2a20
Change drvier name to append version
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:58 -08:00
Michael Crosby
70a5cb95b3
Move lxc template into lxc driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:58 -08:00
Guillaume J. Charmes
9e9f4b925b
Rename Capabilities in sysinfo and move it to its own subpackage
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: crosbymichael)
2014-01-17 17:42:58 -08:00
Michael Crosby
ca8dd73fbf
Small fixes to type names
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
Guillaume J. Charmes
889b4b10ae
Cleanup + add Info to driver in order to have specific IsRunning()
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
Guillaume J. Charmes
f7684ea7f6
Move docker init into drivers functions
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
Michael Crosby
d3bae131d6
Make sure proc is umounted for chroot driver within init
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
Michael Crosby
8c9f62d037
Improve wait for lxc and driver interface
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
Michael Crosby
c2b602b2ac
Use utils.Go to get error from monitor
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
Michael Crosby
e765c67b47
Add json tags and comments to exedriver types
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
Michael Crosby
f3f2456b04
Simplify chroot wait, address code review issues
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
Michael Crosby
8a38ead219
Move setup pty and standard pipes to funcs
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
Michael Crosby
1e81387edc
Remove SysinitPath from process
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
Michael Crosby
f846ecdc77
Make exec driver run a blocking command
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
Michael Crosby
92e6db7beb
Improve chroot driver by mounting proc
...
Add -driver flag to dockerinit
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
Michael Crosby
8e0741f5e4
Add chroot driver for testing
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
Michael Crosby
1d8455e683
Move RootIsShared to lxc driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
Michael Crosby
93ead2fe78
Update with lxc unconfined changes
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
Michael Crosby
66782730b8
Fix network disabled for container
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
Michael Crosby
77936ba1a1
Fix race in set running
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
Michael Crosby
381d593d04
Fix race in cleanup
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
Michael Crosby
ad9710685c
Fix race in TestRun
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
Michael Crosby
8b60273f76
Update with container specific waitLock
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
Michael Crosby
8e87835968
Rework monitor and waitlock inside of driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
Michael Crosby
5a3d9bd432
WIP complete integration test run
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:21 -08:00
Michael Crosby
1c1cf54b0a
Fix tty set issue for ioctl error
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:21 -08:00
Michael Crosby
5573c744e4
Embed exec.Cmd on Process
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:21 -08:00
Michael Crosby
25a2697717
Keep state in core on container
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:21 -08:00
Michael Crosby
f2680e5a5b
Integrate process changes in container.go
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:21 -08:00
Michael Crosby
203b69c8c9
Implement lxc driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:21 -08:00
Michael Crosby
1ceb049118
Initial driver changes proposal
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:21 -08:00
Victor Vieux
a823d7967f
Merge pull request #3647 from vieux/refactor_registers
...
refactor registers
2014-01-17 17:39:54 -08:00
Victor Vieux
1776046618
Merge pull request #3322 from vieux/new_flags
...
new --flags
2014-01-17 17:35:18 -08:00
Victor Vieux
e71dbf4ee5
update commands.go
...
update docker.go
move to pkg
update docs
update name and copyright
change --sinceId to --since-id, update completion and docs
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor@docker.com > (github: vieux)
2014-01-17 17:33:15 -08:00
Victor Vieux
3ff5f2374c
refactor registers
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-17 16:57:43 -08:00
Johan Euphrosine
77d9fd2628
netlink: make darwin happy
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-01-17 16:55:42 -08:00
Johan Euphrosine
dadd54dba3
netlink: move Route type to common arch file
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-01-17 14:04:11 -08:00
Andy Rothfusz
ebaa92b208
Merge pull request #3620 from jamtur01/refman
...
Added Reference Manual
2014-01-17 13:42:22 -08:00
James Turnbull
89ff488b55
Added Reference Manual
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-01-17 15:29:32 -05:00
Guillaume J. Charmes
941d4ffa3e
Merge pull request #3641 from gfrey/fix_compression
...
detect compressed archives in API /build call
2014-01-17 12:02:54 -08:00
Michael Crosby
2f066aef49
Merge pull request #3632 from crosbymichael/stream-cp
...
Stream the cp operation on the client
2014-01-17 11:29:51 -08:00
Johan Euphrosine
a886fbfa4a
network: exclude default routes from checkRouteOverlaps
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-01-17 11:09:53 -08:00
Johan Euphrosine
26726dc9ff
netlink: add default Route to NetworkGetRoutes
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-01-17 11:09:50 -08:00
Michael Crosby
95df957f73
Replace creating buffer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 11:02:44 -08:00
Michael Crosby
fdd8d4b7d9
Stream the cp operation on the client
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 10:51:29 -08:00
Victor Vieux
b4e5bfbf6f
Merge pull request #3637 from crosbymichael/no-panic-on-exec
...
Return error and not panic when cannot exec in dockerinit
2014-01-17 10:42:46 -08:00
Victor Vieux
6188d7ef66
Merge pull request #3635 from vieux/top_job
...
move Top to a job
2014-01-17 10:19:28 -08:00
Gereon Frey
4f53722dee
detect compressed archives in API /build call
...
AFAIK in some previous version it was possible to give a compressed docker file
to the API's build command and that was handled properly (aka compression was
detected and archive uncompressed accordingly). Fails with at least 0.7.5.
Fixed this using the DecompressStream method from the archive package.
Docker-DCO-1.1-Signed-off-by: Gereon Frey <me@gereonfrey.de > (github: gfrey)
2014-01-17 12:21:26 +01:00
Alexander Larsson
ba52130873
Fix cross compile
...
stat.Rdev and time.* is 32bit on OSX, which breaks cross builds with eg:
cannot use stat.Rdev (type int32) as type uint64 in function argument
We fix this with an extra conversion to uint64.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-17 11:01:28 +01:00
Tianon Gravi
2f6fb41dd1
Update .mailmap and AUTHORS - we're up to 316 unique contributors by my count!
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-16 20:13:51 -07:00
Michael Crosby
11ef2f0db4
Return error and not panic when cannot exec in dockerinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-16 18:31:21 -08:00
Michael Crosby
d6b810c32e
Merge pull request #3624 from tianon/vendor-maintainers
...
Symlink vendor/MAINTAINERS over to hack/MAINTAINERS
2014-01-16 17:58:28 -08:00
Tianon Gravi
59fe36623b
Merge pull request #3599 from tianon/fix-install-sed
...
Fix release.sh sed of install.sh so we preserve tests against 'https://get.docker.io/ '
2014-01-16 16:54:39 -08:00
Victor Vieux
93ce4d2c0b
Merge pull request #3625 from tianon/cleanup-vendor-sh
...
Clean and simplify vendor.sh while making it easier to maintain as well
2014-01-16 16:42:52 -08:00
Victor Vieux
8cbabf2c3e
clean up test log
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-16 16:07:42 -08:00
Victor Vieux
812798a7d6
move top job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-16 16:07:42 -08:00
Victor Vieux
3155ef5cbc
Merge pull request #3616 from vieux/job_changes
...
move changes to a job
2014-01-16 15:52:57 -08:00
Andy Rothfusz
2cdbc719c5
Merge pull request #3583 from metalivedev/3497-copyright
...
Update docs/NOTICE copyrights to 2014
2014-01-16 12:18:34 -08:00
Tianon Gravi
40b40cffb1
Clean and simplify vendor.sh while making it easier to maintain as well
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-15 22:20:51 -07:00
Tianon Gravi
98111a4a94
Symlink vendor/MAINTAINERS over to hack/MAINTAINERS (since it depends explicitly on hack/vendor.sh)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-15 22:12:32 -07:00
Victor Vieux
90ec5de430
move changes to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-15 17:13:45 -08:00
Victor Vieux
20f36f088c
Merge pull request #3615 from vieux/search_job
...
move search to a job
2014-01-15 17:13:07 -08:00
Victor Vieux
1669b802cc
move search to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-15 17:12:48 -08:00
Victor Vieux
0b7d4c855d
Merge pull request #3512 from vieux/attach_job
...
move attach to a job
2014-01-15 17:12:14 -08:00
Victor Vieux
e1d8543c78
move attach to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-15 17:11:44 -08:00
Victor Vieux
c4b0eedc92
Merge pull request #3617 from dotcloud/fix_insert_display
...
fix docker insert display
2014-01-15 16:14:59 -08:00
Victor Vieux
2edcebc027
fix docker insert display
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-15 15:41:57 -08:00
Victor Vieux
44b8d8addf
Merge pull request #3559 from vieux/insert_job
...
move insert to a job
2014-01-15 15:18:02 -08:00
Victor Vieux
a33bc3018b
use the same 'Used' method as before
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-15 14:52:58 -08:00
Victor Vieux
0fb8a55753
move insert to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-15 14:52:58 -08:00
Victor Vieux
52ec95f363
Merge pull request #3560 from vieux/copy_job
...
move copy to a job
2014-01-15 14:48:51 -08:00
Victor Vieux
e2fa3f56df
move copy to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-15 14:48:31 -08:00
Victor Vieux
f213e2dd6c
Merge pull request #3613 from vieux/deprecated_viz_job
...
move viz to a job
2014-01-15 14:47:56 -08:00
Victor Vieux
a98e40fa73
update TODO
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-15 14:47:35 -08:00
Victor Vieux
7fbc315aa9
move viz to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-15 13:52:35 -08:00
Andy Rothfusz
cdea7d3b5f
Merge pull request #3598 from tianon/fix-vieux-docs-errors-again
...
Fix odd issues with "make docs", add "make docs-shell", and canonicalize...
2014-01-15 13:42:28 -08:00
Andy Rothfusz
0113c087b2
Merge pull request #3593 from dotcloud/fix_doc
...
fix doc, load and get
2014-01-15 13:33:00 -08:00
Victor Vieux
78138344a4
Merge pull request #3606 from jpallen/1319-fix-race-condition-in-truncindex
...
Add RWMutex lock into TruncIndex to fix race condition when inserting values
2014-01-15 11:41:51 -08:00
Victor Vieux
7e00ba03ec
fix doc, load and get
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-15 11:12:05 -08:00
Victor Vieux
ad5d675553
Merge pull request #3582 from vieux/history_job
...
move history to a job
2014-01-15 11:06:54 -08:00
Victor Vieux
7898dca8b3
fix tests & small code improvment
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-15 11:06:00 -08:00
Guillaume J. Charmes
5a91781ef9
Merge pull request #3608 from crosbymichael/merge_release_v0.7.6
...
Merge release v0.7.6 to master
2014-01-15 10:41:43 -08:00
Michael Crosby
3ef777ecbe
Merge branch 'release' into merge_release_v0.7.6
...
Conflicts:
VERSION
hack/make/ubuntu
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-15 09:54:06 -08:00
Michael Crosby
4934c35aa1
Merge pull request #3597 from crosbymichael/bump_v0.7.6
...
Bump to version v0.7.6
2014-01-15 09:40:43 -08:00
James Allen
37fcbfa1f4
Add RWMutex lock into TruncIndex to fix race condition when inserting values
...
The idx.index array is overwritten when a new value is inserted to the index.
When two containers are created concurrently, their ids are inserted to the
index and one can overwrite the other leaving one of ids missing from the
index. Adding a RWMutex lock around read/write operations fixes this.
Docker-DCO-1.1-Signed-off-by: James Allen <jamesallen0108@gmail.com > (github: jpallen)
2014-01-15 17:30:00 +00:00
Tianon Gravi
dbf249e239
Merge pull request #3508 from tutumcloud/seccomp
...
Add capabilities needed by new sysinit to mkseccomp.pl sample list
2014-01-14 18:55:53 -08:00
Tianon Gravi
221454f315
Fix release.sh sed of install.sh so we preserve tests against ' https://get.docker.io/ '
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-14 19:29:02 -07:00
Tianon Gravi
eaa9c85511
Fix odd issues with "make docs", add "make docs-shell", and canonicalize our docs Dockerfile a bit more
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-14 19:23:30 -07:00
Michael Crosby
bc3b2ec062
Bump to version v0.7.6
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-14 17:53:20 -08:00
Tianon Gravi
d103b6f6df
Add more specific lvm2 version to PACKAGERS document
...
I personally tested this using our container, and this was the lowest version that compiles and runs properly.
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com > (github: crosbymichael)
2014-01-14 17:29:25 -08:00
Tianon Gravi
07b50a90a8
Inline the test.docker.io fingerprint in the install.sh script as well
...
As long as we're doing it, we ought to do it for all the "official" Docker properties at least
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com > (github: crosbymichael)
2014-01-14 17:27:51 -08:00
Tianon Gravi
75293b12b3
Add ca-certificates to our package Recommends
...
It's only in "Recommends" because it's only required for all but the esoteric configurations (since you can't "docker pull" from the index without it, but that's about it).
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com > (github: crosbymichael)
2014-01-14 17:27:34 -08:00
Fabio Falci
734b4566df
Use https to get the latest docker version
...
To avoid unexpected results since docker was using http.
For instance, my broadband doesn't return not found when it's down but
a html page saying that the internet is down. Docker was showing that
html instead of ignoring it.
Fix #3570
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: fabiofalci)
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: crosbymichael)
2014-01-14 17:27:12 -08:00
Michael Crosby
8d19b2caa0
Add remount for bind mounts in ro
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-14 17:26:34 -08:00
Tianon Gravi
42fed841d3
Fix "foo: no such file or directory" test failure, and normalize creation of custom error to always depend on if os.IsNotExist(err) so we don't hide other errors that might crop up in these tests
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com > (github: crosbymichael)
2014-01-14 17:25:35 -08:00
Tianon Gravi
ad69836247
Stop ADD from following symlinks outside the context when passed as the first argument
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com > (github: crosbymichael)
2014-01-14 17:25:26 -08:00
Victor Vieux
152c956719
Merge pull request #3594 from crosbymichael/add-bind-remount
...
Add remount for bind mounts in ro
2014-01-14 16:57:55 -08:00
Michael Crosby
f231539e99
Add remount for bind mounts in ro
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-14 15:20:21 -08:00
Tianon Gravi
bfc256f6c9
Merge pull request #3581 from tianon/deb-xz-utils
...
Add xz-utils to our deb-recommends since it's necessary for some images
2014-01-14 12:07:10 -08:00
Guillaume J. Charmes
12d00d19bb
Merge pull request #3592 from tianon/fix-travis-vendor
...
Fix Travis to not check gofmt on vendor/*
2014-01-14 11:52:08 -08:00
Tianon Gravi
feb3f98418
Merge pull request #3567 from tianon/dockerfile-add-symlink
...
Stop ADD from following symlinks outside the context when passed as the first argument
2014-01-14 11:48:54 -08:00
Andy Rothfusz
be44bf8170
Merge pull request #3585 from tianon/remove-uid-ns-reference
...
Remove reference to nonexistent CONFIG_UID_NS
2014-01-14 11:37:00 -08:00
Andy Rothfusz
da78dd0eb8
Merge pull request #3586 from flavio/add_openSUSE_installation_docs
...
Added document explaining openSUSE installation
2014-01-14 11:36:15 -08:00
Victor Vieux
bea6dd3888
move history to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-14 10:52:42 -08:00
Tianon Gravi
7a6255efbc
Fix "foo: no such file or directory" test failure, and normalize creation of custom error to always depend on if os.IsNotExist(err) so we don't hide other errors that might crop up in these tests
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-14 11:42:03 -07:00
Fernando
32565a4451
added capabilities needed by new sysinit
...
Docker-DCO-1.1-Signed-off-by: Fernando Mayo <fernando@tutum.co > (github: fermayo)
2014-01-14 19:27:31 +01:00
Tianon Gravi
f700aa1570
Fix Travis to not check gofmt on vendor/*
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-14 11:07:18 -07:00
Victor Vieux
bdcd1cfba5
Merge pull request #3591 from tianon/fix-vendor
...
Un-gofmt ./vendor
2014-01-14 10:06:11 -08:00
Michael Crosby
a49efa975e
Merge pull request #3534 from philips/reformat-DCO
...
CONTRIBUTING.md: wrap DCO to 78 chars per line
2014-01-14 10:00:14 -08:00
Tianon Gravi
e8ffc2eee0
Un-gofmt ./vendor
...
We can't be modifying this except to update from upstream.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-14 10:54:19 -07:00
Michael Crosby
b68ddcec21
Merge pull request #3570 from fabiofalci/3569-validate-docker-version
...
Fetch docker version over https
2014-01-14 09:36:18 -08:00
James Turnbull
7d702ef501
Merge pull request #3587 from tianon/fix-gentoo-typo
...
Fix docs typo: "Gento" -> "Gentoo"
2014-01-14 09:22:58 -08:00
Flavio Castelli
3a1ce011a0
Added document explaining openSUSE installation
...
Added a new documentation page explaining how to install Docker on
openSUSE.
Docker-DCO-1.1-Signed-off-by: Flavio Castelli <fcastelli@suse.com > (github: flavio)
2014-01-14 16:26:18 +01:00
Tianon Gravi
5a3fa3c901
Add a few small tweaks to mkimage-debootstrap, especially to help with lucid
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-14 04:20:27 -07:00
Tianon Gravi
c7dcd19b28
Fix docs typo: "Gento" -> "Gentoo"
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-14 04:18:51 -07:00
Alexander Larsson
a4868e233c
Implement UnTar via archive/tar
...
This replaces the shelling out to tar with a reimplementation of untar
based on the archive/tar code and the pre-existing code from ApplyLayer
to create real files from tar headers.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-14 11:21:29 +01:00
Alexander Larsson
710d5a48fb
archive: Extract createTarFile() from ApplyLayer
...
This way we can reuse it for Untar()
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-14 11:21:07 +01:00
Tianon Gravi
658f57fdfa
Remove reference to nonexistent CONFIG_UID_NS
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-13 23:32:21 -07:00
Andy Rothfusz
fe6c9e8fd7
Merge pull request #3584 from tianon/fix-docs-dockerfile
...
Fix docs Dockerfile to install correctly again
2014-01-13 17:42:20 -08:00
Tianon Gravi
4087a643ea
Fix docs Dockerfile to install correctly again
...
Previously we've been getting:
```
Step 6 : RUN pip install Sphinx==1.1.3
---> Running in 397eab32f57a
Wheel installs require setuptools >= 0.8 for dist-info support.
pip's wheel support requires setuptools >= 0.8 for dist-info support.
Storing debug log for failure in /.pip/pip.log
2014/01/13 18:01:34 The command [/bin/sh -c pip install Sphinx==1.1.3] returned a non-zero code: 1
make: *** [docs] Error 1
```
This fixes that by telling pip not to use sudo to install (since we're already root).
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-13 18:22:23 -07:00
Andy Rothfusz
a92699ab6c
Fixes 3497
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: @metalivedev)
2014-01-13 17:12:53 -08:00
Victor Vieux
9792df2080
Merge pull request #3575 from shykes/engine-get-images
...
move `docker images` to a job
2014-01-13 16:25:23 -08:00
Victor Vieux
16ca6a1c12
move legacy stuff outside the job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-13 16:20:05 -08:00
Victor Vieux
aca1270104
add legacy compat
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-13 15:50:20 -08:00
Victor Vieux
3a610f754f
Add compat 1.8
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-13 15:50:20 -08:00
Solomon Hykes
17a806c8a0
Port 'docker images' to the engine API
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-13 15:49:33 -08:00
Tianon Gravi
1004c2d3d8
Add xz-utils to our deb-recommends since it's necessary for some images
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-13 16:25:23 -07:00
Fabio Falci
89bed4337d
Use https to get the latest docker version
...
To avoid unexpected results since docker was using http.
For instance, my broadband doesn't return not found when it's down but
a html page saying that the internet is down. Docker was showing that
html instead of ignoring it.
Fix #3570
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: fabiofalci)
2014-01-13 20:37:29 +00:00
Andy Rothfusz
6652416f4c
Merge pull request #3544 from SvenDowideit/build-image-cache
...
add info and example of image cache in use when building
2014-01-13 11:10:29 -08:00
Alexander Larsson
93e120e7d6
Discard all data on devicemapper devices when deleting them
...
This works around the fact that deleting a device in a thin pool
doesn't discard the free space. Unfortunately even this is not perfect,
as it seems discards are respected only for blocks that has never been
shared in the thin device code. However, this has been fixed in the
upstream kernel device-mapper tree:
http://git.kernel.org/cgit/linux/kernel/git/device-mapper/linux-dm.git/commit/?h=for-next&id=0ab1c92ff748b745c1ed7cde31bb37ad2c5f901a
When this hits the kernel I belive this will fully return space
for removed images/containers to the host FS. For now it only
helps partially (which is better than nothing).
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-13 13:41:04 +01:00
Alexander Larsson
d54ce8087a
Don't shell out to tar for ExportChanges
...
This changes ExportChanges to use the go tar support so we can
directly create tar layer files. This has several advantages:
* We don't have to create the whiteout files on disk to get them
added to the layer
* We can later guarantee specific features (such as xattrs) being
supported by the tar implementation.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-13 13:36:11 +01:00
Sven Dowideit
f30ca8935d
add info and example of image cache in use when building
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Docker-DCO-1.0-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-01-13 22:17:47 +10:00
Tianon Gravi
07f62f199f
Merge pull request #3554 from tianon/ubuntu-dep
...
Add ca-certificates to our package Recommends
2014-01-11 15:07:50 -08:00
Tianon Gravi
7273b33e86
Merge pull request #3551 from tianon/test-docker-io-gpg-fingerprint
...
Inline the test.docker.io fingerprint in the install.sh script as well
2014-01-11 15:07:06 -08:00
James Turnbull
ba90fcfc08
Merge pull request #3539 from jeandalido/patch-1
...
Update docker_remote_api_v1.8.rst
2014-01-11 13:29:56 -08:00
Tianon Gravi
fb63cfa9a5
Stop ADD from following symlinks outside the context when passed as the first argument
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-11 05:46:11 -07:00
Tianon Gravi
f65706aaeb
Merge pull request #3500 from tianon/lvm2-version
...
Add more specific lvm2 version to PACKAGERS document
2014-01-11 03:39:01 -08:00
Tianon Gravi
fd78128870
Add support for RUN [""] in Dockerfiles for greater specificity in what is actually executed
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-11 04:00:52 -07:00
Tianon Gravi
cb314b9752
Merge pull request #3555 from jordansissel/patch-1
...
Update Ubuntu packaging script to use 'fpm -s empty' instead of 'mkdir empty && fpm -s dir -C empty'
2014-01-10 22:46:30 -08:00
Jordan Sissel
a02450d048
Use '-s empty' instead of '-s dir'
...
This *should* have the same effect as the previous strategy: Instead of
'mkdir empty; fpm -s dir -C empty ...' we can simply do 'fpm -s empty'
Docker-DCO-1.1-Signed-off-by: Jordan Sissel <jls@semicomplete.com > (github: jordansissel)
2014-01-10 22:36:58 -08:00
Victor Vieux
b61570b521
Merge pull request #3490 from vieux/image_export_job
...
Move image_export to a job
2014-01-10 15:58:47 -08:00
Victor Vieux
5264914e57
Move image_export to a job
...
Docker-DCO-1.0-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-10 15:54:44 -08:00
Victor Vieux
6dde20c0c5
Merge pull request #3180 from vieux/job_container_delete
...
Move container_delete to job
2014-01-10 15:53:38 -08:00
Victor Vieux
ad162b75a0
Merge pull request #3476 from vieux/restart_job
...
Move restart to a job
2014-01-10 15:52:42 -08:00
Victor Vieux
15689b56c8
Move restart to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-10 15:51:48 -08:00
Victor Vieux
aa3339cf39
move container_delete to job
...
handle error
remove useless errStr
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor@docker.com > (github: vieux)
2014-01-10 15:34:10 -08:00
Tianon Gravi
459e0aa2c1
Merge pull request #3543 from EvanKrall/gzip_debs
...
Use gzip compression in Ubuntu packages to make it possible to install on Lucid
2014-01-10 15:29:22 -08:00
Tianon Gravi
e5189b5dd2
Add ca-certificates to our package Recommends
...
It's only in "Recommends" because it's only required for all but the esoteric configurations (since you can't "docker pull" from the index without it, but that's about it).
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-10 13:06:53 -07:00
Evan Krall
c2a59dfe48
Use gzip compression in Ubuntu packages to make it at least possible to install on Lucid.
...
Docker-DCO-1.1-Signed-off-by: Evan Krall <krall@yelp.com > (github: EvanKrall)
2014-01-10 11:45:00 -08:00
Tianon Gravi
051e7a0bef
Inline the test.docker.io fingerprint in the install.sh script as well
...
As long as we're doing it, we ought to do it for all the "official" Docker properties at least
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-10 10:20:31 -07:00
Jean-Baptiste Dalido
2fd4c39c86
Update docker_remote_api_v1.7.rst and non-versionned
...
Docker-DCO-1.1-Signed-off-by: Jean-Baptiste Dalido <jbdalido@gmail.com > (github: jeandalido)
2014-01-10 11:35:25 +01:00
Jean-Baptiste
d69cf2986e
Update docker_remote_api_v1.8.rst
...
Docker-DCO-1.1-Signed-off-by: Jean-Baptiste Dalido <jbdalido@gmail.com > (github: jeandalido)
2014-01-10 11:27:21 +01:00
Guillaume J. Charmes
7985125602
Merge pull request #3537 from crosbymichael/merge_release_v0.7.5
...
Merge release v0.7.5
2014-01-09 11:39:35 -08:00
Michael Crosby
c3c89abfd6
Change version to v0.7.5
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-09 11:36:30 -08:00
Michael Crosby
1fcbd36cb2
Merge branch 'release' into merge_release_v0.7.5
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-09 11:36:14 -08:00
Michael Crosby
845b816686
Merge pull request #3532 from crosbymichael/bump_v0.7.5
...
Bump to v0.7.5
2014-01-09 11:33:57 -08:00
Guillaume J. Charmes
fc14e81bf9
Merge pull request #3533 from crosbymichael/run-rm-remove-volumes
...
Remove volumes on docker run -rm
2014-01-09 10:47:28 -08:00
Michael Crosby
c348c04fdf
Bump to version v0.7.5
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-09 10:34:50 -08:00
Michael Crosby
5ca0fedffc
Merge pull request #3535 from plietar/3457-git-build
...
Don't compress the archive made from git's output.
2014-01-09 10:32:28 -08:00
Paul Lietar
562a235763
Don't compress the archive made from git's output.
...
Commit 894d4a23fbpaul@lietar.net > (github: plietar)
2014-01-09 18:23:19 +00:00
Brandon Philips
e4af8b2ddc
CONTRIBUTING.md: wrap DCO to 78 chars per line
...
The DCO is a bit hard to read on Github right now because there is lots
of horizontal scrolling. Reformat it to 78 chars per line like the rest
of the file.
Example: http://imgur.com/LtJEIsl
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-01-09 10:08:52 -08:00
Michael Crosby
14acf6883d
Remove volumes on docker run -rm
...
If we don't care about the container then we don't care about any
volumes created with the run of that container
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-09 09:58:40 -08:00
Guillaume J. Charmes
eb131250aa
Merge pull request #3530 from creack/update_dco_doc
...
Update DCO git hook example
2014-01-09 09:23:35 -08:00
Guillaume J. Charmes
9ec29fddf8
Merge pull request #3528 from tianon/update-travis-dco
...
Update Travis to check for new 1.1 DCO version
2014-01-09 09:23:23 -08:00
Guillaume J. Charmes
d015d31b1c
Merge pull request #3527 from keeb/add-dco
...
Amend DCO
2014-01-09 09:23:11 -08:00
Guillaume J. Charmes
f6292ab8d0
Merge pull request #3522 from bantic/fix-misspelled-names
...
Fix misspelled Hawkings -> Hawking, Archimede -> Archimedes, Euclide -> Euclid
2014-01-09 09:12:05 -08:00
Guillaume J. Charmes
c3f2597546
Update DCO git hook example
2014-01-09 09:02:56 -08:00
Tianon Gravi
a4f3cd62a3
Update Travis to check for new 1.1 DCO version
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-09 09:52:17 -07:00
Nick Stinemates
11d61ec77f
Bump DCO version
2014-01-09 08:47:03 -08:00
Nick Stinemates
40c90796e9
Fix layout
2014-01-09 08:35:47 -08:00
Nick Stinemates
7fb55f7725
Removed the 5th clause
...
Removed clause which states contributions should be relicensed
2014-01-09 08:35:06 -08:00
Cory Forsyth
7a7c3d87d8
Fix misspelled Hawkings -> Hawking, Archimede -> Archimedes, Euclide -> Euclid
...
Docker-DCO-1.0-Signed-off-by: Cory Forsyth <cory.forsyth@gmail.com > (github: bantic)
2014-01-09 10:02:55 -05:00
Guillaume J. Charmes
42df36b6fc
Merge pull request #3515 from crosbymichael/no-host-name-without-networking
...
Do not add hostname when networking is disabled
2014-01-08 17:22:24 -08:00
Michael Crosby
0354c3a95c
Do not add hostname when networking is disabled
...
Docker-DCO-1.0-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-08 16:57:56 -08:00
Victor Vieux
189c40597f
Merge pull request #3511 from bantic/fix-misspelled-feynman
...
Fix misspelling of Richard Feynman's last name
2014-01-08 16:29:59 -08:00
Cory Forsyth
98193a397e
Fix misspelling of Richard Feynman's last name
...
Docker-DCO-1.0-Signed-off-by: Cory Forsyth <cory.forsyth@gmail.com > (github: bantic)
2014-01-08 19:02:15 -05:00
Andy Rothfusz
c45cd9174e
Merge pull request #3460 from tsaavik/patch-1
...
Fixed error in group add example
2014-01-08 15:45:23 -08:00
Michael Crosby
ee65633620
Merge pull request #3446 from tianon/update-checklist
...
Update release checklist with more information, more commands, and more ...
2014-01-08 15:37:49 -08:00
Guillaume J. Charmes
3be2ea021d
Merge pull request #3417 from Sjord/use-most-recent-cache-image
...
Fix issue #3375 - Return most recent image from the cache
2014-01-08 15:30:36 -08:00
Guillaume J. Charmes
1d0d093d0b
Merge pull request #3464 from vieux/fix_error_wait
...
fix error on docker wait
2014-01-08 15:06:54 -08:00
Guillaume J. Charmes
38a49951b3
Merge pull request #3493 from SvenDowideit/commit-signoff-location
...
give more specific advice on setting up signing
2014-01-08 15:04:00 -08:00
Guillaume J. Charmes
772765c404
Merge pull request #3510 from creack/hotfix-add_caching
...
Hotfix add caching
2014-01-08 15:00:18 -08:00
Victor Vieux
71e89fdc75
Merge pull request #3514 from vieux/update_REMOTE_TODO
...
update REMOTE_TODO.md
2014-01-08 14:51:35 -08:00
Victor Vieux
5530cc29b2
update REMOTE_TODO.md
...
Docker-DCO-1.0-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-08 14:50:52 -08:00
Tianon Gravi
82aed48bbc
Merge pull request #3494 from tianon/makefile-use-branch-tag
...
Update Makefile to use "docker:GIT_BRANCH" as the generated image name
2014-01-08 14:47:41 -08:00
Guillaume J. Charmes
0fd9c98de3
Make sure the remote ADD are cached properly
...
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-08 14:22:49 -08:00
Guillaume J. Charmes
762a0cc472
Cleanup utils.Download
...
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-08 14:22:49 -08:00
Guillaume J. Charmes
e24e9c09f8
Make sure file are cached correctly during build
...
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-08 14:22:49 -08:00
Frank Macreery
93ff70a3e7
Potential fix for ADD .
...
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-08 14:22:24 -08:00
Guillaume J. Charmes
c6350bcc24
Disable compression for build. More space usage but much faster upload
...
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-08 14:21:13 -08:00
Andy Rothfusz
9a6333466b
Merge pull request #3503 from gertvv/patch-1
...
Hello World: fix detach behavior
2014-01-08 11:44:26 -08:00
Andy Rothfusz
187eed7da5
Merge pull request #3501 from proppy/patch-1
...
google-compute-engine: fix typos
2014-01-08 11:40:30 -08:00
Victor Vieux
368e308971
Merge pull request #3499 from tianon/typos
...
Fix a few miscellaneous typos (Unkown -> Unknown, Recieve -> Receive)
2014-01-08 10:37:00 -08:00
Victor Vieux
149156a272
Merge pull request #3402 from manuel-woelker/3345-add-content-type-header-to-version-remote-api
...
Fix for #3345 : Add Content-Type Header "application/json" to GET /version response in remote API
2014-01-08 10:15:22 -08:00
Gert van Valkenhoef
8298a200ce
Add the customary bold
2014-01-08 18:45:06 +01:00
Danny Yates
c4535c833d
gofmt
...
Docker-DCO-1.0-Signed-off-by: Danny Yates <danny@codeaholics.org > (github: codeaholics)
2014-01-08 10:37:22 +00:00
Danny Yates
145501bee3
Fix indentation to match rest of file (tabs, not spaces)
...
Docker-DCO-1.0-Signed-off-by: Danny Yates <danny@codeaholics.org > (github: codeaholics)
2014-01-08 10:14:30 +00:00
Danny Yates
df4ea946a6
Further simplification
...
Docker-DCO-1.0-Signed-off-by: Danny Yates <danny@codeaholics.org > (github: codeaholics)
2014-01-08 10:14:25 +00:00
Danny Yates
6b48761ce9
Remove unneeded DependencyGraph
...
Docker-DCO-1.0-Signed-off-by: Danny Yates <danny@codeaholics.org > (github: codeaholics)
2014-01-08 10:14:14 +00:00
Danny Yates
5aa304f969
Fix registry pushing/tagging
...
* docker push host:port/namespace/repo wouldn't push multiple tags for
the same image
* getImageList was unnecessarily complex returning a nested array of
ImgData when a correctly ordered list of images was sufficient
* removed various bits of redundancy
Docker-DCO-1.0-Signed-off-by: Danny Yates <danny@codeaholics.org > (github: codeaholics)
2014-01-08 10:13:14 +00:00
Gert van Valkenhoef
c9cebf3a73
Hello World: fix detach behavior
...
The hello world example relies on being able to exit the container attachment using Control-C without stopping it. According to this thread (and my own experience), this doesn't work anymore:
https://groups.google.com/forum/#!msg/docker-user/nWXAnyLP9-M/kbv-FZpF4rUJ
Added -sig-proxy=false to the attach command.
2014-01-08 10:58:55 +01:00
Manuel Woelker
53a01aebd6
Fix for #3345 : Add Content-Type Header "application/json" to GET /version and /info responses in remote API
...
Docker-DCO-1.0-Signed-off-by: Manuel Woelker <github@manuel.woelker.org > (github: manuel-woelker)
2014-01-08 09:17:20 +01:00
Sjoerd Langkemper
46c8b11f24
Fix issue #3375 - Return most recent image from the cache
...
ImageGetCached searches for an image from the cache. Instead of returning the
first image it finds, it should return the most recently created image. When a
build with --no-cache then adds a new image with the same parameters, it is
used instead of the old, existing image.
Docker-DCO-1.0-Signed-off-by: Sjoerd Langkemper <sjoerd@byte.nl > (github: Sjord)
2014-01-08 09:15:45 +01:00
Sjoerd Langkemper
10b794b332
Revert "Make sure the cache lookup returns always the same result"
...
This reverts commit 1d4b7d8fa1sjoerd@byte.nl > (github: Sjord)
2014-01-08 09:14:31 +01:00
Johan Euphrosine
a3ee36b747
google-compute-engine: fix typos
2014-01-08 00:11:06 -08:00
Tianon Gravi
7626e9fd64
Add more specific lvm2 version to PACKAGERS document
...
I personally tested this using our container, and this was the lowest version that compiles and runs properly.
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-08 00:27:50 -07:00
Tianon Gravi
e525ad3f9b
Fix a few miscellaneous typos (Unkown -> Unknown, Recieve -> Receive)
...
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-07 22:15:53 -07:00
Michael Crosby
322a42b8a2
Merge pull request #3496 from creack/disable_build_compression
...
Disable compression for build. More space usage but much faster upload
2014-01-07 18:57:18 -08:00
Guillaume J. Charmes
90ea81433f
Merge pull request #3498 from crosbymichael/merge_release_v0.7.4
...
Merge release v0.7.4
2014-01-07 18:44:03 -08:00
Michael Crosby
d7f26c93d9
Change version to v0.7.4-dev
...
Docker-DCO-1.0-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-07 18:41:06 -08:00
Michael Crosby
d4e61b48eb
Merge branch 'release' into merege_release_v0.7.4
...
Docker-DCO-1.0-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-07 18:40:54 -08:00
Michael Crosby
1a6fc02348
Merge pull request #3495 from crosbymichael/bump_v0.7.4
...
Bump v0.7.4
2014-01-07 18:35:44 -08:00
Michael Crosby
010d74ec2f
Bump to v0.7.4
...
Docker-DCO-1.0-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-07 18:06:20 -08:00
Guillaume J. Charmes
1137ecf7d1
Disable compression for build. More space usage but much faster upload
...
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-07 17:46:04 -08:00
Tianon Gravi
a25a80b2d3
Merge pull request #3361 from zimbatm/gpg-key-secure-best
...
Makes sure the GPG fingerprint is inlined in the doc everywhere.
2014-01-07 17:43:04 -08:00
Tianon Gravi
a95712899e
Update Makefile to use "docker:GIT_BRANCH" as the generated image name for increased versatility
...
... and other minor Makefile improvements :)
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-07 18:38:07 -07:00
Tianon Gravi
b57051a724
Update release checklist with more information, more commands, and more correct flow (test, upload to test.docker.io, test, upload to get.docker.io, THEN tag&merge)
...
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-07 18:28:07 -07:00
Guillaume J. Charmes
bb76985d39
Merge pull request #3474 from creack/fix_add_cache_issue
...
Fix ADD caching issue with . prefixed path
2014-01-07 17:24:18 -08:00
Guillaume J. Charmes
28ec47c441
Merge pull request #3492 from unclejack/3449-fix_docker_build_on_devicemapper
...
#3449 - fix `docker build` on devicemapper
2014-01-07 17:12:31 -08:00
zimbatm
94c803e9f0
Fixes key installation for other target urls in hack/install.sh
...
Docker-DCO-1.0-Signed-off-by: Jonas Pfenniger <zimbatm@zimbatm.com > (github: zimbatm)
2014-01-08 01:08:14 +00:00
zimbatm
13ebc68636
Makes sure the GPG key fingerprint is inlined in the doc everywhere.
...
Instead of `curl $url | apt-get add -` use the ubuntu keyserver and a full
fingerprint to retreive the key. This makes the distribution of the GPG key
more secure an less likely to change even if 3rd party gains access to the
packages repository.
Docker-DCO-1.0-Signed-off-by: Jonas Pfenniger <zimbatm@zimbatm.com > (github: zimbatm)
2014-01-08 01:07:04 +00:00
unclejack
d003cfea25
Revert "Add -S option to tar for efficient sparse file handling"
...
This reverts commit 733bf5d3dd#3449 .
Docker-DCO-1.0-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-01-08 02:58:39 +02:00
Guillaume J. Charmes
f3103e5c91
Fix issue with file caching + prevent wrong cache hit
...
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-07 16:53:55 -08:00
Sven Dowideit
0eb5f233d6
give more specific advice on setting up signing
...
Docker-DCO-1.0-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-01-08 10:19:44 +10:00
Guillaume J. Charmes
ef7e000a13
Make vfs error more explicit
...
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-07 16:02:41 -08:00
Guillaume J. Charmes
811341423b
Fix ADD caching issue with . prefixed path
...
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <charmes.guillaume@gmail.com > (github: creack)
2014-01-07 16:02:20 -08:00
Andy Rothfusz
b3addb5fb8
Merge pull request #3430 from lsm5/fedora-official-image
...
install instructions use unprefixed fedora image
2014-01-07 15:12:37 -08:00
Andy Rothfusz
00ee6d1925
Merge pull request #3483 from lukaspustina/patch-1
...
Missing redirect in line 85
2014-01-07 15:11:02 -08:00
Andy Rothfusz
6f8a79c23c
Merge pull request #3462 from tsaavik/patch-2
...
Simplified and streamlined Amazon Quickstart
2014-01-07 15:09:35 -08:00
Andy Rothfusz
cf8063d152
Merge pull request #3461 from jbeda/patch-1
...
Update instructions for mtu flag for Docker on GCE
2014-01-07 15:03:19 -08:00
Andy Rothfusz
3e10fe1a15
Merge pull request #3488 from jamtur01/1310
...
Fixed #3481 - Added Ubuntu Saucy to installation
2014-01-07 14:56:03 -08:00
Michael Crosby
45ecdf9c8e
Merge pull request #3487 from crosbymichael/improve-images-speed
...
Only get rootfs when we need to calculate the image size
2014-01-07 14:47:31 -08:00
Tianon Gravi
b942f24ba8
Merge pull request #3491 from tianon/travis-numeric-commit
...
Fix Travis handling of a fully-numeric commit hash being YAML-converted ...
2014-01-07 14:35:06 -08:00
Tianon Gravi
3779291e9b
Fix Travis handling of a fully-numeric commit hash being YAML-converted to a number instead of a string
...
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-07 15:27:51 -07:00
Michael Crosby
fa14a1b983
Only get rootfs when we need to calculate the image size
...
Docker-DCO-1.0-Signed-off-by: Michael Crosby <crosby.michael@gmail.com > (github: crosbymichael)
2014-01-07 13:56:26 -08:00
Tianon Gravi
f9e14cc838
Merge pull request #3489 from tianon/travis-fixes
...
Fix Travis PR testing to not overwrite the "master" that Travis creates with our "upstream master"
2014-01-07 12:53:19 -08:00
Victor Vieux
f2ea539467
Update REMOTE_TODO.md
2014-01-07 12:51:17 -08:00
Tianon Gravi
7c4e5fbd46
Fix Travis PR testing to not overwrite the "master" that Travis creates with our "upstream master", and to also ignore commits with no content (like a Merge commit - there's no need to sign off on literally nothing)
...
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-07 13:45:40 -07:00
James Turnbull
97ef8a067c
Fixed #3481 - Added Ubuntu Saucy to installation
...
Docker-DCO-1.0-Signed-off-by: James Turnbull <james@lovedthanlost.net > jamtur01
2014-01-07 11:46:07 -08:00
Michael Crosby
4b9e475a3d
Merge pull request #2091 from keeb/add-dco
...
Add Developer Certificate of Origin Text
2014-01-07 10:42:53 -08:00
Michael Crosby
1d0aeae339
Merge pull request #3431 from shin-/ping_standalone_check
...
Check standalone header when pinging a registry server.
2014-01-07 10:33:07 -08:00
Solomon Hykes
859856b3e4
Merge pull request #3475 from tianon/travis
...
Add Travis CI configuration to validate DCO and gofmt
2014-01-07 10:19:43 -08:00
Michael Crosby
b8b18a2b42
Merge pull request #3435 from roylee17/3149-fix_port_mapping_of_tcp_plus_udp
...
Fix #3149 : port mapping of TCP + UDP
2014-01-07 10:08:13 -08:00
Tianon Gravi
561d1db074
Add Travis CI configuration to validate DCO and gofmt
...
After each push, Travis CI will trigger, and check two things:
- make sure that each commit in the push has the Docker certificate of origin
- make sure that all .go files changed by this sequence of commits are correctly formatted in the most recent commit
Note: there is one edge case; if you do a git force push, we cannot figure out the actual commits in the force push, and we will just run the checks as if upstream master were the base. Pull requests will always be tested correctly, though.
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-07 08:25:54 -07:00
Michael Crosby
1f9abfe841
Merge pull request #3480 from tianon/gofmt
...
Run 'gofmt -s -w'
2014-01-07 06:41:23 -08:00
lukaspustina
2b93f18223
Missing pipe in line 85
2014-01-07 15:20:38 +01:00
Tianon Gravi
8f3b8f3835
Run 'gofmt -s -w'
2014-01-06 22:14:35 -07:00
Michael Crosby
fca83b4cfb
Merge pull request #3477 from creack/fix_tar_leaks
...
Make CopyFileWithTar use a pipe instead of a buffer. Save more than 1Gb of ram for a 500Mb file.
2014-01-06 18:04:44 -08:00
Guillaume J. Charmes
444a087ac2
Make CopyFileWithTar use a pipe instead of a buffer. Save more than 1Gb of ram for a 500Mb file.
2014-01-06 17:44:22 -08:00
Victor Vieux
e1c861cf33
Update REMOTE_TODO.md
2014-01-06 17:37:30 -08:00
Nick Stinemates
6fe3da9924
Remove the @github handle as it generates emails.
2014-01-06 17:21:14 -08:00
Andy Rothfusz
f43f3fa218
Merge pull request #3473 from dhrp/docs-version-warning-fix
...
[docs] Fix for wrong version warning on master instead of latest.
2014-01-06 16:26:04 -08:00
Thatcher Peskens
1e551c7cc5
[docs] Fix for wrong version warning on master instead of latest.
2014-01-06 16:18:00 -08:00
Michael Crosby
2c395ce8fb
Merge pull request #3328 from shykes/pkg-iptables
...
Move utility package 'iptables' to pkg/iptables
2014-01-06 15:54:07 -08:00
Solomon Hykes
7799ae27ca
Move utility package 'iptables' to pkg/iptables
2014-01-06 15:41:24 -08:00
Michael Crosby
bb754fd34d
Merge pull request #3388 from tianon/more-build-tests
...
Add more TestBuild Dockerfiles, especially for 'echo shebang' testing
2014-01-06 15:14:30 -08:00
Victor Vieux
a0298c0bd0
Merge pull request #3420 from RoelVanNyen/getfullname
...
Cleanup: runtime.getFullName is deprecated by getFullName
2014-01-06 13:59:04 -08:00
Victor Vieux
a86a82cb7e
Merge pull request #3384 from tianon/fix-load-help
...
Fix "docker load" help by removing "SOURCE" prompt and mentioning STDIN
2014-01-06 13:30:16 -08:00
Nick Stinemates
36ab1836f9
Fix dotCloud to Docker, Inc
2014-01-06 12:26:53 -08:00
shin-
5e8912e0e8
Fixed registry unit tests
2014-01-06 21:04:44 +01:00
Victor Vieux
4e414f6205
Merge pull request #3377 from cpuguy83/3333-fix_-H_default
...
Make blank -H option default to the same as no -H was sent
2014-01-06 11:30:27 -08:00
Michael Crosby
4f31141e13
Merge pull request #3310 from pnasrat/cgroups-subpackage
...
Extract cgroups utilities to own submodule.
2014-01-06 11:27:29 -08:00
Victor Vieux
82531f7168
fix error on docker wait
2014-01-06 11:11:04 -08:00
Michael Crosby
ee6823d797
Merge pull request #3297 from jaseg/master
...
Return meaningful error for meaningless Dockerfiles
2014-01-06 10:58:24 -08:00
Michael Crosby
1363dfdd1d
Merge pull request #3426 from bcbcarl/3425-upgrade_vbox_guest_additions
...
Upgrade VBox Guest Additions (Fix #3425 )
2014-01-06 10:39:26 -08:00
Joe Beda
b308e33106
Tweak formatting for GCE instructions
2014-01-06 10:35:51 -08:00
Victor Vieux
e5b09523dc
Merge pull request #3367 from cpuguy83/3362-unify_cmd_entrypoint_handling
...
Use same error handling while unmarshalling args for CMD and ENTRYPOINT
2014-01-06 10:29:37 -08:00
Victor Vieux
d44abae873
Merge pull request #3441 from RoelVanNyen/container_start
...
Just pass the container in RegisterLinks(), no need to lookup by name
2014-01-06 10:19:01 -08:00
Brian Goff
323c4b5211
Use same error handling while unmarshalling args for CMD and ENTRYPOINT
2014-01-06 13:15:14 -05:00
Michael Crosby
5b4a0cac4e
Merge pull request #3335 from vieux/remote_todo
...
add REMOTE_TODO
2014-01-06 10:12:08 -08:00
Victor Vieux
73294b6d56
Merge pull request #3455 from crigor/fix-pull-message
...
Fix login message to say pull instead of push.
2014-01-06 10:02:32 -08:00
David Mcanulty
d6ca05f7cb
Simplified and streamlined Amazon Quickstart
...
The amazon quickstart images are EBS backed and include cloudinit. I've personally tested these documentation changes as a new user to Docker.
2014-01-06 09:53:58 -08:00
Victor Vieux
dfc2dc4d35
Merge pull request #3445 from dotcloud/merge_release_v0.7.3
...
Merge release v0.7.3
2014-01-06 09:51:41 -08:00
David Mcanulty
fc559d9992
Fixed error in group add example
...
There is no ${USERNAME} in bash, only ${USER}
2014-01-06 09:29:56 -08:00
Joe Beda
ea762c1a51
Update instructions for mtu flag for Docker on GCE
2014-01-06 09:29:33 -08:00
Christopher Rigor
599009191a
Fix login message to say pull instead of push.
2014-01-05 17:07:16 +08:00
Tianon Gravi
af50b2f17c
Merge pull request #3454 from sudosurootdev/master
...
Fix spelling error in hack/make.sh comment
2014-01-04 20:24:48 -08:00
sudosurootdev
2a1181f404
Spelling error.
2014-01-04 23:15:15 -05:00
Tianon Gravi
f7afbf34fe
Merge pull request #3448 from tmahesh/patch-1
...
Changelog date typo fix: 2013-01-02 -> 2014-01-02
2014-01-04 08:21:48 -08:00
Mahesh Tiyyagura
3069bf9460
Changelog date typo fix: 2013-01-02 -> 2014-01-02
2014-01-04 11:24:48 +05:30
Tianon Gravi
32b9a429c5
Change version to 0.7.3-dev
2014-01-03 17:02:59 -07:00
Tianon Gravi
76910d16cc
Merge pull request #3439 from dotcloud/bump_v0.7.3
...
Bump v0.7.3
2014-01-03 16:01:56 -08:00
Roel Van Nyen
42c7dc448f
Just pass the container in RegisterLinks(), no need to lookup by name again
2014-01-03 15:49:39 +01:00
Tianon Gravi
8502ad4ba7
Bump version to v0.7.3
2014-01-02 21:19:19 -07:00
Andy Rothfusz
58ec7855bc
substantial spelling fix
2014-01-02 16:46:50 -08:00
Andy Rothfusz
949fde88df
Merge pull request #3437 from jamtur01/faqhere
...
Fixed duplicate here references in FAQ
2014-01-02 16:44:38 -08:00
James Turnbull
5a9f45cb7a
Fixed duplicate here references in FAQ
2014-01-02 19:40:19 -05:00
Andy Rothfusz
8f4a54734f
Merge pull request #3428 from jamtur01/port1.8
...
Added some 1.7 API updates that were missing from 1.8
2014-01-02 16:34:56 -08:00
Andy Rothfusz
9359d79c4f
Merge pull request #3389 from SvenDowideit/3366-simplify-volumes-documentation
...
simplify the volumes documentation and mention more details
2014-01-02 16:29:09 -08:00
James Turnbull
69db6ea867
Added some 1.7 API updates that were missing from 1.8
2014-01-02 19:27:59 -05:00
Andy Rothfusz
3b89187d03
Merge pull request #3409 from Chris00/patch-1
...
Mention lxc-checkconfig
2014-01-02 16:20:30 -08:00
Andy Rothfusz
82a47b0e82
Keep original transcript in Thatcher's voice
...
and clarify that this is an update to the example.
2014-01-02 16:17:52 -08:00
Andy Rothfusz
e0f07bc186
Merge pull request #3399 from rgstephens/patch-1
...
Update for Ubuntu 13.10
2014-01-02 16:14:47 -08:00
Guillaume J. Charmes
194eb246ef
Merge pull request #3353 from creack/improve_add_cache
...
Improve add cache
2014-01-02 16:07:33 -08:00
Tzu-Jung Lee
f560b87a86
Fix #3149 : port mapping of TCP + UDP
...
Signed-off-by: Tzu-Jung Lee <roylee17@gmail.com >
2014-01-02 16:01:04 -08:00
Paul Nasrat
c561212b83
Extract cgroups utilities to own submodule.
...
Use mountinfo rather than for cgroups parsing.
Make helper method private and change name.
Makes method naming more explicit rather than GetThisCgroup.
Use upstream term subsystem rather than cgroupType.
2014-01-02 17:54:57 -05:00
Michael Crosby
81e596e272
Merge pull request #3287 from vieux/fix_progressbar_display_push
...
fix progressbar in docker push
2014-01-02 13:38:11 -08:00
Tianon Gravi
acfdfa81be
Merge pull request #3427 from tianon/stub-deb-init-config
...
Add stubbed and commented "/etc/default/docker" to our deb package
2014-01-02 09:44:36 -08:00
shin-
589515c717
Check standalone header when pinging a registry server. Standalone has to be true to use basic auth (in addition to previous requirements)
2014-01-02 17:51:42 +01:00
Lokesh Mandvekar
523f726716
install instructions use unprefixed fedora image
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2014-01-02 11:29:24 -05:00
Tianon Gravi
7fd6dcc831
Add stubbed and commented "/etc/default/docker" to our deb package
...
This is to especially fix FPM 1.0+ complaining that we told it we have an /etc/default/docker "config file", but didn't actually include one.
2014-01-01 22:34:22 -07:00
Carl X. Su
848f290012
Upgrade VBox Guest Additions ( Fix #3425 )
2014-01-02 12:56:29 +08:00
James Turnbull
add97f7eb0
Merge pull request #3419 from newzealandpaul/master
...
Mac OS X command in docs for pip fixed
2014-01-01 20:27:38 -08:00
Roel Van Nyen
9dd7ae4074
Cleanup: runtime.getFullName is deprecated by getFullName
2014-01-02 00:06:50 +01:00
Tianon Gravi
5f55784224
Merge pull request #3374 from tianon/fpm-license-vendor
...
Replace FPM --vendor with --license, and give it the proper value of "Apache-2.0"
2014-01-01 14:42:47 -08:00
Paul
f3816ee024
Mac OSX command for pip was incorrect
2014-01-02 09:52:07 +13:00
Christophe Troestler
0b3e153588
Implement suggestions
2014-01-01 12:28:22 +01:00
Christophe Troestler
2226989410
Mention lxc-checkconfig
...
This is important because the list below is not complete when one build one's own kernel. Plus it is more robust in the face of changes.
2014-01-01 00:59:47 +01:00
Tianon Gravi
c23b15b9d8
Merge pull request #3398 from thomasleveil/bash_completion_names
...
support for container names in bash completion
2013-12-31 08:28:21 -08:00
Thomas LEVEIL
055b32e3f4
support for container names in bash completion
2013-12-31 11:34:23 +00:00
Michael Crosby
907d9ce13c
Merge pull request #3355 from creack/fix_build_exit
...
Exit with code 1 in case of error for `docker build`
2013-12-30 22:14:01 -08:00
Tianon Gravi
74d45789dd
Merge pull request #3379 from tianon/organize-contrib-syntax
...
Reorganize the syntax highlighting files in contrib under a common directory
2013-12-30 21:57:19 -08:00
Tianon Gravi
40522c0380
Merge pull request #3392 from tianon/fix-install-failure
...
Fix install failure when busybox can't be downloaded
2013-12-30 20:04:30 -08:00
Tianon Gravi
d5bb0ff80a
Merge pull request #3401 from odonnellryan/patch-1
...
Swap "grep -q" with "grep > /dev/null" so that "go help" doesn't balk when the pipe closes unexpectedly (since "grep -q" closes the pipe the second it finds a match)
2013-12-30 18:44:23 -08:00
Ryan O'Donnell
ad80da3389
Fixes Issue #3400
...
See Issue #3400
2013-12-30 20:58:25 -05:00
rgstephens
1f80c2a652
Update for Ubuntu 13.10
...
With two additional commands, this procedure will work for Ubuntu 13.10 using the image stackbrew/ubuntu:13.10.
1) change /etc/pam.d/sshd, pam_loginuid line 'required' to 'optional'
2) echo LANG=\"en_US.UTF-8\" > /etc/default/locale
2013-12-30 17:50:58 -08:00
Andy Rothfusz
1bc3f6b7b5
Merge pull request #3303 from crosbymichael/add-host-flag
...
Add DOCKER_HOST env var for client
2013-12-30 15:54:37 -08:00
Andy Rothfusz
643621133f
Merge pull request #3395 from jamtur01/basicsfixes
...
Minor fixes to the basic command documentation
2013-12-30 15:41:59 -08:00
Sven Dowideit
fd240413ff
simplify the volumes documentation and mention more details
2013-12-31 09:09:57 +10:00
Solomon Hykes
392b1e99b2
Merge pull request #3344 from tianon/dockerfile-cleanup
...
Many various Dockerfile cleanups
2013-12-30 11:26:13 -08:00
James Turnbull
0dfebf2d93
Minor fixes to the basic command documentation
2013-12-30 13:57:11 -05:00
Andy Rothfusz
40aaebe56a
Merge pull request #3394 from jamtur01/clifixes
...
Numerous small fixes to the CLI documentation
2013-12-30 10:56:47 -08:00
James Turnbull
a1dba16fe8
Numerous small fixes to the CLI documentation
2013-12-30 13:48:12 -05:00
Andy Rothfusz
e31f1f1eba
Merge pull request #3371 from Grunny/volumes-typo-fix
...
Fix typo in working with volumes doc page
2013-12-30 10:35:09 -08:00
Andy Rothfusz
7e720d0a77
Merge pull request #3312 from DeX77/master
...
Installation for FrugalWare
2013-12-30 10:34:39 -08:00
Andy Rothfusz
237868e9c3
Merge pull request #3380 from SvenDowideit/add-no-auth-note
...
add a simple note to suggest to the user to use RUN curl/wget/tool if the URL they need is behind auth
2013-12-30 10:00:51 -08:00
Tianon Gravi
fc197188d7
Fix install failure when busybox can't be downloaded
...
Whether or not the "busybox" image downloads and runs properly at the end of the build, we don't want to have the script return a failing exit code, especially since at that point, Docker is successfully installed, and we're just tooting our own horn for good measure.
2013-12-30 08:38:43 -07:00
Thatcher
d59080d119
Merge pull request #3386 from bwiklund/headerfix
...
Fixed header image on docs.docker.io site
2013-12-30 06:48:02 -08:00
Tianon Gravi
c6dcee329d
Add more TestBuild Dockerfiles, especially for making sure manual RUN echo '#!...' continues to work correctly
2013-12-30 00:10:48 -07:00
Tianon Gravi
484a75f354
Update Dockerfile to use stackbrew/ubuntu (until it graduates), update Dockerfile MAINTAINER line, coalesce all apt-get installs into one invocation (including s3cmd by bringing in backports)
2013-12-29 23:27:01 -07:00
Ben Wiklund
434cf6c8ca
fixed header size on narrow desktop window
2013-12-29 19:22:52 -08:00
Tianon Gravi
83d631b6a4
Fix "docker load" help by removing "SOURCE" prompt and mentioning STDIN
...
Fixes #3383
2013-12-29 13:25:57 -07:00
Brian Goff
8b82b0dfe7
Make blank -H option default to the same as no -H was sent
2013-12-29 14:36:46 -05:00
Sven Dowideit
e93b7b4647
add a simple note to suggest to the user to use RUN curl/wget/tool if the URL they need is behind auth
2013-12-29 21:27:59 +10:00
Tianon Gravi
06a818616b
Reorganize the syntax highlighting files in contrib under a common directory to match "contrib/init" and "contrib/completion"
...
This is split off from #2970 .
2013-12-29 01:46:00 -07:00
Michael Crosby
f50b8b08b5
Add DOCKER_HOST env var for client
...
This env var will set the -H flag on the docker
client.
2013-12-28 16:42:18 -08:00
Tianon Gravi
cda146547e
Replace FPM --vendor with --license, and give it the proper value of "Apache-2.0"
...
Fixes #3372
2013-12-28 06:35:00 -07:00
grunny
a17fd7b294
Fix typo in working with volumes doc page
2013-12-28 20:22:46 +10:00
Tianon Gravi
22162687df
Merge pull request #3358 from asbjornenge/master
...
Apply automatically to files named 'Dockerfile'
2013-12-27 08:22:52 -08:00
Daniel Exner
d256f3049b
* s/docker/Docker/
2013-12-27 11:55:57 +01:00
Asbjørn Enge
a1a4a99d7e
Apply automatically to files named 'Dockerfile'
2013-12-27 10:05:25 +01:00
Guillaume J. Charmes
4986958e7e
Exit with code 1 in case of error for docker build
2013-12-26 17:49:41 -08:00
Guillaume J. Charmes
cd735496da
Hash the sums for directory (ureadable when there is too many
2013-12-26 16:42:05 -08:00
Guillaume J. Charmes
894d4a23fb
Change BuildFile in order to use TarSum instead of custom checksum
2013-12-26 16:16:26 -08:00
Guillaume J. Charmes
fc9f4d8bad
Log files name along with their checksum in TarSum + add a Method to retrieve the checksum map
2013-12-26 16:01:36 -08:00
Guillaume J. Charmes
1d4b7d8fa1
Make sure the cache lookup returns always the same result
2013-12-26 15:43:27 -08:00
Guillaume J. Charmes
360078d761
Remove old debug from tarsum
2013-12-26 15:39:06 -08:00
Guillaume J. Charmes
808f2d39bd
Merge pull request #3343 from bwiklund/comment-edits
...
small batch of edits/corrections to comments
2013-12-26 10:22:33 -08:00
Guillaume J. Charmes
d1ca12e81b
Merge pull request #3347 from smarterclayton/patch-1
...
Fix typo in devmapper error message
2013-12-26 10:19:55 -08:00
Guillaume J. Charmes
a042c9fb1b
Merge pull request #3348 from manuel-woelker/document-name-param-in-remote-api
...
Document "name" query parameter for "POST /containers/create" in Remote API v1.8
2013-12-26 10:19:42 -08:00
Manuel Woelker
721bb410f6
Document "name" query parameter for "POST /containers/create" in Remote API v1.8
2013-12-26 06:43:26 +01:00
Clayton Coleman
029625981d
Fix typo in devmapper error message
2013-12-25 15:49:58 -05:00
Ben Wiklund
0fccf0f686
small batch of edits/corrections to comments
2013-12-24 16:40:14 -08:00
Guillaume J. Charmes
efaf2cac5c
Merge pull request #2809 from graydon/880-cache-ADD-commands-in-dockerfiles
...
Issue #880 - cache ADD commands in dockerfiles
2013-12-24 16:22:51 -08:00
Guillaume J. Charmes
cb1fe939a8
Merge pull request #3337 from tianon/release-darwin
...
Release tgz and binaries for cross-compiled platforms
2013-12-24 14:44:41 -08:00
Andy Rothfusz
c654aea4f2
Merge pull request #3340 from jamtur01/apiport
...
Fixed #3039 - Added clarification on port options in API
2013-12-24 14:34:13 -08:00
James Turnbull
d2d8a4a6c5
Fixed #3039 - Added clarify on port options in API
2013-12-24 13:01:59 -05:00
Tianon Gravi
4100e9b7df
Update cross and tgz to play nicely together (creating a tgz for each supported OS/ARCH), and update release.sh to upload binaries and tgz files for all the supported OS/ARCH combos
2013-12-23 23:55:06 -07:00
Tianon Gravi
5875953d9b
Merge pull request #3112 from shawnl/master
...
hack/PACKAGERS.md: libdevmapper
2013-12-23 19:24:36 -08:00
Victor Vieux
3264c1c5eb
add REMOTE_TODO
2013-12-23 19:01:10 -08:00
Tianon Gravi
f4ce106e02
Merge pull request #3318 from sugi/mkimage-deb-fix-cache-glob
...
Fix glob expansion on mkimage-debootstrap
2013-12-23 17:20:41 -08:00
Victor Vieux
7ec1236cee
Merge pull request #3324 from roylee17/enhance-docker-top-err-msg
...
docker-top: improve error message for non-running containers
2013-12-23 17:15:37 -08:00
Guillaume J. Charmes
2b4bb67ce0
Merge pull request #3327 from shykes/pkg-graphdb
...
Move utility package 'graphdb' to pkg/graphdb
2013-12-23 16:33:11 -08:00
Victor Vieux
6155f07561
Merge pull request #3331 from shykes/pkg-names
...
Move utility package 'namesgenerator' to pkg/namesgenerator
2013-12-23 16:15:26 -08:00
Victor Vieux
e6e35e5984
Merge pull request #3330 from shykes/pkg-term
...
Move utility package 'term' to pkg/term
2013-12-23 16:11:42 -08:00
Victor Vieux
0d207abf8e
Merge pull request #3329 from shykes/pkg-netlink
...
Move utility package 'netlink' to pkg/netlink
2013-12-23 16:08:07 -08:00
Solomon Hykes
a009d4ae8d
Move utility package 'namesgenerator' to pkg/namesgenerator
2013-12-23 23:45:18 +00:00
Victor Vieux
b75f385abd
Merge pull request #3304 from vieux/prevent_orphan_deletion
...
Prevent orphan in docker rmi
2013-12-23 15:44:46 -08:00
Solomon Hykes
7ce7516c12
Move utility package 'term' to pkg/term
2013-12-23 23:42:37 +00:00
Solomon Hykes
f6b91262a7
Move utility package 'netlink' to pkg/netlink
2013-12-23 23:39:39 +00:00
Solomon Hykes
d16d748132
Move utility package 'graphdb' to pkg/graphdb
2013-12-23 23:33:06 +00:00
Victor Vieux
3fc9de3d03
Merge pull request #3325 from shykes/pkg-systemd
...
Move utility package 'systemd' to pkg/systemd
2013-12-23 15:26:25 -08:00
Solomon Hykes
652c2c2a80
Add README to pkg
2013-12-23 23:12:19 +00:00
Solomon Hykes
8e7db0432e
Move utility package 'systemd' to pkg/systemd
2013-12-23 23:07:01 +00:00
Guillaume J. Charmes
e1a15b25dc
Merge pull request #3309 from apocas/master
...
Wrong HTTP method in events endpoint. (documentation)
2013-12-23 14:58:49 -08:00
Tzu-Jung Lee
b1a3a55802
docker-top: improve error message for non-running containers
...
Signed-off-by: Tzu-Jung Lee <roylee17@gmail.com >
2013-12-23 14:50:24 -08:00
apocas
614bc5c1e1
http method typo in documentation for events endpoint (all api versions)
2013-12-23 21:21:01 +00:00
Victor Vieux
3fe4d5477a
Merge pull request #3298 from creack/add_arch_user_agent
...
Add arch/os info to user agent (Registry)
2013-12-23 12:08:26 -08:00
Andy Rothfusz
cda24e345c
Merge pull request #3302 from briandorsey/master
...
Added a note about a networking work-around.
2013-12-23 11:25:20 -08:00
Andy Rothfusz
88037b2877
Merge pull request #3320 from jamtur01/privapi
...
API documentation update for Privileged
2013-12-23 11:22:47 -08:00
Andy Rothfusz
6cdd1aa350
Merge pull request #3321 from jamtur01/apiclean
...
Minor style cleanups to the API spec docs
2013-12-23 11:20:56 -08:00
James Turnbull
ea8a3438f7
Minor style cleanups to the API spec docs
2013-12-23 11:45:51 -05:00
Tianon Gravi
954158ce52
Merge pull request #2986 from SvenDowideit/still-need-privileged
...
still need -privileged to run a build / test
2013-12-23 07:58:17 -08:00
James Turnbull
bf17383e35
API documentation update for Privileged
...
The 1.7 API docs show the ability to pass Privileged
when creating a container. This is not supported as.
Privileged is now part of hostConfig and can only be
passed when starting a container.
This fixes the documentation issue.
2013-12-23 09:08:28 -05:00
Sven Dowideit
83d81758b0
use the Makefile - it makes life so much simpler
2013-12-23 23:46:52 +10:00
Tatsuki Sugiura
e3b878ce98
Fix glob expansion for no-cache setting.
...
On previous version, glob pattern will be expanded to actual file
names when writing setting to etc/apt/apt.conf.d/no-cache.
This patch fixes to quote to work cache clean command properly.
2013-12-23 17:27:22 +09:00
James Turnbull
1e5f9334e0
Merge pull request #3308 from crigor/patch-1
...
Change an to a
2013-12-21 15:12:50 -08:00
Daniel Exner
3edbf416bf
+ added missing link in index.rst
...
* some gramatic and spelling fixes
Thx jamtur :)
2013-12-22 00:00:20 +01:00
James Turnbull
c2364b978d
Merge pull request #3272 from SvenDowideit/more-complete-run-cmd-example
...
A more complete example of docker run.
2013-12-21 14:52:41 -08:00
Daniel Exner
158e3d60ec
Installation for FrugalWare
2013-12-21 23:38:13 +01:00
apocas
e4e579b40d
Wrong HTTP method in events endpoint.
2013-12-21 16:41:41 +00:00
Christopher Rigor
071528e103
Change an to a
2013-12-21 16:23:13 +08:00
Victor Vieux
a2fcd3d8f0
Merge pull request #3306 from roylee17/3224-fix-udp-cleanup
...
network: fix a typo in udp cleanup path
2013-12-21 00:03:07 -08:00
Tzu-Jung Lee
7d2e851d8e
network: fix a typo in udp cleanup path
...
Fix #3224 - Port already in use error when running a container
Signed-off-by: Tzu-Jung Lee <roylee17@gmail.com >
2013-12-20 17:54:54 -08:00
Victor Vieux
85f9b778f5
fix progressbar in docker push
2013-12-20 16:55:41 -08:00
Victor Vieux
369cde4ad7
discard test output
2013-12-20 16:50:31 -08:00
Victor Vieux
3ffc52bcf5
Merge branch 'test-container-orphaning' of https://github.com/gabrtv/docker into prevent_orphan_deletion
2013-12-20 16:27:33 -08:00
Victor Vieux
8dcca2125a
prevent orphan
2013-12-20 16:26:02 -08:00
Brian Dorsey
cdd14b1a31
Update MTU work-around to use the new -mtu flag
2013-12-20 16:19:35 -08:00
Brian Dorsey
37ed178611
Added a note about a networking work around.
...
An additional flag to limit the networking MTU is required in three Compute Engine zones for reliable networking from inside the docker container. Added a warning to that effect to the QuickStart guide.
2013-12-20 16:06:28 -08:00
Gabriel Monroy
c995c9bb91
add TestContainerOrphaning integration test
2013-12-20 16:52:34 -07:00
Michael Crosby
aa619de748
Merge pull request #3289 from crosbymichael/add-mtu-option
...
Allow mtu to be configured at daemon start
2013-12-20 13:21:56 -08:00
Michael Crosby
6fde28c293
Merge pull request #3300 from crosbymichael/fix-mountinfo-parsing
...
Only parse upto the mountpoint in mountinfo
2013-12-20 13:21:20 -08:00
Michael Crosby
f4358fc647
Merge pull request #3291 from dineshs-altiscale/3282-sparse-files
...
Add -S option to tar for efficient sparse file handling
2013-12-20 11:10:31 -08:00
Michael Crosby
57e19b1475
Merge pull request #3294 from discordianfish/3293-better-error-dockerfile-empty
...
Return error if Dockerfile is empty
2013-12-20 10:45:56 -08:00
Michael Crosby
8051b6c1a1
Only parse upto the mountpoint in mountinfo
2013-12-20 13:34:05 -05:00
Michael Crosby
566ff54d0d
Allow mtu to be configured at daemon start
2013-12-20 12:12:03 -05:00
Guillaume J. Charmes
f9359f59a8
Add dynamic os/arch detection to Images
2013-12-20 08:20:08 -08:00
Guillaume J. Charmes
e4561438f1
Add arch/os info to user agent (Registry)
2013-12-20 08:19:25 -08:00
jaseg
b8cd2bc94d
Return meaningful error for meaningless Dockerfiles
2013-12-20 16:19:21 +01:00
Johannes 'fish' Ziemke
f7ba1c34bb
Return error if Dockerfile is empty
2013-12-20 14:13:52 +01:00
Sven Dowideit
df87919165
make a more complete example of docker run, showing the use of most of the options ( Closes #1500 )
2013-12-20 20:06:07 +10:00
Dinesh Subhraveti
733bf5d3dd
Add -S option to tar for efficient sparse file handling
...
Fixes issue #3282
2013-12-19 21:41:22 -08:00
Andy Rothfusz
efde305c05
Merge pull request #3286 from pandrew/3279-documentation-docker-inspect
...
Update docs to include images for docker inspect
2013-12-19 14:50:55 -08:00
Guillaume J. Charmes
636dfc82b0
Merge pull request #3064 from tianon/custom-dockerinit-path
...
Allow custom dockerinit path
2013-12-19 14:31:41 -08:00
Victor Vieux
93abcc3a3b
Merge pull request #3273 from crosbymichael/set-mtu-in-dockerinit
...
Move MTU setting outside of lxc and set with netlink
2013-12-19 14:25:27 -08:00
Tianon Gravi
c3ec696284
Merge pull request #3244 from codeaholics/remove-apt-errors-during-build
...
Tidy up some of the error messages from apt during build
2013-12-19 13:28:56 -08:00
Michael Crosby
fdd81b423b
Merge pull request #3288 from tianon/makefile-maintainer
...
Add Tianon as Makefile maintainer
2013-12-19 13:26:52 -08:00
Tianon Gravi
cd89fe5c4f
Add Tianon as Makefile maintainer
2013-12-19 13:42:35 -07:00
Tianon Gravi
1636ed9826
Merge pull request #3283 from jpoimboe/update-vendor.sh
...
add gosqlite to vendor.sh
2013-12-19 12:37:25 -08:00
pandrew
8072d3a4e0
Update docs to include images for docker inspect
2013-12-19 20:55:19 +01:00
Josh Poimboeuf
d215724ad6
add gosqlite to vendor.sh
...
Add gosqlite and its latest revision to vendor.sh so that the vendor
directory can be reliably recreated.
2013-12-19 13:51:46 -06:00
Michael Crosby
0e6f0c4e02
Move MTU setting outside of lxc and set with netlink
2013-12-19 11:51:44 -08:00
Andy Rothfusz
629cc2fce4
Merge pull request #3284 from jamtur01/faqmore
...
Added some more items to the FAQ
2013-12-19 11:32:53 -08:00
James Turnbull
8c52140059
Added some more items to the FAQ
2013-12-19 14:27:47 -05:00
Victor Vieux
f21bd80e90
Merge pull request #3271 from crosbymichael/mount-outside
...
Perform docker specific mounts outside of lxc
2013-12-19 11:13:31 -08:00
Guillaume J. Charmes
4bdd4599f0
Merge pull request #3243 from alexlarsson/compressed-tar
...
Handle compressed tars in ApplyLayer
2013-12-19 11:02:32 -08:00
Michael Crosby
ed93dab9a8
Merge pull request #3276 from tianon/cross-compile
...
Add new "cross" bundle to cross-compile the Docker client
2013-12-19 10:41:12 -08:00
Tianon Gravi
62a81370ff
Add new "cross" bundle to cross-compile the Docker client for other platforms (currently just 32-bit and 64-bit OS X)
2013-12-19 11:33:49 -07:00
Guillaume J. Charmes
e74c65c3db
Merge pull request #3274 from tianon/tianon-dockerfile
...
Make Tianon the official root "Dockerfile" maintainer
2013-12-19 10:31:00 -08:00
Victor Vieux
248eadd341
Merge pull request #3277 from jpoimboe/fix-root-symlink
...
Move root symlink check to engine.New
2013-12-19 10:24:23 -08:00
Victor Vieux
e829d5b6d2
Merge pull request #3275 from crosbymichael/sqlite-import
...
Move sqlite conn to graph db for cross compile support
2013-12-19 10:18:30 -08:00
Michael Crosby
35d8ac94f3
Merge pull request #3270 from vreon/tree-box-drawing-characters
...
Use box-drawing characters in `docker images -tree`
2013-12-19 10:00:33 -08:00
Josh Poimboeuf
94821a3353
Move root symlink check to engine.New
...
Since commit c91c365
2013-12-19 00:39:12 -06:00
Jesse Dubay
d14c162fd6
Use box-drawing characters in docker images -tree
...
This makes the output of `docker images -tree` look a little prettier.
Previously it displayed a combination of box-drawing characters and pipe
characters, so the lines didn't quite connect...
Before:
└─aceb1e132fe5 Size: 487 MB (virtual 1.728 GB)
|─c5480c55e00a Size: 44.89 MB (virtual 1.773 GB)
| └─96c21b5e3c80 Size: 17.25 kB (virtual 1.773 GB)
| └─58f3f2293512 Size: 8.191 MB (virtual 1.782 GB)
After:
└─aceb1e132fe5 Size: 487 MB (virtual 1.728 GB)
├─c5480c55e00a Size: 44.89 MB (virtual 1.773 GB)
│ └─96c21b5e3c80 Size: 17.25 kB (virtual 1.773 GB)
│ └─58f3f2293512 Size: 8.191 MB (virtual 1.782 GB)
2013-12-18 22:30:21 -08:00
Tianon Gravi
14d1c5a2c3
Make Tianon the official root "Dockerfile" maintainer, since it's so hard-locked to hack changes most of the time
2013-12-18 22:29:48 -07:00
Michael Crosby
329d154209
Move sqlite conn to graph db for cross compile support
2013-12-18 21:14:16 -08:00
Michael Crosby
7bc96aec7b
Improve interface by moving to subpkg
...
Enable builds on OSX
2013-12-18 16:42:49 -08:00
Michael Crosby
a6fdc5d208
Fix unmount issues
2013-12-18 15:24:08 -08:00
Guillaume J. Charmes
681b40c801
Merge pull request #3268 from vieux/prevent_panic_volume
...
prevent a panic with docker run -v /
2013-12-18 14:06:44 -08:00
Victor Vieux
536da93380
prevent a panic with docker run -v /
2013-12-18 13:57:49 -08:00
Michael Crosby
45d7dcfea2
Handle external mounts outside of lxc
2013-12-18 13:46:02 -08:00
Guillaume J. Charmes
210fa0871c
Merge pull request #3267 from vieux/debug_daemon_start
...
add some debug to runtime.restore()
2013-12-18 13:45:22 -08:00
Victor Vieux
f768c6adb7
Merge pull request #3263 from tianon/abspath-root
...
Canonicalize our root path before we try using it
2013-12-18 11:41:47 -08:00
Victor Vieux
fde909ffb8
add some debug to runtime.restore()
2013-12-18 10:57:21 -08:00
Michael Crosby
553b4dae45
Merge pull request #3264 from creack/fix_osx_compilation
...
Fix osx compilation
2013-12-18 10:50:14 -08:00
Tianon Gravi
929662a4d5
Merge pull request #3266 from tianon/fix-integration-test-building
...
Add -a to our BUILDFLAGS directly, which fixes some fun test compilation issues
2013-12-18 10:37:55 -08:00
Tianon Gravi
fbac812540
Add -a to our BUILDFLAGS directly, which fixes some fun test compilation issues
...
Also, now that we use "-a", we no longer get any benefit from "go test -i", and it actually causes problems sometimes, so let's nuke it.
2013-12-18 11:32:25 -07:00
Guillaume J. Charmes
e481c82fa9
Fix OSX compilation for aufs
2013-12-18 10:18:49 -08:00
Guillaume J. Charmes
73a1ef7c22
Fix OSX build for sysinit
2013-12-18 10:16:48 -08:00
Tianon Gravi
c91c365f88
Canonicalize our root path before we try using it, because we make assumptions about it not containing symlinks
...
Fixes #3242
2013-12-18 11:15:09 -07:00
Alexander Larsson
b8a4f570fb
archive: Re-add XZ compression support
...
This shells out to the xz binary to support .tar.xz layers, as
there is no compression/xz support in go.
2013-12-18 10:50:22 +01:00
Michael Crosby
70c7220a99
Merge pull request #3128 from codeaholics/1530-improve-error-message
...
Improve error message when refusing to remove image due to multiple repo tags
2013-12-17 20:49:25 -08:00
Michael Crosby
0f45e3c6e0
Merge pull request #3205 from cddr/Vagrantfile-typos
...
Fix typos in Vagrantfile
2013-12-17 20:41:53 -08:00
Michael Crosby
be0beb897a
Merge pull request #3238 from tianon/go-build-a
...
Readd go build -a
2013-12-17 20:40:36 -08:00
Michael Crosby
8fa4c4b062
Merge pull request #3253 from titanous/update-container-name-validation
...
Update container name validation
2013-12-17 20:34:53 -08:00
Jonathan Rudenberg
c06ab5f9c2
Add container name validation test
2013-12-17 20:19:23 -05:00
Jonathan Rudenberg
3ec39ad01a
DRY up valid container name pattern usage
2013-12-17 20:17:50 -05:00
Jonathan Rudenberg
1940015824
Add '.' to valid container name pattern
2013-12-17 20:17:06 -05:00
Andy Rothfusz
1acefac97e
Merge pull request #3234 from creack/default_unix_path
...
Default unix path
2013-12-17 16:24:01 -08:00
Andy Rothfusz
f630fbc7cf
Merge pull request #3228 from maztaim/patch-1
...
Update binaries.rst
2013-12-17 13:10:08 -08:00
Andy Rothfusz
e61f327ec9
Merge pull request #3250 from vincentwoo/patch-1
...
Update docker_remote_api.rst to reflect that the latest remote API version is 1.8
2013-12-17 13:09:37 -08:00
Vincent Woo
c4444ce48f
Update docker_remote_api.rst to reflect that the latest remote API version is 1.8
2013-12-17 11:48:21 -08:00
Andy Rothfusz
7ba0f1f421
Merge pull request #3236 from dhrp/doc-master-warning
...
Added warning when browsing master. & no longer hides alternative versions
2013-12-17 11:17:17 -08:00
Andy Rothfusz
30454bb85c
Merge pull request #3249 from tianon/fix-sphinx-warning
...
Fix minor sphinx warning
2013-12-17 11:03:44 -08:00
Andy Rothfusz
2deb0c3365
Merge pull request #3248 from lsm5/docker-fedora-conflict
...
Docker fedora conflict
2013-12-17 11:01:37 -08:00
Thatcher Peskens
efc0610c0e
Removed unnessary span element from version floater and
...
Replaced social footer by the one from www.docker.io
2013-12-17 10:39:22 -08:00
Andy Rothfusz
391676b598
Merge pull request #3221 from jamtur01/introlink
...
Updated Introduction link
2013-12-17 10:36:00 -08:00
Guillaume J. Charmes
5204feeaa9
Merge pull request #3237 from tianon/hack-fix-cover-detection
...
Fix "go tool cover" detection to only add -cover and -coverprofile if we...
2013-12-17 10:09:40 -08:00
Tianon Gravi
81d112cb7f
Fix minor sphinx warning
2013-12-17 10:38:55 -07:00
Lokesh Mandvekar
25be0b1e98
Fedora first letter capitalize and misc. rewording
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-17 11:32:40 -06:00
Michael Crosby
c56b045270
Merge pull request #3239 from tianon/old-go-not-supported
...
Purge more hack references to Go 1.1.2
2013-12-17 09:08:42 -08:00
Guillaume J. Charmes
d9a1cc7e2b
Merge pull request #3168 from discordianfish/2464-replace-lxc-ps
...
Reimplement lxc-ps
2013-12-17 09:06:52 -08:00
Lokesh Mandvekar
30b4a0f76a
docker and docker-io conflict update for epel
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-17 10:56:31 -06:00
Lokesh Mandvekar
7d95145b76
update fedora doc: docker and docker-io conflict
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-17 10:33:52 -06:00
Guillaume J. Charmes
379a7fab07
Update docs
2013-12-17 07:55:36 -08:00
Danny Yates
36e060299f
Tidy up some of the error messages from apt during build
2013-12-17 13:50:37 +00:00
Alexander Larsson
a96a26c62f
Handle compressed tars in ApplyLayer
...
When pulling from a registry we get a compressed tar archive, so
we need to wrap the stream in the right kind of compress reader.
Unfortunately go doesn't have an Xz decompression method, but I
don't think any docker layers use that atm anyway.
2013-12-17 14:19:48 +01:00
Danny Yates
c3705e83e7
Improve error message when refusing to remove image due to multiple repo tags
2013-12-17 12:34:25 +00:00
Tianon Gravi
5e9b4a23e6
Purge more hack references to Go 1.1.2 (since it requires backported archive/tar patches now, and Go 1.2 is _widely_ packaged successfully)
2013-12-16 23:57:54 -07:00
Tianon Gravi
a1c5e276f4
Add "-a" back to our "go build"
2013-12-16 23:50:03 -07:00
Tianon Gravi
eddda577a4
Fix "go tool cover" detection to only add -cover and -coverprofile if we both have cover support in Go, and if we have the cover tool downloaded
2013-12-16 22:54:06 -07:00
Tianon Gravi
2ed1001c57
Allow packagers to specify a custom dockerinit lookup location via DOCKER_INITPATH in dynbinary
...
Only necessary if distro policy dictates that the path deviate from the paths already listed in utils/utils.go - please refrain from using it otherwise.
2013-12-16 22:29:08 -07:00
Tianon Gravi
f02d766f9a
Add dockerinit SHA1 and path to "docker info" when debug mode is enabled
2013-12-16 22:29:05 -07:00
Tianon Gravi
2035af44aa
Always copy dockerinit locally, regardless of whether our docker binary is static, because even it might get deleted or moved/renamed
2013-12-16 22:29:00 -07:00
Thatcher Peskens
746ae155fb
Added warning when browsing master. & no longer hides alternative versions.
2013-12-16 18:36:35 -08:00
Graydon Hoare
a26801c73f
Add CHANGELOG.md entry for ADD caching.
2013-12-16 17:38:16 -08:00
Graydon Hoare
670b326c1b
Add self to AUTHORS.
2013-12-16 17:36:51 -08:00
Graydon Hoare
15a6854119
Add testcases for ADD caching, closes #880 .
2013-12-16 17:36:51 -08:00
Graydon Hoare
3f9416b58d
Record added-tree sha256 in buildfile.CmdAdd, probe and use cache.
2013-12-16 17:36:51 -08:00
Graydon Hoare
7afd7a82bd
Factor cache-probing logic out of buildfile.commit() and CmdRun().
2013-12-16 17:36:50 -08:00
Michael Crosby
124da338fd
Merge pull request #3207 from alexlarsson/fix-applylayer
...
Re-enable TestApplyLayer and make it work
2013-12-16 16:55:48 -08:00
Guillaume J. Charmes
69a31c3386
Improve TestParseHost
2013-12-16 16:35:56 -08:00
Guillaume J. Charmes
20605eb310
Allow to use -H unix:// like -H tcp://
2013-12-16 16:30:23 -08:00
Thatcher
945a1f06f9
Merge pull request #3232 from dhrp/Full-width-documentation
...
Full width documentation
2013-12-16 15:56:39 -08:00
Michael Crosby
64136071c6
Change version to 0.7.2-dev
2013-12-16 15:43:46 -08:00
Guillaume J. Charmes
28b162eeb4
Merge pull request #3233 from crosbymichael/bump_0.7.2
...
Bump to 0.7.2
2013-12-16 15:06:42 -08:00
Michael Crosby
e960152a1e
Bump to v0.7.2
2013-12-16 14:50:07 -08:00
Thatcher Peskens
fe956ad449
Improvement upon @SvenDowideit suggestion to make the docs use full-width
...
Moved the style comments source to into the .less file
2013-12-16 14:37:56 -08:00
Guillaume J. Charmes
47375ddf54
Merge pull request #3230 from crosbymichael/allow-untag
...
Allow untag operations with no container validation
2013-12-16 14:34:56 -08:00
Michael Crosby
f0d6a91a1b
Merge pull request #3217 from SvenDowideit/deal-with-changing-paths-for-lxc-start
...
lxc-start-unconfined softlink can go bad
2013-12-16 13:38:03 -08:00
Michael Crosby
62213ee314
Allow untag operations with no container validation
2013-12-16 13:29:43 -08:00
Thatcher Peskens
fa48f17493
Merge branch 'use-complete-width-of-browser-for-docs' of github.com:SvenDowideit/docker into SvenDowideit-use-complete-width-of-browser-for-docs
2013-12-16 13:08:00 -08:00
Guillaume J. Charmes
41d972baf1
Merge pull request #3219 from unclejack/vagrant_fix_version_check
...
install vbox guest additions if the latest aren't already installed
2013-12-16 12:49:32 -08:00
Guillaume J. Charmes
b3ad330782
Merge pull request #3099 from vieux/fix_pull_build
...
added authConfig to docker build
2013-12-16 10:53:10 -08:00
Tim Bosse
6721525068
Update binaries.rst
...
Along with the kernel requirement, you need a working copy of lxc. When trying to start using "/docker -d", received error 'initapi: exec: "lxc-start": executable file not found in $PATH'
2013-12-16 12:04:29 -05:00
Johannes 'fish' Ziemke
5cfcb05486
Fix and re-enable TestGetContainersTop
2013-12-16 16:01:55 +01:00
Alexander Larsson
78c22c24b3
ApplyLayer: Fix TestLookupImage
...
The TestLookupImage test seems to use a layer that contains
/etc/postgres/postgres.conf, but not e.g. /etc/postgres.
To handle this we ensure that the parent directory always
exists, and if not we create it.
2013-12-16 14:35:43 +01:00
Johannes 'fish' Ziemke
4faba4fae7
Reimplement lxc-ps
...
Instead of calling lxc-ps in top endpoint, we reimplement it by
calling ps and filter for pids running in a given container.
2013-12-16 13:30:35 +01:00
Sven Dowideit
e1efd4cb8c
please, don't use 30% of the screen for whitespace, and thus compress the examples so they are ~80 chars wide - the output of 'docker ps' and 'docker images' becomes needlessly unreadable
2013-12-16 13:24:35 +10:00
Tianon Gravi
606cacdca0
Merge pull request #3222 from gurjeet/zfs_driver_owner
...
Update readme to mark ZFS driver as Alpha quality.
2013-12-15 07:09:00 -08:00
Gurjeet Singh
d526038503
Update readme to mark ZFS driver as Alpha quality.
2013-12-15 09:17:16 -05:00
James Turnbull
58daccab26
Updated Introduction link
...
Previously the introduction link pointed to www.docker.io. That
did not seem to make a lot of sense to me so instead I pointed it
at:
http://www.docker.io/learn_more/
2013-12-15 03:13:41 -05:00
unclejack
12fb508262
install vbox guest additions if not latest
2013-12-14 16:00:52 +02:00
Sven Dowideit
0a3eedd4c9
when sharing a /var/lib/docker dir with more than one distribution, an existing lxc-start-unconfined softlink may point to a non-existant path, following that link (as Stat does) will cause the daemon to fail to start
2013-12-14 15:29:08 +10:00
Guillaume J. Charmes
a6928e70ac
Merge pull request #3197 from ajhager/3138-names
...
Validate container names on creation. Fixes #3138
2013-12-13 17:28:36 -08:00
Guillaume J. Charmes
20197385b2
Merge pull request #3173 from vieux/docker_info_job
...
Move info to job
2013-12-13 17:27:59 -08:00
Victor Vieux
85b9338205
add GetenvInt64 ans SetenvInt64
2013-12-13 16:29:22 -08:00
Victor Vieux
51e2c1794b
move docker info to the job api
2013-12-13 16:15:15 -08:00
Guillaume J. Charmes
20899cdb34
Merge pull request #3183 from vieux/job_commit
...
Move commit to job
2013-12-13 16:11:58 -08:00
Guillaume J. Charmes
f5ab2516d8
Merge pull request #2897 from crosbymichael/aufs-42
...
Increase max image depth to 127
2013-12-13 16:03:57 -08:00
Victor Vieux
d5f5ecb658
improve GetenvJson
2013-12-13 16:02:19 -08:00
Victor Vieux
4b5ceb0f24
use args
2013-12-13 14:29:27 -08:00
Andy Rothfusz
906b481148
Merge pull request #3213 from metalivedev/1695-dockerlogs
...
Add more information about Docker logging
2013-12-13 14:29:14 -08:00
Victor Vieux
930ec9f52c
move commit to job
2013-12-13 14:19:56 -08:00
Guillaume J. Charmes
aaa1c48d24
Merge pull request #3175 from vieux/engine-job-stop
...
Move stop to job
2013-12-13 14:15:58 -08:00
Victor Vieux
d7123a597f
Merge pull request #3214 from dotcloud/shykes_maintainer
...
Temporarily remove @shykes from engine/MAINTAINERS
2013-12-13 14:03:08 -08:00
Guillaume J. Charmes
9a9ecda7c8
Merge pull request #3208 from WarheadsSE/bridgeip
...
Add -bip flag: allow specification of dynamic bridge IP via CIDR
2013-12-13 13:56:35 -08:00
Guillaume J. Charmes
071338172c
Merge pull request #3187 from vieux/resize_job
...
Move resize to job
2013-12-13 13:55:23 -08:00
Victor Vieux
4975c1b549
Temporarily remve @shykes from engine/MAINTAINERS
2013-12-13 13:51:20 -08:00
Victor Vieux
73e8a39ff2
move resize to job
2013-12-13 13:15:39 -08:00
Victor Vieux
847cf5b599
Merge branch 'master' of https://github.com/dotcloud/docker
2013-12-13 13:15:22 -08:00
Michael Crosby
bf91636558
Merge pull request #3210 from rsampaio/fix_bridge_creation_3141
...
Bridge creation when ipv6 is not enabled
2013-12-13 12:03:55 -08:00
Andy Rothfusz
1e85aabf71
Fix #1695 by adding more about logging.
2013-12-13 11:42:58 -08:00
Michael Crosby
4fe0a9b6a0
Merge pull request #3211 from tianon/hack-make-cover
...
Add new cover bundlescript for giving a nice report across all the coverprofiles
2013-12-13 11:17:03 -08:00
Joseph Hager
f63cdf0260
Validate container names on creation. Fixes #3138
...
Move valid container name regex to the top of the file
Added hyphen as a valid rune in container names.
Remove group in valid container name regex.
2013-12-13 14:14:05 -05:00
Victor Vieux
9fb1ba97b1
Merge branch 'master' of https://github.com/dotcloud/docker
2013-12-13 11:06:20 -08:00
Tianon Gravi
59dc2876a7
Add new cover bundlescript for giving a nice report across all the coverprofiles generated by the test scripts
2013-12-13 11:59:54 -07:00
Tianon Gravi
23ab0af2ff
Merge pull request #3132 from tianon/hack-separate-integration
...
Separate Integration Tests
2013-12-13 10:55:49 -08:00
Victor Vieux
b8a16b3459
Merge pull request #3194 from tianon/tianon-hack-maintainer
...
Make Tianon the hack maintainer
2013-12-13 10:55:07 -08:00
Rodrigo Vaz
a530b8d981
fix #3141 Bridge creation when ipv6 is not enabled
2013-12-13 16:39:49 -02:00
Victor Vieux
89beb55c32
Merge branch 'master' of https://github.com/dotcloud/docker
2013-12-13 10:38:26 -08:00
Victor Vieux
f9328ad9cc
Merge pull request #3201 from jpoimboe/libvirt-prereq-network
...
Set hostname and IP address from dockerinit
2013-12-13 10:38:17 -08:00
Victor Vieux
20759c3ef7
Merge branch 'libvirt-prereq-network' of https://github.com/jpoimboe/docker
2013-12-13 10:34:09 -08:00
Victor Vieux
5d81776714
Merge pull request #3202 from jpoimboe/libvirt-prereq-env
...
dockerinit: propagate "container" env variable from lxc
2013-12-13 10:32:17 -08:00
Tianon Gravi
0ef1ff91cb
Merge pull request #3151 from tianon/more-debootstrap-tweaks
...
Update mkimage-debootstrap with even more tweaks for keeping images tiny...
2013-12-13 09:28:11 -08:00
WarheadsSE
a68d7f3d70
Add -bip flag: allow specification of dynamic bridge IP via CIDR
...
e.g.:
```
docker -d -bip "10.10.0.1/16"
```
If set and valid, use provided in place of trial and error from pre-defined array in network.go.
Mutually exclusive of -b option.
2013-12-13 10:47:19 -05:00
Alexander Larsson
a8af12f80a
Re-enable TestApplyLayer
...
With the previous two changes we now pass this test.
2013-12-13 15:50:25 +01:00
Alexander Larsson
10cd902f90
Fix change detection when applying tar layers
...
The default gnu tar format has no sub-second precision mtime support,
and the golang tar writer currently doesn't support that either.
This means if we export the changes from a container we will not
get zeron in the sub-second precision field when the change is applied.
This means we can't compare that to the original without getting a
spurious change. So, we detect this case by treating a case where the
seconds match and either of the two nanoseconds are zero as equal.
2013-12-13 15:46:41 +01:00
Alexander Larsson
818c249bae
archive: Implement ApplyLayer directly
...
Rather than calling out to tar we use the golang tar parser
to directly extract the tar files. This has two major advantages:
1) We're able to replace an existing directory with a file in the
new layer. This currently breaks with the external tar, since
it refuses to recursively remove the destination directory in
this case, and there are no options to make it do that.
2) We avoid extracting the whiteout files just to later remove them.
2013-12-13 15:43:50 +01:00
Tianon Gravi
5a89c6f6df
Merge pull request #3192 from unclejack/update_virtualbox_guest_additions
...
vagrant: update & verify virtualbox guest tools
2013-12-12 21:22:29 -08:00
Andy Chambers
2e6dbe87ad
Fix typos in Vagrantfile
2013-12-13 00:09:05 -05:00
Josh Poimboeuf
e877294321
dockerinit: propagate "container" env variable from lxc
...
Lxc (and libvirt) already set the "container" env variable
appropriately[1], so just use that.
[1] http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface/
2013-12-12 20:08:58 -06:00
Josh Poimboeuf
ecc51cd465
dockerinit: set IP address
...
Set the IP address in dockerinit instead of lxc utils, to prepare for
using libvirt-lxc.
2013-12-12 19:57:11 -06:00
Josh Poimboeuf
f7c7f7978c
dockerinit: set hostname
...
Set the hostname in dockerinit instead of with lxc utils. libvirt-lxc
doesn't have a way to do this, so do it in a common place.
2013-12-12 19:56:05 -06:00
Michael Crosby
8224e13bd2
Merge pull request #3185 from vieux/job_tag
...
Move tag to job
2013-12-12 17:02:39 -08:00
Guillaume J. Charmes
912bf8ff92
Merge pull request #3015 from jpoimboe/dockerinit-libvirt-prereqs
...
dockerinit: drop capabilities
2013-12-12 15:49:21 -08:00
Victor Vieux
e43ff2f6f2
move tag to job
2013-12-12 11:52:11 -08:00
Josh Poimboeuf
b8f1c73705
dockerinit: drop capabilities
...
Drop capabilities in dockerinit instead of with lxc utils, since
libvirt-lxc doesn't support it.
This will also be needed for machine container mode, since dockerinit
needs CAP_SYS_ADMIN to setup /dev/console correctly.
2013-12-12 13:47:24 -06:00
Josh Poimboeuf
1572989201
dockerinit: refactor error handling
2013-12-12 13:47:24 -06:00
Josh Poimboeuf
bd02d6e662
dockerinit: put args in a struct
2013-12-12 13:47:23 -06:00
Andy Rothfusz
2d1f61ef0e
Merge pull request #3190 from zain/master
...
Small typo fixes
2013-12-12 11:25:11 -08:00
Andy Rothfusz
54df95f26c
Merge pull request #3189 from aknikitin/patch-1
...
Minor spelling fix
2013-12-12 11:24:45 -08:00
Guillaume J. Charmes
5b33ae5971
Merge pull request #3145 from vieux/fix_docker_images
...
multiple fixed in docker images
2013-12-12 11:17:19 -08:00
Tianon Gravi
0db1c60542
Make Tianon the hack maintainer
2013-12-12 11:25:30 -07:00
unclejack
f216448c82
vagrant: update & verify virtualbox guest tools
2013-12-12 13:03:33 +02:00
Zain Memon
f26a9d456c
Small typo fixes
2013-12-12 01:23:16 -08:00
Anton Nikitin
bf5b949ffc
Minor spelling fix
2013-12-12 01:09:24 -05:00
Victor Vieux
621523a041
Merge pull request #3184 from creack/fix-volumes-on-host
...
Fix volumes on host
2013-12-11 18:06:25 -08:00
Guillaume J. Charmes
8fd9633a6b
Improve FollowLink to handle recursive link and be more strick
2013-12-11 17:19:02 -08:00
Victor Vieux
1124261158
Merge pull request #3144 from codeaholics/643-stale-nfs-handle
...
Prevent deletion of image if ANY container is depending on it; not just running containers
2013-12-11 17:18:54 -08:00
Andy Rothfusz
b722f809e7
Merge pull request #3181 from lsm5/rhel-docs-typos
...
Rhel docs typos
2013-12-11 16:37:24 -08:00
Michael Crosby
f396c42cad
Fix volumes on the host by following symlinks in a scope
2013-12-11 16:31:02 -08:00
Lokesh Mandvekar
8874f2aef9
keeping rhel page sorta in sync with fedora
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-11 18:26:17 -06:00
Lokesh Mandvekar
e8ec3dba7b
remove step numbers, keep consistent with fedora
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-11 18:21:52 -06:00
Andy Rothfusz
4eda2a54de
Merge pull request #3177 from tianon/fix-turnbull-github
...
Fix James's github handle in docs/MAINTAINERS
2013-12-11 16:00:06 -08:00
Andy Rothfusz
d3292078dc
Merge pull request #3176 from lsm5/rhel-docs
...
Rhel docs
2013-12-11 15:58:42 -08:00
Victor Vieux
6ba456ff87
move t from arg to env
2013-12-11 15:36:50 -08:00
Lokesh Mandvekar
44984602c7
more typo corrections
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-11 16:36:14 -06:00
Lokesh Mandvekar
d534e1c3a1
some typo corrections
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-11 16:20:54 -06:00
Andy Rothfusz
d56d8ab96e
Merge pull request #3174 from richo/features/https_install_script
...
Use https to get the install script
2013-12-11 14:09:22 -08:00
Andy Rothfusz
6cf8ec606e
Merge pull request #3161 from SvenDowideit/make-replace-docker-binary-note-more-obvious
...
associate swapping the built docker binary with building the binary, rather than a note in building the docs
2013-12-11 14:04:34 -08:00
Lokesh Mandvekar
db3019d50b
rhel page keywords update
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-11 16:00:46 -06:00
Lokesh Mandvekar
42c38bf34d
rhel description update
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-11 15:59:35 -06:00
Andy Rothfusz
11b3fbb3bd
Merge pull request #3167 from qbrossard/patch-1
...
Corrected typo (resdis -> redis)
2013-12-11 13:57:59 -08:00
Andy Rothfusz
036f41fde3
Merge pull request #3165 from SvenDowideit/cmd-rmi-example
...
add example for docker rmi, and explain the need to remove all references (tags) to and image before its garbage collected :)
2013-12-11 13:57:13 -08:00
Andy Rothfusz
6e9c1590c6
Merge pull request #3162 from SvenDowideit/docker-commit-example-change-CMD
...
add a direct example for changing the cmd that is run
2013-12-11 13:52:12 -08:00
Tianon Gravi
39cc8a32b1
Fix James's github handle in docs/MAINTAINERS
2013-12-11 14:13:55 -07:00
Lokesh Mandvekar
31961ccd94
rhel page only for rhel
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-11 14:36:12 -06:00
Lokesh Mandvekar
eec48f93a3
rhel docs update
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-11 14:34:51 -06:00
Solomon Hykes
dbe1915fee
Engine: new command 'stop' gracefully stops a container.
2013-12-11 11:52:59 -08:00
Solomon Hykes
bef8de9319
Engine: integer job status, improved stream API
...
* Jobs return an integer status instead of a string
* Status convention mimics unix process execution: 0=success, 1=generic error, 127="no such command"
* Stdout and Stderr support multiple thread-safe data receivers and ring buffer filtering
2013-12-11 11:52:59 -08:00
Richo Healey
81fc368a6d
Use https to get the install script
2013-12-11 11:27:36 -08:00
Michael Crosby
bd292759f0
Merge pull request #3153 from vieux/improve_docker_push_display
...
Update docker push to use new display
2013-12-11 11:11:53 -08:00
Michael Crosby
5fd3c8204d
Merge pull request #2735 from shykes/engine-job-kill
...
New engine command: 'kill'
2013-12-11 10:35:57 -08:00
Quentin Brossard
af21908493
Corrected typo (resdis -> redis)
2013-12-11 13:15:27 +01:00
Sven Dowideit
7edd1f6bad
add example for docker rmi, and explain the need to remove all references (tags) to and image before its garbage collected :)
2013-12-11 15:54:34 +10:00
Sven Dowideit
d878632b25
add a direct example for changing the cmd that is run
2013-12-11 12:07:07 +10:00
Sven Dowideit
be13735001
associate swapping the built docker binary with building the binary, rather than a note in building the docs
2013-12-11 11:12:11 +10:00
Andy Rothfusz
fb9ddc5de5
Merge pull request #3159 from SvenDowideit/make-docs-consistency
...
Makefile: make docs is more consistent
2013-12-10 16:51:35 -08:00
Sven Dowideit
27646c4459
make docs is more consistent
2013-12-11 10:14:56 +10:00
Victor Vieux
b98d51dddb
revert 'firstErr'
2013-12-10 15:37:03 -08:00
Victor Vieux
0025e9bd71
Merge pull request #3113 from shykes/engine-export
...
Move 'docker export' to the engine API
2013-12-10 13:28:24 -08:00
Victor Vieux
4c6e528f13
Merge pull request #3152 from daniel-garcia/3129_dont-open-bindmounted-files
...
don't open bind mounted files/dirs to get Stat, use os.Lstat
2013-12-10 11:05:39 -08:00
Victor Vieux
95f061b408
update docker push to use [====> ]
2013-12-10 10:57:16 -08:00
Daniel Garcia
761184df52
don't open bind mounted files/dirs to get Stat, use os.Lstat
2013-12-10 12:49:53 -06:00
Tianon Gravi
78b85220be
Update mkimage-debootstrap with even more tweaks for keeping images tiny by more aggressively removing cache files and by not downloading apt-cache Translations files
2013-12-10 10:59:32 -07:00
Andy Rothfusz
8814c11b14
Merge pull request #3103 from metalivedev/1229-titleactions
...
Update "Use" titles to be action-oriented
2013-12-09 18:57:48 -08:00
Victor Vieux
09d2c2351c
Merge pull request #3119 from shykes/engine-version
...
Port 'docker version' to the engine API
2013-12-09 17:35:44 -08:00
Victor Vieux
c618a906a4
fix size in -tree
2013-12-09 17:27:05 -08:00
Andy Rothfusz
9c1e9a5157
Fix #1229 . Update titles, fix some wrapping.
...
Make the Ambassador container explicit.
Apply Sven's suggestions.
2013-12-09 17:23:56 -08:00
Andy Rothfusz
0b0b0ca0f9
Merge pull request #3146 from jamtur01/linkedits
...
Some minor cleanup of the Links use document
2013-12-09 17:09:59 -08:00
Victor Vieux
ac1093b83a
fix docker images -tree <invalid_image> and docker images -viz <image_name>
2013-12-09 16:58:17 -08:00
James Turnbull
c9cedb4c04
Some minor cleanup of the Links use document
2013-12-09 16:47:19 -08:00
Victor Vieux
a74be95b23
Merge pull request #2843 from shykes/engine-job-wait
...
New engine job:wait
2013-12-09 16:36:23 -08:00
Victor Vieux
8291f00a0e
refactor and fix tests
2013-12-09 16:25:19 -08:00
Andy Rothfusz
b7bc80cba9
Merge pull request #3109 from artagnon/arch-install
...
Update Arch installation doc
2013-12-09 15:52:54 -08:00
Andy Rothfusz
864729b96f
Merge pull request #3104 from jamtur01/uses
...
Added section on Trusted Builds
2013-12-09 15:51:52 -08:00
Andy Rothfusz
a67571668e
Merge pull request #3143 from idupree/patch-1
...
Make it extra clear that the `docker` group is root-equivalent.
2013-12-09 15:48:05 -08:00
Danny Yates
776bb43c9e
Prevent deletion of image if ANY container is depending on it; not just running containers
2013-12-09 20:46:21 +00:00
Michael Crosby
75bd5bea70
Merge pull request #3114 from shykes/hack-stats
...
Hack: stats.sh prints useful project stats for maintainers
2013-12-09 10:36:17 -08:00
Isaac Dupree
e2ee5c71fc
Make it extra clear that the docker group is root-equivalent.
2013-12-09 12:25:20 -05:00
Tianon Gravi
f0879a1e14
Add separate "test-integration" bundlescript (and corresponding dyntest-integration bundlescript)
2013-12-08 18:43:24 -07:00
Tianon Gravi
ca405786f4
Unify dyntest/test and dynbinary/binary hack bundlescripts further by cross-invocation and keeping all the logic in one place, taking advantage of LDFLAGS_STATIC that is the only bit that gets replaced for dyntest/dynbinary
2013-12-08 18:40:05 -07:00
Michael Crosby
cdc07f7d5c
Merge pull request #3126 from unclejack/remove_vendored_tar
...
Remove vendored dotcloud/tar
2013-12-08 16:51:52 -08:00
Shawn Landden
f379f667a2
hack/PACKAGERS.md: libdevmapper
2013-12-08 14:39:06 -08:00
Tianon Gravi
45cea94a82
Unify hack/make/*test further by invoking hack/make/test directly from dyntest
2013-12-08 15:34:08 -07:00
unclejack
8ec96c9605
remove vendored dotcloud/tar
...
The tar dependency has been removed. It's
time to remove the vendored tar as well.
2013-12-09 00:02:13 +02:00
James Turnbull
c094807a1b
Added section on Trusted Builds
2013-12-08 15:54:12 -05:00
Tianon Gravi
bac3a8e6f5
Add much better pruning of non-tested directories, including pruning the integration tests directory (doing more with "find" and nothing with "grep")
2013-12-08 13:50:48 -07:00
Tianon Gravi
dcfc4ada4d
Clean output and simplify hack/make/*test by adding go_test_dir function in make.sh
2013-12-08 13:49:57 -07:00
Tianon Gravi
416b16e1e2
Simplify and resync hack/make/test and hack/make/dyntest output handling
2013-12-08 12:57:11 -07:00
Ramkumar Ramachandra
f832b76bdf
archlinux installation doc: correct some details
...
1. The AUR package is called docker-git, not lxc-docker-git.
2. According to the official community package, docker depends on
sqlite.
3. 02ef8ecartagnon@gmail.com >
2013-12-08 15:36:02 +05:30
Solomon Hykes
d502f0cfac
Merge pull request #3118 from shykes/engine-structured-output
...
Engine: jobs can send structured output as json on stdout
2013-12-07 23:46:50 -08:00
Solomon Hykes
16fad96007
Merge pull request #3117 from shykes/engine-refactor-env
...
Engine: break out Env utilities into their own type - Env
2013-12-07 23:45:00 -08:00
Solomon Hykes
de35b346d1
Port 'docker version' to the engine API
2013-12-08 07:41:53 +00:00
Solomon Hykes
869a11bc93
Cleanup version introspection
...
* Unify version checking code into version.go
* Make 'version' available as a job in the engine
* Use simplified version checking code when setting user agent for registry client.
2013-12-08 07:35:24 +00:00
Solomon Hykes
f806818154
Engine: convenience http transport for simple remote job execution
2013-12-08 07:33:23 +00:00
Solomon Hykes
a7a171b6c2
Engine: Output.AddEnv decodes structured data from the standard output of a job
2013-12-08 06:16:10 +00:00
Solomon Hykes
a80c059bae
Engine: break out Env utilities into their own type - Env
2013-12-08 06:06:05 +00:00
Solomon Hykes
edace08327
Hack: stats.sh prints useful project stats for maintainers
2013-12-08 01:47:03 +00:00
Solomon Hykes
9656cdf0c2
Engine: 'export' returns a raw archive of a container's filesystem
2013-12-08 01:33:37 +00:00
Solomon Hykes
50f3a696bd
Engine: don't log job stdout to engine stdout (it might be non-text output, for example tar data for 'export'
2013-12-08 01:33:05 +00:00
Solomon Hykes
f4676f0ffa
Merge pull request #3101 from creack/merge_release
...
Merge release
2013-12-06 18:09:38 -08:00
Guillaume J. Charmes
3c1f3be032
Update version
2013-12-06 17:31:09 -08:00
Guillaume J. Charmes
aeba4e6482
Merge remote-tracking branch 'origin/release' into merge_release
2013-12-06 17:30:52 -08:00
Solomon Hykes
3569d080af
New engine command: 'wait'
2013-12-06 23:05:21 +00:00
Solomon Hykes
427bdb60e7
Engine: port 'kill' to the new integer status.
2013-12-06 23:02:27 +00:00
Solomon Hykes
9b1930c5a0
gofmt
2013-12-06 23:02:27 +00:00
Solomon Hykes
2546a2c645
Hack: use new 'kill' command in integration tests
2013-12-06 23:02:27 +00:00
Solomon Hykes
fdb3de7b11
Engine: new command 'kill' sends a signal to a running container
2013-12-06 23:02:27 +00:00
Guillaume J. Charmes
88df052197
Merge pull request #3098 from creack/bump_v0.7.1
...
Bump v0.7.1
2013-12-06 14:42:14 -08:00
Guillaume J. Charmes
04ffa53ba8
Merge pull request #3077 from jlhawn/3076-handle-inactive-user-login
...
Adjusted handling of inactive user login
2013-12-06 14:40:35 -08:00
Andy Rothfusz
07f7643bbc
Merge pull request #3030 from jamtur01/versions
...
Fixed #2136 - Added styles
2013-12-06 14:27:53 -08:00
Victor Vieux
228091c79e
added authConfig to docker build
2013-12-06 14:27:10 -08:00
Andy Rothfusz
6fa1463614
Merge pull request #3094 from tang0th/patch-1
...
Update archlinux.rst as packages have changed
2013-12-06 14:18:31 -08:00
Victor Vieux
f28445254f
disable progressbar in non-terminal
2013-12-06 14:15:40 -08:00
Victor Vieux
0969be5ddb
update doc
2013-12-06 14:15:40 -08:00
Victor Vieux
95c0ade04b
fix jsonmessage in build
2013-12-06 14:15:40 -08:00
Tianon Gravi
e01732f857
Revert "Add cgroup-bin dependency to our Ubuntu package"
...
This reverts commit c81bb20f5b
2013-12-06 14:15:40 -08:00
Guillaume J. Charmes
9b644ff246
Merge pull request #3096 from dotcloud/fix_fix_jsonmessage
...
fix jsonmessage in build
2013-12-06 14:10:24 -08:00
Victor Vieux
2c646b2d46
disable progressbar in non-terminal
2013-12-06 14:09:27 -08:00
Victor Vieux
becb13dc26
update doc
2013-12-06 14:09:27 -08:00
Victor Vieux
05f416d869
fix jsonmessage in build
2013-12-06 14:09:27 -08:00
Andy Rothfusz
7fd64e0196
Merge pull request #3088 from SvenDowideit/start-cmdline-examples-with-dollar-for-easier-testing
...
change the policy wrt $ sudo docker to simplify auto-testing
2013-12-06 13:37:02 -08:00
Sven Dowideit
13da09d22b
change the policy wrt $ sudo docker to simplify auto-testing
2013-12-07 07:23:53 +10:00
Josh Hawn
6720bfb243
Adjusted handling of inactive user login
...
The return status for inactive users was being checked
too early in the process, so I moved it from just after
the handling of POST /v1/users/ to after getting the
response from GET /v1/users/
2013-12-06 11:57:05 -08:00
Andy Rothfusz
d75fc6e529
Merge pull request #3071 from lsm5/fedora-docs-update
...
use mattdm/fedora in fedora doc and other cosmetic changes
2013-12-06 11:25:10 -08:00
Andy Rothfusz
4a148919c3
Merge pull request #3052 from shawnl/patch-1
...
nftables dependancies in kernel
2013-12-06 11:02:49 -08:00
Guillaume J. Charmes
c7d75588f4
Merge pull request #3079 from crosbymichael/give-engine-noop-tests
...
Enable engine to take Stderr and Stdout for mocking in tests
2013-12-06 10:43:39 -08:00
Guillaume J. Charmes
dfade9e2d8
Merge pull request #3095 from jpoimboe/missing-defines
...
devmapper: add missing defines
2013-12-06 10:31:42 -08:00
Guillaume J. Charmes
b655406faa
Merge pull request #3085 from tianon/fix-cgroup-dep
...
Revert "Add cgroup-bin dependency to our Ubuntu package"
2013-12-06 09:15:41 -08:00
Josh Poimboeuf
a015f38f4a
devmapper: add missing defines
...
Add some missing defines which are needed for compiling on older systems
like RHEL 6.
2013-12-06 10:13:47 -06:00
tang0th
02ef8ec3ca
Update archlinux.rst as packages have changed
...
The docker package has been added into the Arch Linux community repo, this means that the package names and installation instructions have slightly changed.
2013-12-06 15:47:24 +00:00
Michael Crosby
25d3db048e
Enable engine to take Stderr and Stdout for mocking in tests
2013-12-06 01:18:18 -08:00
Shawn Landden
a69bb25820
specific kernel config
2013-12-05 23:54:23 -08:00
Andy Rothfusz
5f5949f6a6
Merge pull request #3086 from metalivedev/3045-addmirrors
...
Add debian mirrors. Fixes #3045 .
2013-12-05 18:16:28 -08:00
Andy Rothfusz
58b75f8f29
Add debian mirrors. Fixes #3045 .
2013-12-05 18:08:56 -08:00
Tianon Gravi
aea7418d8a
Revert "Add cgroup-bin dependency to our Ubuntu package"
...
This reverts commit c81bb20f5b
2013-12-05 19:03:47 -07:00
Andy Rothfusz
f9147effac
Merge pull request #3069 from proppy/patch-1
...
docs/installation/google: add enabling Google Compute Engine step
2013-12-05 17:40:42 -08:00
Andy Rothfusz
0e2b0f284c
Merge pull request #3001 from dotcloud/api_json
...
add docs for the new json format
2013-12-05 17:35:51 -08:00
Andy Rothfusz
80dfa23da8
Merge pull request #3051 from pariviere/2490-docs-network
...
Network documentation page
2013-12-05 17:29:54 -08:00
Guillaume J. Charmes
bc9b239d74
Merge pull request #3081 from creack/bump_0.7.1
...
Bump to 0.7.1
2013-12-05 17:19:06 -08:00
Andy Rothfusz
4bea68dfa6
Clean up quoting, wraps, and build error on code-block.
2013-12-05 17:16:31 -08:00
Andy Rothfusz
ea0ed9a915
Merge branch 'docker-run-prose-2149' of github.com:SvenDowideit/docker into 3036-test
2013-12-05 17:03:26 -08:00
Guillaume J. Charmes
e39d35deda
Bump to 0.7.1
2013-12-05 16:49:39 -08:00
Guillaume J. Charmes
4acd579226
Merge pull request #3078 from crosbymichael/remove-name-if-not-exist
...
If container does not exist try to remove the name and continue
2013-12-05 16:41:43 -08:00
Victor Vieux
c764fb0c29
Merge pull request #3006 from tianon/ubuntu-cgroup-bin
...
Add cgroup-bin dependency to our Ubuntu package
2013-12-05 16:41:01 -08:00
Guillaume J. Charmes
de090116dd
Merge branch 'master' into release
...
Conflicts:
commands.go
2013-12-05 16:40:24 -08:00
Victor Vieux
7a87023587
Merge pull request #2955 from crosbymichael/search-name-first
...
Search for repo first before image id
2013-12-05 16:16:55 -08:00
Tianon Gravi
584164177e
Merge pull request #2358 from tianon/mkimage-rinse
...
Remove mkimage-centos.sh in favor of a new rinse-based script...
2013-12-05 16:07:59 -08:00
Victor Vieux
35e80868ad
Merge pull request #3004 from tianon/shebang-bash
...
Update bundlescript shebangs to be bash, reflecting how they're actually invoked
2013-12-05 16:04:09 -08:00
Tianon Gravi
2acea6090f
Merge pull request #2983 from tianon/udev
...
Add udev rules files for hiding the docker loopback devices from udisks
2013-12-05 16:01:04 -08:00
Andy Rothfusz
81b25fde79
Merge pull request #3065 from SvenDowideit/use-makefile-in-devenv-documentation
...
use the Makefile in the dev environment documentation - its way less typing, and fewer typing mistakes
2013-12-05 15:27:36 -08:00
Andy Rothfusz
0189a99471
Merge pull request #3062 from SvenDowideit/cli-examples-dollar-sudo-docker
...
Some examples didnt use $ sudo docker, so this makes it a little more consistent
2013-12-05 15:25:09 -08:00
Michael Crosby
7bf3a07371
If container does not exist try to remove the name and continue
2013-12-05 15:22:21 -08:00
Andy Rothfusz
9320f4e2d1
Merge pull request #3061 from shykes/sven-doc-maintainers
...
Add Sven Dowideit to docs maintainers
2013-12-05 15:17:34 -08:00
Guillaume J. Charmes
d1a4f83e5e
Merge pull request #3075 from dotcloud/pull_layers
...
Wait on pull from another client
2013-12-05 14:47:39 -08:00
Victor Vieux
fb810b54ff
wait on pull from another client
2013-12-05 14:41:56 -08:00
Pierre-Alain RIVIERE
eac95671f5
refs #2490 : add a network page to docs
2013-12-05 23:40:33 +01:00
Michael Crosby
06379d8bd9
Merge pull request #2992 from jpoimboe/bridge-create-ioctl
...
Create the bridge device with ioctl
2013-12-05 14:40:03 -08:00
Andy Rothfusz
a96bf74397
include Red Hat Enterprise, should have part of #3011
...
oops, forgot the index!
2013-12-05 14:34:10 -08:00
Andy Rothfusz
cc0466bb68
Merge pull request #3011 from goldmann/rhel_instructions
...
Instructions on how to install Docker on Red Hat Enterprise Linux / CentOS
2013-12-05 14:30:31 -08:00
Andy Rothfusz
0a7e0f0819
Merge pull request #3034 from rogaha/fix_doc_registry_index_spec
...
- Updated the doc according to the current implementation status
2013-12-05 14:24:13 -08:00
Guillaume J. Charmes
ef157cee30
Merge pull request #3074 from crosbymichael/dm-history-calc
...
Save layersize on pull
2013-12-05 14:13:03 -08:00
Lokesh Mandvekar
7ab4f37d60
separate block for yum update docker
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-05 16:11:33 -06:00
Lokesh Mandvekar
5d022f0445
add unofficial header back, yum update docker
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-05 16:08:08 -06:00
Michael Crosby
697707e4af
Save layersize on pull
...
Do not display size and virtual size on the cli.
Only display virtual size on the cli
2013-12-05 14:03:23 -08:00
Andy Rothfusz
e3c3f3c324
Merge pull request #3010 from SvenDowideit/origin/docker-ps-linked-container-alias-example
...
add an example of docker ps, and also of link aliases
2013-12-05 14:00:53 -08:00
Guillaume J. Charmes
797bac2344
Merge pull request #3057 from crosbymichael/test-cpu-share
...
Move test cpu shares out of test start
2013-12-05 13:58:01 -08:00
Josh Poimboeuf
7a94cdf8ed
create the bridge device with ioctl
...
On RHEL 6, creation of a bridge device with netlink fails. Use the more
backward-compatible ioctl instead. This fixes networking on RHEL 6.
2013-12-05 15:32:15 -06:00
Lokesh Mandvekar
61fbf3d8e2
yum upgrade on fedora not required before install
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-05 14:21:03 -06:00
Lokesh Mandvekar
f49eb29497
use mattdm/fedora in fedora doc and other cosmetic changes
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-05 14:03:17 -06:00
Guillaume J. Charmes
1525f71b5a
Merge pull request #3016 from pnasrat/3014-clarify-maintainer-process
...
Add a proposal step for potential MAINTAINERS.
2013-12-05 11:28:30 -08:00
Guillaume J. Charmes
4188cd6bcd
Merge pull request #3024 from jamtur01/ubunturepo
...
Added note about Ubuntu curl installation
2013-12-05 11:27:46 -08:00
Andy Rothfusz
e304e8936b
Merge pull request #3038 from SvenDowideit/2485-ambassador-pattern-doc
...
initial stab at writing a use/ambassador-pattern howto
2013-12-05 11:01:27 -08:00
James Turnbull
03f8a3bbae
Fixed #2136 - Added styles
...
Added styling for versionadded, versionchanged, and
deprecated.
2013-12-05 13:46:15 -05:00
Guillaume J. Charmes
066b961a0c
Merge pull request #3060 from dotcloud/sd_notify
...
sd_notify ready status when accepting API requests
2013-12-05 10:33:29 -08:00
Victor Vieux
f95f2789f2
add docs for the new json format
2013-12-05 10:12:22 -08:00
Victor Vieux
a8e99d9235
Merge pull request #2917 from codeaholics/2698-only-tag-top-layer
...
Only tag the top-most layer when pushing to a registry
2013-12-05 10:02:57 -08:00
Johan Euphrosine
5a17c208cd
docs/installation/google: add enabling Google Compute Engine step
2013-12-05 09:43:08 -08:00
Sven Dowideit
e9bf971e69
use the Makefile in the dev environment documentation - its way less typing, and fewer typing mistakes
2013-12-05 21:48:35 +10:00
Roberto Gandolfo Hashioka
909da5d524
- Added link to the source code repo on github
2013-12-04 21:08:44 -08:00
Sven Dowideit
04c32495f6
add a little prose to tell the user that run creates a container, and then starts it
2013-12-05 14:20:16 +10:00
Sven Dowideit
af020e2d67
I was reading the doc, and noticed that some examples didnt use $ sudo docker, so this makes it a little more consistent
2013-12-05 14:14:08 +10:00
Andy Rothfusz
94d46a8d3a
Merge pull request #2991 from fortybillion/patch-1
...
API documentation: added format of Volumes and Binds parameters to "create" and "start"
2013-12-04 18:32:19 -08:00
Andy Rothfusz
ec9f2f1d0f
Merge branch '2971-cleanconflicts'
2013-12-04 18:26:45 -08:00
Andy Rothfusz
0bfa22124e
Merge branch 'pgdoc' of github.com:jamtur01/docker into 2971-cleanconflicts
...
Conflicts:
docs/sources/examples/postgresql_service.rst
2013-12-04 18:25:58 -08:00
Victor Vieux
79031c4f8c
Merge pull request #2907 from goldmann/iptables-fix
...
Make sure the firewall rules are created even if the bridge interface is already created
2013-12-04 18:04:57 -08:00
Victor Vieux
5f55c1aee1
Merge pull request #2966 from andrewsmedina/govet2
...
fixed some `go vet` issues.
2013-12-04 17:57:10 -08:00
Solomon Hykes
b4e21ad1da
Add Sven Dowideit to docs maintainers
2013-12-04 17:50:33 -08:00
Victor Vieux
97088ebef7
sd_notify ready status when accepting API requests
2013-12-04 17:50:20 -08:00
Solomon Hykes
c35cebaa06
Merge pull request #3031 from jamtur01/docsmaintain
...
Add James Turnbull to docs maintainers
2013-12-04 17:48:45 -08:00
Victor Vieux
41b5e87873
Merge pull request #2993 from jpoimboe/rhel6-version-check
...
remove kernel version warning on rhel 6.5
2013-12-04 17:46:20 -08:00
Andy Rothfusz
9dfc7bc36f
Merge pull request #2834 from fj/topic/clarify-aws-instructions
...
Fix installing-on-AWS workflow description
2013-12-04 17:25:35 -08:00
Guillaume J. Charmes
afbea3f13f
Merge pull request #3058 from dotcloud/add_stderr_hijack
...
fix docker run -a stderr
2013-12-04 17:16:56 -08:00
Andy Rothfusz
5dab47a475
Merge pull request #2886 from jamtur01/fedora_community
...
Updated Fedora docs
2013-12-04 17:12:00 -08:00
Victor Vieux
3ba279a370
fix docker run -a stderr
2013-12-04 17:08:14 -08:00
Guillaume J. Charmes
944c1f10ea
Merge pull request #2967 from crosbymichael/return-host-config
...
Add hostconfig to container inspect
2013-12-04 16:50:42 -08:00
Michael Crosby
0d1506adb3
Move test cpu shares out of test start
...
Fixes #2107
2013-12-04 16:31:09 -08:00
Michael Crosby
3a8222dfa5
Merge pull request #3032 from tianon/makefile-tweaks
...
Tweak Makefile for consistency and Ctrl+C-ability
2013-12-04 16:04:47 -08:00
Tianon Gravi
00030ced4b
Tweak Makefile for consistency and Ctrl+C-ability (also, -rm to keep it clean)
2013-12-04 16:56:01 -07:00
Andy Rothfusz
f95621fd05
Merge pull request #3033 from proppy/add-compute-docs
...
Add Google Cloud Platform installation docs
2013-12-04 15:05:07 -08:00
Guillaume J. Charmes
4328926acc
Merge pull request #3020 from crosbymichael/remove-init-layer
...
Ensure that the init layer is removed with the container
2013-12-04 14:46:48 -08:00
Nick Stinemates
8f382aaecd
Merged with master
2013-12-04 12:40:54 -08:00
Johan Euphrosine
3df5d120de
docs/installation: add google compute engine quickstart
2013-12-04 12:25:22 -08:00
Victor Vieux
1b5517b68f
Merge pull request #3046 from dotcloud/fix_offline_image_transfert_jsonmessage
...
Fix offline image transfer jsonmessage
2013-12-04 12:05:28 -08:00
Victor Vieux
4bc100b494
fix jsonmessage
2013-12-04 11:57:18 -08:00
Victor Vieux
be282b57d5
fix offline image transfert
2013-12-04 11:55:42 -08:00
Victor Vieux
12180948be
remove unused parameter in Download
2013-12-04 11:54:11 -08:00
Victor Vieux
6cf2c14c00
Merge pull request #2796 from EmilHernvall/master
...
Support for same port on multiple interfaces
2013-12-04 11:15:51 -08:00
Michael Crosby
dc9f8bf072
Merge pull request #2790 from proppy/fix-tar
...
utils: remove dotcloud/tar dep
2013-12-04 11:06:13 -08:00
Michael Crosby
0862756beb
Merge pull request #3018 from pnasrat/3017-debug-expvar
...
Expose expvar endpoint during debugging.
2013-12-04 10:53:35 -08:00
Andy Rothfusz
de60bee3d4
Merge pull request #2946 from dhrp/doc-postgres-typo
...
Fixed some grammar and one other line in postgres example
2013-12-04 10:51:02 -08:00
Michael Crosby
51b9fe7301
Merge pull request #3000 from creack/improve_make_sh_test
...
Improve make sh test
2013-12-04 10:41:55 -08:00
Michael Crosby
61aad8fc10
Merge pull request #3029 from pnasrat/container-refactoring
...
Container refactoring
2013-12-04 10:35:42 -08:00
Sven Dowideit
6ddea783ef
initial stab at writing a use/ambassador-pattern howto (Issue #2485 )
2013-12-04 16:47:45 +10:00
Roberto Gandolfo Hashioka
58c33360b0
- Updated the doc with the current implementation status
2013-12-03 16:39:23 -08:00
Paul Nasrat
40fe9f581b
Extract volume bind, creation and external methods.
...
Make Start() slightly more readable.
2013-12-03 18:58:31 -05:00
Sam Alba
258d707548
Merge pull request #2339 from shin-/private_reg_auth
...
Private registry auth
2013-12-03 15:29:38 -08:00
Victor Vieux
99e4f56353
Merge pull request #2930 from creack/docker-osx
...
Docker client on OSX
2013-12-03 15:27:21 -08:00
James Turnbull
0132547a38
Added myself to docs MAINTAINERS
2013-12-03 17:51:34 -05:00
Paul Nasrat
84f78d9cad
Extract helper method for volume linking.
...
Makes this more readable.
2013-12-03 17:35:54 -05:00
Victor Vieux
f8176de191
Merge pull request #2999 from dotcloud/improve_progress_bars
...
Handle small screens
2013-12-03 14:24:40 -08:00
Victor Vieux
f50fe14e13
Handle small screens
2013-12-03 14:21:33 -08:00
James Turnbull
45567f2209
Updated Fedora docs
...
* Added Fedora installation instructions
2013-12-03 16:55:55 -05:00
Victor Vieux
2fd76fc0b8
Merge pull request #3009 from silas/stream-logs
...
Add stream flag to logs command
2013-12-03 13:43:35 -08:00
Silas Sewell
b699aee91f
Rename logs -stream to logs -f
2013-12-03 20:35:22 +00:00
James Turnbull
64439505c7
Added note about Ubuntu curl installation
2013-12-03 14:37:01 -05:00
Michael Crosby
664174c7aa
Add docs for hostconfig in inspect
2013-12-03 11:09:10 -08:00
Michael Crosby
7428e6a5f0
Merge pull request #3022 from pnasrat/3021-makefile-testflags
...
Support TESTFLAGS
2013-12-03 10:55:22 -08:00
Paul Nasrat
d21563ced3
Support TESTFLAGS
2013-12-03 14:49:10 -05:00
Paul Nasrat
6a55169e2e
Expose expvar endpoint during debugging.
...
Fixes #3017
2013-12-03 13:04:18 -05:00
Michael Crosby
5976c26c1e
Ensure that the init layer is removed with the container
2013-12-03 09:44:48 -08:00
Paul Nasrat
b59dea6767
Add a proposal step for potential MAINTAINERS.
...
Fixes #3014
2013-12-03 11:04:53 -05:00
shin-
9be5db8704
Handle 401 response in auth.Login() for authed private registries
2013-12-03 16:32:13 +01:00
shin-
3f92163989
Don't return req as result of setTokenAuth
2013-12-03 16:32:13 +01:00
shin-
3b5010e90b
missed one call to setTokenAuth
2013-12-03 16:32:13 +01:00
shin-
ec4863ae55
Factorized auth token setting
2013-12-03 16:32:13 +01:00
shin-
a02bc8a5db
gofmt
2013-12-03 16:32:13 +01:00
shin-
045989e3d8
Use basic auth for private registries when over HTTPS.
...
RequestFactory is no longer a singleton (can be different for different instances of Registry)
Registry now has an indexEndpoint member
Registry methods that needed the indexEndpoint parameter no longer do so
Registry methods will only use token auth where applicable if basic auth is not enabled.
2013-12-03 16:32:13 +01:00
shin-
bbf9135adc
Added HTTPAuthDecorator
2013-12-03 16:24:47 +01:00
Emil Hernvall
1cb1e08644
Support for same port on multiple interfaces
...
This commit improves upon the PortMapper and PortAllocator classes by changing
their internal data structures for port allocations to use a string rather than
a single integer. This string holds the network interface address as well as the
port number. This solves a previous problem where a port would be incorrectly
reported as being in use because it had been allocated for a different interface.
I've also added a basic test case for the PortMapper class, and extended the
existing test case for PortAllocator. In the case of PortMapper, this is done
by handing it a stub function for creating proxies rather than an actual
implementation.
2013-12-03 15:14:54 +01:00
Marek Goldmann
682cf48d1d
Instructions on how to install Docker on Red Hat Enterprise Linux / CentOS.
2013-12-03 11:25:53 +01:00
Sven Dowideit
48e1766527
add an example of docker ps, and also of link aliases
2013-12-03 17:57:51 +10:00
Silas Sewell
3ddbb36a84
Only stream logs when container is running
2013-12-03 07:17:07 +00:00
Silas Sewell
62263967b9
Add stream flag to logs command
2013-12-03 06:18:01 +00:00
Michael Crosby
3ed0ff85f5
Merge pull request #2821 from jpellerin/2820-fix-daemon-dns
...
Fixes #2820
2013-12-02 18:19:31 -08:00
Michael Crosby
c4c90e9cec
Add hostconfig to container inspect
2013-12-02 18:06:04 -08:00
Tianon Gravi
650d4cc644
Merge pull request #3005 from gurjeet/zfs_driver_owner
...
Typo fix
2013-12-02 15:06:05 -08:00
Gurjeet Singh
d9b742419c
Typo fix
2013-12-02 18:03:54 -05:00
Tianon Gravi
c81bb20f5b
Add cgroup-bin dependency to our Ubuntu package
...
Since cgroup-bin is only "recommended" by the lxc package on Ubuntu, but is necessary for having the proper cgroups mounted for Docker to function, this makes some sense for us to add separately.
Fixes #2990
2013-12-02 16:02:54 -07:00
John Feminella
6c70d23e0d
Fixes broken RST links; clarifies AWS instructions
2013-12-02 17:55:42 -05:00
John Feminella
c9432cf51a
Reformats source text to proper widths
2013-12-02 17:55:42 -05:00
Guillaume J. Charmes
829b118dd8
Add some color in order to emphasis the test FAILURE
2013-12-02 14:54:01 -08:00
Tianon Gravi
3ac76cfeff
Update bundlescript shebangs to be bash, reflecting how they're actually invoked
2013-12-02 15:48:39 -07:00
JP
5a9cf7e754
Add unit test for ValidateIp4Address
2013-12-02 17:33:33 -05:00
Josh Poimboeuf
e4aba11e80
add env variable to disable kernel version warning
...
Allow the user to set DOCKER_NOWARN_KERNEL_VERSION=1 to disable the
warning for RHEL 6.5 and other distributions that don't exhibit the
panics described in https://github.com/dotcloud/docker/issues/407 .
2013-12-02 15:56:51 -06:00
Tianon Gravi
9d62dc1a08
Remove mkimage-centos.sh in favor of a new rinse-based script, since febootstrap is fragile and picky
2013-12-02 14:54:04 -07:00
Guillaume J. Charmes
0017c68f4a
Remove trailing whitespace
2013-12-02 13:52:27 -08:00
JP
3cd9b2aadf
Fixes #2820
2013-12-02 16:22:39 -05:00
Victor Vieux
8afb0abbee
Merge pull request #2998 from creack/fix_json_display
...
Fix json display
2013-12-02 12:58:58 -08:00
Guillaume J. Charmes
98ed1dc433
Fix unit test with new buildfile prototype
2013-12-02 12:51:37 -08:00
Victor Vieux
7aec93c370
Merge pull request #2959 from crosbymichael/fix-auth-split
...
Split auth on first colon
2013-12-02 12:21:04 -08:00
Victor Vieux
62f0e5aef9
Merge pull request #2965 from crosbymichael/no-private-port
...
Only return published ports for docker port
2013-12-02 12:18:47 -08:00
Victor Vieux
59a85798fa
Merge pull request #2982 from tianon/dockerfile-best-practice
...
Update Dockerfile with all-caps INSTRUCTIONS
2013-12-02 12:14:04 -08:00
Victor Vieux
67c03552f6
Merge pull request #2957 from creack/handle_sigquit
...
Catch SIGQUIT for cleanup
2013-12-02 12:13:07 -08:00
Victor Vieux
4fdc117ad2
Merge pull request #2921 from dustin/inspect-format
...
Add -format to 'docker inspect'
2013-12-02 12:08:15 -08:00
Guillaume J. Charmes
5cd09dc115
small reformatting jsonmessage
2013-12-02 11:49:11 -08:00
Guillaume J. Charmes
6ea3b9651b
Fix displayJson behavior (dont add newline)
2013-12-02 11:47:13 -08:00
Guillaume J. Charmes
de4429f70d
Do not format at each write but use a Writer instead (build)
2013-12-02 11:43:41 -08:00
Michael Crosby
8cc524996a
Merge pull request #2924 from tianon/strict-fhs-compatibility
...
Add proper dockerinit path support for distros that use FHS 2.3
2013-12-02 11:35:36 -08:00
Tianon Gravi
d9fbdd7b3f
Merge pull request #2995 from gurjeet/zfs_driver_owner
...
Add contrb/zfs/ and add self as maintainer of ZFS storage driver.
2013-12-02 11:10:16 -08:00
Dustin Sallings
4ad3dfb05f
CLI docs and examples of format
2013-12-02 11:07:41 -08:00
Dustin Sallings
1d503be466
Use inspect format to get IP address for psql example
2013-12-02 11:07:41 -08:00
Dustin Sallings
9837ad8e9b
Add -format to 'docker inspect'
...
This makes it a lot easier to script with docker instances as one can
ask for details about running instances more easily without having to
have additional JSON processing tools installed.
dotcloud/docker#734
2013-12-02 11:07:41 -08:00
Gurjeet Singh
70b586702c
Add contrb/zfs/ and add self as maintainer of ZFS storage driver.
2013-12-02 14:03:16 -05:00
Victor Vieux
4b35c1b6a6
Merge pull request #2728 from SvenDowideit/docker-import-doc
...
re-word the help for docker import to make it clear that this will be an empty image containing only the files in the tar file
2013-12-02 10:59:15 -08:00
Michael Crosby
fe571dd293
Merge pull request #2829 from dotcloud/refactor_opts
...
Refactor opts
2013-12-02 10:41:30 -08:00
Michael Crosby
e1414a4c39
Merge pull request #2945 from dotcloud/refactor_stream
...
Refactor stream
2013-12-02 10:31:09 -08:00
Victor Vieux
d4ebba703c
Merge pull request #2994 from discordianfish/1150-build-return-exit-code
...
Bump api version and update docs
2013-12-02 10:30:46 -08:00
Johannes 'fish' Ziemke
e4cb83c50e
Bump api version and update docs
2013-12-02 19:27:28 +01:00
Michael Crosby
d7dd19d22e
Merge pull request #2981 from tianon/less-verbose-testing
...
Remove "-v" from "go test" (since it's easy to add back manually via TESTFLAGS)
2013-12-02 10:14:25 -08:00
Guillaume J. Charmes
5f2313aad3
Merge pull request #2984 from SvenDowideit/2319-build-check-for-dockerfile
...
check on the client side that there is a Dockerfile
2013-12-02 09:35:31 -08:00
Guillaume J. Charmes
d6cdbca6c1
Merge pull request #2775 from daniel-garcia/2671-bindmount_files
...
fixes #2671 , add support for bind mounting individual files in to contai...
2013-12-02 09:30:08 -08:00
Guillaume J. Charmes
751250015b
Merge pull request #2206 from discordianfish/1150-build-return-exit-code
...
Make docker build return exit code of build step
2013-12-02 09:01:11 -08:00
Johannes 'fish' Ziemke
b04c6466cd
Make docker build return exit code of build step
...
If a command during build fails, `docker build` now returns with
the exit code of that command.
This makes it necessary to change the build api endpoint to
return a json object stream.
2013-12-02 17:52:37 +01:00
Ben Sargent
b9ad0c9f74
Added format of Volumes and Binds parameters to create and start
...
* Added sample Volumes parameter to container create API.
* Added PortBindings and PublishAllPorts parameter to container start API
* Added note to container start about Binds needed to be declared as Volumes during container create.
2013-12-02 16:52:12 +00:00
Tianon Gravi
dbb47f63ab
Add udev rules files for hiding the docker loopback devices from udisks
...
This prevents them from showing up on the desktop in a window manager, for example.
2013-12-02 09:11:06 -07:00
Solomon Hykes
c4548506c5
Merge pull request #2693 from fkautz/makefile
...
Adding a makefile
2013-12-01 23:25:24 -08:00
Sven Dowideit
26cf8b9aff
check on the client side that there is a Dockerfile, so we don't upload a huge stack of files, only to realise we can't do anything
2013-12-02 15:55:08 +10:00
Tianon Gravi
7f1a91121c
Update Dockerfile with all-caps INSTRUCTIONS (as explained in docs as being "convention": http://docs.docker.io/en/latest/use/builder/#format )
2013-12-01 21:31:28 -07:00
Tianon Gravi
c30e2dc28c
Remove "-v" from "go test" (since it's easy to add back via TESTFLAGS)
2013-12-01 21:20:35 -07:00
Guillaume J. Charmes
d9cdd45d2e
Merge pull request #2978 from tianon/go1.2
...
Update to Go 1.2 officially, now that it is released
2013-12-01 16:46:38 -08:00
Tianon Gravi
5c5f670901
Update to Go 1.2 officially, now that it is released
2013-12-01 15:11:10 -07:00
Andrews Medina
fea432bdf5
fixed Looback typo.
2013-11-30 16:28:52 -02:00
James Turnbull
39aac21db4
Updated and simplified the PG example
2013-11-30 10:58:52 -05:00
Frederick F. Kautz IV
56ab9cb0d5
Minor fixes based on discussions on #2693
...
* Volume exports ./bundles instead of root directory
* Documents build using docker-docs instead of docker:docs
* Bundles directory is created before running build or docs
2013-11-30 00:09:41 -08:00
Solomon Hykes
d8ee08ba7b
Merge pull request #2925 from tianon/update-systemd-service
...
Update systemd service file with suggestions from @seblu
2013-11-29 21:25:08 -08:00
Andrews Medina
e8437e8fcf
using errors.New instead fmt.Error.
2013-11-30 01:02:09 -02:00
Guillaume J. Charmes
4e030c78d2
Merge branch 'master' into handle_sigquit
...
Conflicts:
server.go
2013-11-29 18:51:32 -08:00
Guillaume J. Charmes
62b1faf28c
Merge pull request #2926 from crosbymichael/attach-wait
...
Return process exit code for attach
2013-11-29 18:49:24 -08:00
Guillaume J. Charmes
2dac7b5209
Merge pull request #2781 from shykes/engine-status-int
...
Engine: integer status, better streaming, lots of tests
2013-11-29 17:57:28 -08:00
Guillaume J. Charmes
1890301e67
Merge pull request #2964 from andrewsmedina/gofmt2
...
go fmt.
2013-11-29 17:19:28 -08:00
Andrews Medina
a6c9a332d0
fixed some go vet issues.
2013-11-29 22:53:20 -02:00
Michael Crosby
65db62619c
Only return published ports for docker port
2013-11-29 16:45:20 -08:00
Solomon Hykes
35d54c6655
Fix a bug in Output.Write, and improve testing coverage of error cases.
2013-11-30 00:25:46 +00:00
Solomon Hykes
3553a803e3
Engine: better testing of streams and of basic engine primitives. Coverage=81.2%
2013-11-30 00:25:46 +00:00
Solomon Hykes
a4f8a2494b
Engine: integer job status, improved stream API
...
* Jobs return an integer status instead of a string
* Status convention mimics unix process execution: 0=success, 1=generic error, 127="no such command"
* Stdout and Stderr support multiple thread-safe data receivers and ring buffer filtering
2013-11-30 00:25:46 +00:00
Andrews Medina
fe72f15e4a
go fmt.
...
result of `gofmt -w -s .` without vendors.
2013-11-29 22:20:59 -02:00
Michael Crosby
a37b155384
Split auth on first colon
2013-11-29 15:14:36 -08:00
Guillaume J. Charmes
82cecb34b5
Merge pull request #2954 from creack/fix_tests
...
Fix tests
2013-11-29 15:08:11 -08:00
Guillaume J. Charmes
e1278e9ec2
Merge pull request #2952 from codeaholics/2126-registry-close-wait
...
Closing HTTP connection after Registry ping
2013-11-29 14:21:52 -08:00
Guillaume J. Charmes
db7c55ba7f
Catch SIGQUIT for cleanup
2013-11-29 14:13:00 -08:00
Guillaume J. Charmes
0d3f4017cf
Merge pull request #2929 from pnasrat/2928-fix-signal-handling
...
Remove incorrect SIGKILL handler.
2013-11-29 14:10:46 -08:00
Guillaume J. Charmes
ab35aef6b5
Add unit test to check bind / server side
2013-11-29 13:43:37 -08:00
Guillaume J. Charmes
bb284ce59d
Merge branch 'master' into fix_tests
2013-11-29 13:17:36 -08:00
Guillaume J. Charmes
34353e782e
Reduce the timeout for restart/stop
2013-11-29 11:08:01 -08:00
Michael Crosby
ca98434a45
Search for repo first before image id
2013-11-29 11:06:35 -08:00
Guillaume J. Charmes
86c00be180
Fix behavior of tty tests
2013-11-29 10:17:25 -08:00
Guillaume J. Charmes
2ec1146679
Remove an unit test from integrations test
2013-11-29 10:17:04 -08:00
Guillaume J. Charmes
2e6a958612
Fix TestAttachDetachTruncatedID (behavior + tty issue)
2013-11-29 10:03:36 -08:00
Guillaume J. Charmes
697be6aaa0
Create helper function for tests
2013-11-29 10:02:22 -08:00
Guillaume J. Charmes
c13821ad0b
Make sure the termcaps are restored after hijack
2013-11-29 09:55:15 -08:00
Guillaume J. Charmes
aa68656cd3
Fix term.RestoreTerminal behavior
2013-11-29 09:52:44 -08:00
Guillaume J. Charmes
63d6cbe3e4
Actually test the detach (was not the case before)
2013-11-29 09:11:20 -08:00
Guillaume J. Charmes
67e9e0e11b
Make the PTY in raw mode before assert test (TestAttachDetach)
2013-11-29 08:29:56 -08:00
Guillaume J. Charmes
fbebe20bc6
Add a GetPtyMaster() method to container to retrieve the pty from an other package.
...
We could also have put ptyMaster public, but then we need to ignore it in json
otherwise the Marshalling fails. I think it is cleaner that way.
2013-11-29 07:40:44 -08:00
Guillaume J. Charmes
e535f544c7
Make sure the container is running before testing against it (TestAttachDetach)
2013-11-29 07:39:51 -08:00
cressie176
fe727e2a87
Closing connection after ping
2013-11-29 12:07:20 +00:00
Guillaume J. Charmes
f72e604872
Merge branch 'master' into docker-osx
2013-11-28 21:16:32 -08:00
Victor Vieux
926f7b579e
Merge pull request #2692 from SvenDowideit/add-specific-feedback-for-bad-ADD
...
Add specific feedback for ADD outside context
2013-11-28 17:55:11 -08:00
Victor Vieux
ff5747728c
Merge pull request #2357 from ulyssecarion/master
...
Document setting up Vagrant-docker with the remote API
2013-11-28 17:54:05 -08:00
Thatcher
6c56993639
Merge pull request #2901 from dkumor/patch-1
...
Deleted references to AUFS in Arch docs
2013-11-28 17:39:26 -08:00
Sven Dowideit
ba5268d382
re-word the help for docker import to make it clear that this will be an empty image containing only the files in the tar file
2013-11-29 11:22:17 +10:00
Thatcher Peskens
8291d509c2
Fixed some grammar and one other line about needing the postgresql-client for connecting to the service.
2013-11-28 17:19:26 -08:00
Thatcher
139644895e
Merge pull request #2894 from brunoqc/patch-1
...
Update postgresql's version in example
2013-11-28 17:16:25 -08:00
Victor Vieux
cca9e51f5d
Merge pull request #2941 from codeaholics/2940-invalid-registry-calls
...
Stop invalid calls to Registry
2013-11-28 17:00:22 -08:00
Victor Vieux
668d22be54
Merge pull request #2808 from tianon/run-all-tests
...
Update test scripts to always run ALL tests, even when some fail
2013-11-28 16:58:31 -08:00
Guillaume J. Charmes
77c94175bd
Make CopyEscapable consistent with Copy and return nil in case of success instead of io.EOF
2013-11-28 16:57:51 -08:00
Victor Vieux
f94ea7769f
Merge pull request #2923 from creack/refactor_cgo_in_go
...
Refactor attach loop device in pure Go
2013-11-28 16:52:38 -08:00
Victor Vieux
39bec226c0
Merge pull request #2844 from tianon/fix-mount-spaces
...
Add space-escaping to path parts of lxc.mount.entry lines in generated lxc.conf, allowing for spaces in mount point names
2013-11-28 16:48:36 -08:00
Victor Vieux
677e2ad92e
Merge pull request #2881 from yrashk/patch-1
...
Fix command line help for docker save
2013-11-28 16:42:40 -08:00
Victor Vieux
d3cc558d14
add test
2013-11-28 16:28:31 -08:00
Guillaume J. Charmes
ad43d88af5
Make race condition more obvious by performing more asserts
2013-11-28 16:12:45 -08:00
Michael Crosby
1fe1b216ad
Return process exit code for attach
...
Fixes #2240
2013-11-28 15:25:50 -08:00
Solomon Hykes
3faf450f11
Merge pull request #2818 from pnasrat/docker-pprof
...
Wire in pprof handlers.
2013-11-28 14:43:13 -08:00
Victor Vieux
b36dd3f9cc
fix display on test
2013-11-28 14:40:17 -08:00
Thatcher
a0525d90ab
Merge pull request #2937 from jwarwick/hello_world_doc
...
Remove explanation of removed argument
2013-11-28 14:35:17 -08:00
Victor Vieux
ebc36b879d
add progressbar and time
2013-11-28 14:33:18 -08:00
Thatcher
14425c1690
Merge pull request #2922 from ath0mas/patch-1
...
Restore 'save' paragraph
2013-11-28 14:15:43 -08:00
Michael Crosby
aae23255a0
Merge pull request #2888 from tianon/changelog-fix
...
Fix CHANGELOG: we ended up not merging the btrfs driver for last night's release
2013-11-28 12:24:56 -08:00
Guillaume J. Charmes
2bbc90e92f
Make volumes opts more strict
2013-11-28 12:24:04 -08:00
Guillaume J. Charmes
0c758e9312
Merge branch 'master' into refactor_opts
...
Conflicts:
commands.go
2013-11-28 12:23:45 -08:00
Victor Vieux
597e0e69b4
split in 3 files
2013-11-28 12:16:57 -08:00
Guillaume J. Charmes
261bd0d187
Improve devmapper unit tests with syscall/ioctl
2013-11-28 11:53:09 -08:00
Michael Crosby
3d0486979e
Merge pull request #2892 from creack/add_cli_test-1
...
Add ParseRun unit tests
2013-11-28 11:39:48 -08:00
Victor Vieux
377817db1b
Merge pull request #2913 from pnasrat/2852-deleteimage-performance
...
Performance of deleteImageAndChildren.
2013-11-28 11:20:43 -08:00
Guillaume J. Charmes
a990b3aeb9
Correct comments
2013-11-28 11:02:53 -08:00
Paul Nasrat
9f46779d42
Wire in pprof handlers.
...
Based on http://stackoverflow.com/questions/19591065/profiling-go-web-application-built-with-gorillas-mux-with-net-http-pprof
2013-11-28 13:46:58 -05:00
Guillaume J. Charmes
533067bba4
Rename file for consistency
2013-11-28 10:37:03 -08:00
Tianon Gravi
438607ecc3
Add proper dockerinit path support for distros that use FHS 2.3
2013-11-28 11:11:30 -07:00
Danny Yates
d47507791e
Stop invalid calls to Registry
...
This code was resulting in a call for
/v1/images/<namespace>/<repository>/ancestry which the Registry
doesn't understand. Furthermore, it was masking the original
error.
2013-11-28 16:43:28 +00:00
Paul Nasrat
bdfe8ed403
Remove incorrect SIGKILL handler.
...
As per POSIX signal handling SIGKILL does not work.
Fixes #2928
2013-11-28 10:42:06 -05:00
John Warwick
f1e44e0b0c
Remove explanation of removed argument
2013-11-28 09:55:15 -05:00
Ulysse Carion
c226ab6d9e
Document setting up Vagrant-docker with the remote API
2013-11-27 20:05:54 -08:00
Guillaume J. Charmes
74ea136a49
Move reflink to os dependent file. OSX docker client fully functionnal.
2013-11-27 19:23:48 -08:00
Guillaume J. Charmes
24c03b2d93
Make devicemapper linux-only
2013-11-27 19:12:51 -08:00
Guillaume J. Charmes
a58fef9f13
Merge branch 'master' into refactor_cgo_in_go
2013-11-27 18:55:11 -08:00
Victor Vieux
597ca192e7
Merge pull request #2927 from andrewsmedina/stat_macos
...
Move syscall.Stats logic to os specific file.
2013-11-27 18:32:18 -08:00
Andrews Medina
8b2a7e35c3
Move syscall.Stats logic to os specific file.
...
related to #2909 .
2013-11-28 00:22:47 -02:00
Guillaume J. Charmes
8a5d927a53
Check if the target loopback is a block device
2013-11-27 18:21:17 -08:00
Guillaume J. Charmes
1214b8897b
Extract ioctl from wrapper
2013-11-27 17:47:20 -08:00
Guillaume J. Charmes
eb528b959e
Move attach loop device to its own file
2013-11-27 17:12:57 -08:00
Tianon Gravi
75e9cff98c
Update systemd service file with suggestions from @seblu
2013-11-27 16:55:37 -07:00
Guillaume J. Charmes
74c8f7af75
Refactor attach loop device in pure Go
2013-11-27 15:39:30 -08:00
Alexis THOMAS
2c27da8818
Restore 'save' paragraph
2013-11-28 00:39:06 +01:00
Solomon Hykes
39f21af687
Merge pull request #2914 from crosbymichael/open-issues
...
Add instructions for opening issues on the repository
2013-11-27 15:25:12 -08:00
Danny Yates
d1a631cedb
Only tag the top-most layer, not all interim layers
2013-11-27 22:00:58 +00:00
Michael Crosby
7f9cdaa342
Merge pull request #2831 from SvenDowideit/please-ignore-squiggle-backup-files
...
Please ignore squiggle backup files
2013-11-27 11:04:21 -08:00
Michael Crosby
e4ae44b844
Add instructions for opening issues on the repository
2013-11-27 10:41:20 -08:00
Guillaume J. Charmes
89454851d1
Merge pull request #2814 from dotcloud/release_checklist_update
...
update release checklist
2013-11-27 10:04:55 -08:00
Guillaume J. Charmes
f75dc36204
Merge pull request #2904 from SvenDowideit/dont-show-user-internal-slash-in-error-message
...
there appears to be a slash prepended to a container name internally
2013-11-27 09:58:24 -08:00
Michael Crosby
5fe5055bd9
Merge pull request #2910 from codeaholics/wait-for-simultaneous-pull
...
Allow multiple clients to pull the same tag simultaneously
2013-11-27 09:58:13 -08:00
Paul Nasrat
4e826e99b2
Performance of deleteImageAndChildren.
...
Don't walk the file system for parents each time we recurse.
Fixes #2852
2013-11-27 12:55:15 -05:00
Danny Yates
788feab3a7
Handle the case where poolAdd() gives an error for an unknown pool type
2013-11-27 16:53:36 +00:00
dkumor
682a188ead
Arch docs: Added lxc-docker-nightly AUR package, modified deps
...
lxc-docker-nightly installs latest build. Removed go from dependencies, as it is not needed in lxc-docker and lxc-docker-nightly. The -git package will flag go as a dependency upon installation.
2013-11-27 10:25:30 -06:00
Bruno Bigras
45b1e8c236
Update postgresql's version in example
...
It seems ppa:pitti/postgresql will be deprecated and only apt.postgresql.org has 9.3.
2013-11-27 09:55:41 -05:00
Danny Yates
ae474e05f5
Allow multiple clients to pull the same tag simultaneously
...
If two clients simultaneously try to pull the same tag, there was a race
whereby one would succeed and the second would generate an error. Now,
the second simply waits for the first to complete.
2013-11-27 12:18:01 +00:00
Marek Goldmann
0ff9bc1be3
Make sure the firewall rules are created even if the bridge interface is already created
2013-11-27 12:14:18 +01:00
dkumor
b3e8ba1908
Arch docs: Updated dependencies to match AUR
...
The AUR packages lxc-docker and lxc-docker-git have changed their dependencies.
2013-11-26 22:07:56 -06:00
Sven Dowideit
7b95d41092
tell anyone that might want to ignore their editor choice's backup files that there is a better way - thanks @pnasrat
2013-11-27 13:19:06 +10:00
Sven Dowideit
1cb7b9adc6
there appears to be a slash prepended to a container name internally - don't tell the user about it in an error message, it might cause them to worry about it
2013-11-27 12:58:54 +10:00
dkumor
d370a889c3
Deleted references to AUFS
...
AUFS is no longer a dependency (both lxc-docker and lxc-docker-git are >=0.7), and the Arch kernel doesn't need to be replaced with AUFS_friendly.
2013-11-26 20:00:13 -06:00
Michael Crosby
6d34c50e89
Increase max image depth to 127
2013-11-26 17:04:55 -08:00
Tianon Gravi
6344e6f258
Merge pull request #2887 from kleptog/master
...
Add mkseccomp.pl, helper script to make seccomp profiles.
2013-11-26 15:24:35 -08:00
Guillaume J. Charmes
462e30dcbd
Add parseRun volume unit tests
2013-11-26 23:03:50 +00:00
Guillaume J. Charmes
c7661f40b6
Make volumes opts more strict
2013-11-26 23:00:44 +00:00
Guillaume J. Charmes
c707c587c1
Add ParseRun unit tests
2013-11-26 20:16:16 +00:00
Guillaume J. Charmes
5e3f6e7023
Change the default Host affectation to not rely on slice
2013-11-26 18:31:59 +00:00
Guillaume J. Charmes
1beb5005d1
Format main()
2013-11-26 17:47:58 +00:00
Guillaume J. Charmes
1ba11384bf
Refactor Opts
2013-11-26 17:46:06 +00:00
Tianon Gravi
8398abf0dc
Fix CHANGELOG: we ended up not merging the btrfs driver for last night's release
2013-11-26 09:36:46 -07:00
Martijn van Oosterhout
ab3a83c617
Add mkseccomp.pl, helper script to make seccomp profiles.
2013-11-26 17:13:02 +01:00
Guillaume J. Charmes
8b99e4ed37
Merge pull request #2884 from nikai3d/patch-1
...
fix typo in CONTRIBUTING.md
2013-11-26 07:40:49 -08:00
Guillaume J. Charmes
17efa9dc2d
Merge pull request #2872 from goldmann/runtime_typo
...
Fix the 'but is not' typo
2013-11-26 07:40:25 -08:00
Nicolas Kaiser
76c71260f1
fix typo in CONTRIBUTING.md
2013-11-26 16:13:39 +01:00
Yurii Rashkovskii
8267437294
Fix command line help for docker save
...
`docker save IMAGE DESTINATION` is not what `docker save` expects
2013-11-26 06:54:46 -08:00
Marek Goldmann
9c15322894
Fix the 'but is not' typo.
2013-11-26 11:18:50 +01:00
Victor Vieux
06d5e25224
Merge pull request #2870 from dotcloud/fix-links-parsing
...
fix -link parsing
2013-11-26 00:09:09 -08:00
Victor Vieux
009024ad64
fix -link parsing
2013-11-26 00:05:46 -08:00
Victor Vieux
18d08d0d42
Merge pull request #2869 from dotcloud/fix-docker-pull-run
...
fix docker run on an unknown image
2013-11-25 23:28:15 -08:00
Victor Vieux
0bb2c0b1d0
fix docker run on an unknown image
2013-11-25 23:20:36 -08:00
Tianon Gravi
1af6ffb9bb
Add explicit test strings for new escapeFstabSpaces function
2013-11-26 00:11:42 -07:00
Michael Crosby
233ad38802
Merge branch 'release'
2013-11-25 22:25:47 -08:00
Tianon Gravi
b702edadb7
Format lxc_template.go with gofmt
2013-11-24 20:02:06 -07:00
Tianon Gravi
f16c45f8b0
Add space-escaping to path parts of lxc.mount.entry lines in generated lxc.conf, allowing for spaces in mount point names
...
Fixes #2802
2013-11-24 20:00:39 -07:00
Sven Dowideit
96b5be9dd9
add more searchable info to the error message when ADD tries to go outside the context
2013-11-23 12:23:31 +10:00
Tianon Gravi
37e0083169
Add a few more small RELEASE-CHECKLIST tweaks, fixes, and improvements
2013-11-22 11:46:15 -07:00
daniel-garcia
0198f8a879
fixes #2671 , add support for bind mounting individual files in to containers, rebases of #1757 #2301
2013-11-21 23:40:35 -06:00
Victor Vieux
58f8503b73
update release checklist
2013-11-21 18:34:23 -08:00
Tianon Gravi
f1e6dce047
Update test scripts to always run ALL tests, even when some fail
2013-11-21 16:19:19 -07:00
Johan Euphrosine
b3bee7e0c4
utils: remove dotcloud/tar dep
2013-11-20 18:45:12 +00:00
Frederick F. Kautz IV
7267c4b746
Removing sudo
2013-11-14 05:53:53 +00:00
Frederick F. Kautz IV
26533eb2c4
Adding a makefile
2013-11-14 05:34:25 +00:00
Nick Stinemates
821a82ac6c
Add Developer Certificate of Origin Text
...
We purposely chose to license Docker under the Apache 2.0 license. This is a well-known
license, which is popular for its permissive and flexible properties, while still
encouraging a collaborative community. It also makes certain representations with regard
to contributions, and the rights given to contributors, the project, people who use Docker,
people who modify Docker, etc.
This approach to contributions is inspired by the popular Linux Developer
"Certificate of Origin". This approach makes it simple for new contributors to get started,
and avoids bureaucracy in tracking contributions and contributors.
To indicate accordance, each individual contribution to the Project is signed off by the
developer, using his or her real name, email address, and github handle in the format below:
Docker-DCO-1.0-Signed-off-by: Joe Smith <joe.smith@email.com >
2013-10-04 14:27:26 -07:00
