mirror of https://github.com/docker/docs.git
Merge pull request #13947 from mavenugo/vin
Picking up missed out vendor files via hack/vendor.sh
This commit is contained in:
commit
4d23f459ad
|
@ -324,7 +324,7 @@ func (f *JSONFormatter) Format(entry *Entry) ([]byte, error) {
|
||||||
|
|
||||||
#### Logger as an `io.Writer`
|
#### Logger as an `io.Writer`
|
||||||
|
|
||||||
Logrus can be transformed into an `io.Writer`. That writer is the end of an `io.Pipe` and it is your responsibility to close it.
|
Logrus can be transormed into an `io.Writer`. That writer is the end of an `io.Pipe` and it is your responsibility to close it.
|
||||||
|
|
||||||
```go
|
```go
|
||||||
w := logger.Writer()
|
w := logger.Writer()
|
||||||
|
|
|
@ -24,21 +24,21 @@ The following packages are required to compile libcontainer natively.
|
||||||
- git
|
- git
|
||||||
- cgutils
|
- cgutils
|
||||||
|
|
||||||
You can develop on OS X, but you are limited to Dockerfile-based builds only.
|
You can develop on OSX, but you are limited to Dockerfile-based builds only.
|
||||||
|
|
||||||
### Building libcontainer from Dockerfile
|
### Building libcontainer from Dockerfile
|
||||||
|
|
||||||
make all
|
make all
|
||||||
|
|
||||||
This is the easiest way of building libcontainer.
|
This is the easiest way of building libcontainer.
|
||||||
As this build is done using Docker, you can even run this from [OS X](https://github.com/boot2docker/boot2docker)
|
As this build is done using Docker, you can even run this from [OSX](https://github.com/boot2docker/boot2docker)
|
||||||
|
|
||||||
### Testing changes with "nsinit"
|
### Testing changes with "nsinit"
|
||||||
|
|
||||||
make sh
|
make sh
|
||||||
|
|
||||||
This will create an container that runs `nsinit exec sh` on a busybox rootfs with the configuration from ['minimal.json'](https://github.com/docker/libcontainer/blob/master/sample_configs/minimal.json).
|
This will create an container that runs `nsinit exec sh` on a busybox rootfs with the configuration from ['minimal.json'](https://github.com/docker/libcontainer/blob/master/sample_configs/minimal.json).
|
||||||
Like the previous command, you can run this on OS X too!
|
Like the previous command, you can run this on OSX too!
|
||||||
|
|
||||||
### Building libcontainer directly
|
### Building libcontainer directly
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
This document is a high-level overview of where we want to take libcontainer next.
|
This document is a high-level overview of where we want to take libcontainer next.
|
||||||
It is a curated selection of planned improvements which are either important, difficult, or both.
|
It is a curated selection of planned improvements which are either important, difficult, or both.
|
||||||
|
|
||||||
For a more complete view of planned and requested improvements, see [the GitHub issues](https://github.com/docker/libcontainer/issues).
|
For a more complete view of planned and requested improvements, see [the Github issues](https://github.com/docker/libcontainer/issues).
|
||||||
|
|
||||||
To suggest changes to the roadmap, including additions, please write the change as if it were already in effect, and make a pull request.
|
To suggest changes to the roadmap, including additions, please write the change as if it were already in effect, and make a pull request.
|
||||||
|
|
||||||
|
|
|
@ -60,7 +60,7 @@ are required to be mounted within the rootfs that the runtime will setup.
|
||||||
After a container's filesystems are mounted within the newly created
|
After a container's filesystems are mounted within the newly created
|
||||||
mount namespace `/dev` will need to be populated with a set of device nodes.
|
mount namespace `/dev` will need to be populated with a set of device nodes.
|
||||||
It is expected that a rootfs does not need to have any device nodes specified
|
It is expected that a rootfs does not need to have any device nodes specified
|
||||||
for `/dev` within the rootfs as the container will setup the correct devices
|
for `/dev` witin the rootfs as the container will setup the correct devices
|
||||||
that are required for executing a container's process.
|
that are required for executing a container's process.
|
||||||
|
|
||||||
| Path | Mode | Access |
|
| Path | Mode | Access |
|
||||||
|
|
|
@ -44,7 +44,7 @@ func newConsoleFromPath(slavePath string) *linuxConsole {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// linuxConsole is a linux pseudo TTY for use within a container.
|
// linuxConsole is a linux psuedo TTY for use within a container.
|
||||||
type linuxConsole struct {
|
type linuxConsole struct {
|
||||||
master *os.File
|
master *os.File
|
||||||
slavePath string
|
slavePath string
|
||||||
|
|
|
@ -18,7 +18,7 @@ which will give the process of the container that should be joined. Namespaces f
|
||||||
be found from `/proc/[pid]/ns` and set by `setns` syscall.
|
be found from `/proc/[pid]/ns` and set by `setns` syscall.
|
||||||
|
|
||||||
And then get the pipe number from `_LIBCONTAINER_INITPIPE`, error message could
|
And then get the pipe number from `_LIBCONTAINER_INITPIPE`, error message could
|
||||||
be transferred through it. If tty is added, `_LIBCONTAINER_CONSOLE_PATH` will
|
be transfered through it. If tty is added, `_LIBCONTAINER_CONSOLE_PATH` will
|
||||||
have value and start a console for output.
|
have value and start a console for output.
|
||||||
|
|
||||||
Finally, `nsexec()` will clone a child process , exit the parent process and let
|
Finally, `nsexec()` will clone a child process , exit the parent process and let
|
||||||
|
|
|
@ -16,7 +16,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
// joseBase64UrlEncode encodes the given data using the standard base64 url
|
// joseBase64UrlEncode encodes the given data using the standard base64 url
|
||||||
// encoding format but with all trailing '=' characters omitted in accordance
|
// encoding format but with all trailing '=' characters ommitted in accordance
|
||||||
// with the jose specification.
|
// with the jose specification.
|
||||||
// http://tools.ietf.org/html/draft-ietf-jose-json-web-signature-31#section-2
|
// http://tools.ietf.org/html/draft-ietf-jose-json-web-signature-31#section-2
|
||||||
func joseBase64UrlEncode(b []byte) string {
|
func joseBase64UrlEncode(b []byte) string {
|
||||||
|
|
|
@ -4,7 +4,7 @@ We always welcome contributions to help make `go-zfs` better. Please take a mome
|
||||||
|
|
||||||
### Reporting issues ###
|
### Reporting issues ###
|
||||||
|
|
||||||
We use [GitHub issues](https://github.com/mistifyio/go-zfs/issues) to track bug reports, feature requests, and submitting pull requests.
|
We use [Github issues](https://github.com/mistifyio/go-zfs/issues) to track bug reports, feature requests, and submitting pull requests.
|
||||||
|
|
||||||
If you find a bug:
|
If you find a bug:
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@ The tests have decent examples for most functions.
|
||||||
|
|
||||||
```go
|
```go
|
||||||
//assuming a zpool named test
|
//assuming a zpool named test
|
||||||
//error handling omitted
|
//error handling ommitted
|
||||||
|
|
||||||
|
|
||||||
f, err := zfs.CreateFilesystem("test/snapshot-test", nil)
|
f, err := zfs.CreateFilesystem("test/snapshot-test", nil)
|
||||||
|
|
|
@ -8,7 +8,7 @@ the kernel. It can be used to add and remove interfaces, set ip addresses
|
||||||
and routes, and configure ipsec. Netlink communication requires elevated
|
and routes, and configure ipsec. Netlink communication requires elevated
|
||||||
privileges, so in most cases this code needs to be run as root. Since
|
privileges, so in most cases this code needs to be run as root. Since
|
||||||
low-level netlink messages are inscrutable at best, the library attempts
|
low-level netlink messages are inscrutable at best, the library attempts
|
||||||
to provide an api that is loosely modeled on the CLI provided by iproute2.
|
to provide an api that is loosely modeled on the CLI provied by iproute2.
|
||||||
Actions like `ip link add` will be accomplished via a similarly named
|
Actions like `ip link add` will be accomplished via a similarly named
|
||||||
function like AddLink(). This library began its life as a fork of the
|
function like AddLink(). This library began its life as a fork of the
|
||||||
netlink functionality in
|
netlink functionality in
|
||||||
|
|
|
@ -38,7 +38,7 @@ func main() {
|
||||||
newns, _ := netns.New()
|
newns, _ := netns.New()
|
||||||
defer newns.Close()
|
defer newns.Close()
|
||||||
|
|
||||||
// Do something with the network namespace
|
// Do something with tne network namespace
|
||||||
ifaces, _ := net.Interfaces()
|
ifaces, _ := net.Interfaces()
|
||||||
fmt.Printf("Interfaces: %v\n", ifaces)
|
fmt.Printf("Interfaces: %v\n", ifaces)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue