mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
vendor: github.com/opencontainers/runc v1.0.2
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
This commit is contained in:
parent
14189170d1
commit
82c978ad95
3 changed files with 25 additions and 3 deletions
|
@ -88,7 +88,7 @@ google.golang.org/grpc f495f5b15ae7ccda3b38c53a1bfc
|
|||
# the containerd project first, and update both after that is merged.
|
||||
# This commit does not need to match RUNC_COMMIT as it is used for helper
|
||||
# packages but should be newer or equal.
|
||||
github.com/opencontainers/runc 4144b63817ebcc5b358fc2c8ef95f7cddd709aa7 # v1.0.1
|
||||
github.com/opencontainers/runc 52b36a2dd837e8462de8e01458bf02cf9eea47dd # v1.0.2
|
||||
github.com/opencontainers/runtime-spec 1c3f411f041711bbeecf35ff7e93461ea6789220 # v1.0.3-0.20210326190908-1c3f411f0417
|
||||
github.com/opencontainers/image-spec d60099175f88c47cd379c4738d158884749ed235 # v1.0.1
|
||||
github.com/cyphar/filepath-securejoin a261ee33d7a517f054effbf451841abaafe3e0fd # v0.2.2
|
||||
|
|
12
vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_linux.go
generated
vendored
12
vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_linux.go
generated
vendored
|
@ -131,4 +131,16 @@ type Resources struct {
|
|||
//
|
||||
// NOTE it is impossible to start a container which has this flag set.
|
||||
SkipDevices bool `json:"-"`
|
||||
|
||||
// SkipFreezeOnSet is a flag for cgroup manager to skip the cgroup
|
||||
// freeze when setting resources. Only applicable to systemd legacy
|
||||
// (i.e. cgroup v1) manager (which uses freeze by default to avoid
|
||||
// spurious permission errors caused by systemd inability to update
|
||||
// device rules in a non-disruptive manner).
|
||||
//
|
||||
// If not set, a few methods (such as looking into cgroup's
|
||||
// devices.list and querying the systemd unit properties) are used
|
||||
// during Set() to figure out whether the freeze is required. Those
|
||||
// methods may be relatively slow, thus this flag.
|
||||
SkipFreezeOnSet bool `json:"-"`
|
||||
}
|
||||
|
|
14
vendor/github.com/opencontainers/runc/libcontainer/nsenter/nsexec.c
generated
vendored
14
vendor/github.com/opencontainers/runc/libcontainer/nsenter/nsexec.c
generated
vendored
|
@ -142,7 +142,7 @@ int setns(int fd, int nstype)
|
|||
|
||||
static void write_log(const char *level, const char *format, ...)
|
||||
{
|
||||
char *message = NULL, *stage = NULL;
|
||||
char *message = NULL, *stage = NULL, *json = NULL;
|
||||
va_list args;
|
||||
int ret;
|
||||
|
||||
|
@ -164,11 +164,21 @@ static void write_log(const char *level, const char *format, ...)
|
|||
if (ret < 0)
|
||||
goto out;
|
||||
|
||||
dprintf(logfd, "{\"level\":\"%s\", \"msg\": \"%s[%d]: %s\"}\n", level, stage, getpid(), message);
|
||||
ret = asprintf(&json, "{\"level\":\"%s\", \"msg\": \"%s[%d]: %s\"}\n", level, stage, getpid(), message);
|
||||
if (ret < 0) {
|
||||
json = NULL;
|
||||
goto out;
|
||||
}
|
||||
|
||||
/* This logging is on a best-effort basis. In case of a short or failed
|
||||
* write there is nothing we can do, so just ignore write() errors.
|
||||
*/
|
||||
ssize_t __attribute__((unused)) __res = write(logfd, json, ret);
|
||||
|
||||
out:
|
||||
free(message);
|
||||
free(stage);
|
||||
free(json);
|
||||
}
|
||||
|
||||
/* XXX: This is ugly. */
|
||||
|
|
Loading…
Reference in a new issue