Merge pull request #214 from thaJeztah/19.03_backport_log-daemon-exit-before-tests-finish
[19.03 backport] Ensure all integration daemon logging happens before test exit
diff --git a/Dockerfile b/Dockerfile
index bc50584..1dad41e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,7 @@
ARG CROSS="false"
-FROM golang:1.12.4 AS base
+FROM golang:1.12.5 AS base
# allow replacing httpredir or deb mirror
ARG APT_MIRROR=deb.debian.org
RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
diff --git a/Dockerfile.e2e b/Dockerfile.e2e
index 0f5a403..bba7803 100644
--- a/Dockerfile.e2e
+++ b/Dockerfile.e2e
@@ -1,5 +1,4 @@
-## Step 1: Build tests
-FROM golang:1.12.4-alpine as builder
+FROM golang:1.12.5-alpine as base
RUN apk --no-cache add \
bash \
@@ -9,37 +8,55 @@
lvm2-dev \
jq
+RUN mkdir -p /build/
RUN mkdir -p /go/src/github.com/docker/docker/
WORKDIR /go/src/github.com/docker/docker/
-# Generate frozen images
-COPY contrib/download-frozen-image-v2.sh contrib/download-frozen-image-v2.sh
-RUN contrib/download-frozen-image-v2.sh /output/docker-frozen-images \
+FROM base AS frozen-images
+# Get useful and necessary Hub images so we can "docker load" locally instead of pulling
+COPY contrib/download-frozen-image-v2.sh /
+RUN /download-frozen-image-v2.sh /build \
buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \
busybox:latest@sha256:bbc3a03235220b170ba48a157dd097dd1379299370e1ed99ce976df0355d24f0 \
busybox:glibc@sha256:0b55a30394294ab23b9afd58fab94e61a923f5834fba7ddbae7f8e0c11ba85e6 \
debian:jessie@sha256:287a20c5f73087ab406e6b364833e3fb7b3ae63ca0eb3486555dc27ed32c6e60 \
hello-world:latest@sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c
+# See also ensureFrozenImagesLinux() in "integration-cli/fixtures_linux_daemon_test.go" (which needs to be updated when adding images to this list)
-# Install dockercli
-# Please edit hack/dockerfile/install/<name>.installer to update them.
-COPY hack/dockerfile/install hack/dockerfile/install
-RUN ./hack/dockerfile/install/install.sh dockercli
-
-# Set tag and add sources
-ARG DOCKER_GITCOMMIT
-ENV DOCKER_GITCOMMIT=${DOCKER_GITCOMMIT:-undefined}
-ADD . .
+FROM base AS dockercli
+ENV INSTALL_BINARY_NAME=dockercli
+COPY hack/dockerfile/install/install.sh ./install.sh
+COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./
+RUN PREFIX=/build ./install.sh $INSTALL_BINARY_NAME
# Build DockerSuite.TestBuild* dependency
-RUN CGO_ENABLED=0 go build -buildmode=pie -o /output/httpserver github.com/docker/docker/contrib/httpserver
+FROM base AS contrib
+COPY contrib/syscall-test /build/syscall-test
+COPY contrib/httpserver/Dockerfile /build/httpserver/Dockerfile
+COPY contrib/httpserver contrib/httpserver
+RUN CGO_ENABLED=0 go build -buildmode=pie -o /build/httpserver/httpserver github.com/docker/docker/contrib/httpserver
-# Build the integration tests and copy the resulting binaries to /output/tests
+# Build the integration tests and copy the resulting binaries to /build/tests
+FROM base AS builder
+
+# Set tag and add sources
+COPY . .
+# Copy test sources tests that use assert can print errors
+RUN mkdir -p /build${PWD} && find integration integration-cli -name \*_test.go -exec cp --parents '{}' /build${PWD} \;
+# Build and install test binaries
+ARG DOCKER_GITCOMMIT=undefined
RUN hack/make.sh build-integration-test-binary
-RUN mkdir -p /output/tests && find . -name test.main -exec cp --parents '{}' /output/tests \;
+RUN mkdir -p /build/tests && find . -name test.main -exec cp --parents '{}' /build/tests \;
-## Step 2: Generate testing image
-FROM alpine:3.8 as runner
+## Generate testing image
+FROM alpine:3.9 as runner
+
+ENV DOCKER_REMOTE_DAEMON=1
+ENV DOCKER_INTEGRATION_DAEMON_DEST=/
+ENTRYPOINT ["/scripts/run.sh"]
+
+# Add an unprivileged user to be used for tests which need it
+RUN addgroup docker && adduser -D -G docker unprivilegeduser -s /bin/ash
# GNU tar is used for generating the emptyfs image
RUN apk --no-cache add \
@@ -52,21 +69,14 @@
tar \
xz
-# Add an unprivileged user to be used for tests which need it
-RUN addgroup docker && adduser -D -G docker unprivilegeduser -s /bin/ash
+COPY hack/test/e2e-run.sh /scripts/run.sh
+COPY hack/make/.ensure-emptyfs /scripts/ensure-emptyfs.sh
-COPY contrib/httpserver/Dockerfile /tests/contrib/httpserver/Dockerfile
-COPY contrib/syscall-test /tests/contrib/syscall-test
-COPY integration-cli/fixtures /tests/integration-cli/fixtures
+COPY integration/testdata /tests/integration/testdata
+COPY integration/build/testdata /tests/integration/build/testdata
+COPY integration-cli/fixtures /tests/integration-cli/fixtures
-COPY hack/test/e2e-run.sh /scripts/run.sh
-COPY hack/make/.ensure-emptyfs /scripts/ensure-emptyfs.sh
-
-COPY --from=builder /output/docker-frozen-images /docker-frozen-images
-COPY --from=builder /output/httpserver /tests/contrib/httpserver/httpserver
-COPY --from=builder /output/tests /tests
-COPY --from=builder /usr/local/bin/docker /usr/bin/docker
-
-ENV DOCKER_REMOTE_DAEMON=1 DOCKER_INTEGRATION_DAEMON_DEST=/
-
-ENTRYPOINT ["/scripts/run.sh"]
+COPY --from=frozen-images /build/ /docker-frozen-images
+COPY --from=dockercli /build/ /usr/bin/
+COPY --from=contrib /build/ /tests/contrib/
+COPY --from=builder /build/ /
diff --git a/Dockerfile.simple b/Dockerfile.simple
index eb73211..d707d5c 100644
--- a/Dockerfile.simple
+++ b/Dockerfile.simple
@@ -5,7 +5,7 @@
# This represents the bare minimum required to build and test Docker.
-FROM golang:1.12.4
+FROM golang:1.12.5
# allow replacing httpredir or deb mirror
ARG APT_MIRROR=deb.debian.org
diff --git a/Dockerfile.windows b/Dockerfile.windows
index 4e49369..8edcc92 100644
--- a/Dockerfile.windows
+++ b/Dockerfile.windows
@@ -168,7 +168,7 @@
# Environment variable notes:
# - GO_VERSION must be consistent with 'Dockerfile' used by Linux.
# - FROM_DOCKERFILE is used for detection of building within a container.
-ENV GO_VERSION=1.12.4 `
+ENV GO_VERSION=1.12.5 `
GIT_VERSION=2.11.1 `
GOPATH=C:\go `
FROM_DOCKERFILE=1
diff --git a/builder/builder-next/adapters/containerimage/pull.go b/builder/builder-next/adapters/containerimage/pull.go
index 406bcd9..dd9f5cf 100644
--- a/builder/builder-next/adapters/containerimage/pull.go
+++ b/builder/builder-next/adapters/containerimage/pull.go
@@ -842,7 +842,7 @@
r.mu.Lock()
defer r.mu.Unlock()
- ref = r.domain(ref) + "-" + session.FromContext(ctx)
+ ref = r.repo(ref) + "-" + session.FromContext(ctx)
cr, ok := r.m[ref]
cr.timeout = time.Now().Add(time.Minute)
@@ -855,19 +855,19 @@
return &cr
}
-func (r *resolverCache) domain(refStr string) string {
+func (r *resolverCache) repo(refStr string) string {
ref, err := distreference.ParseNormalizedNamed(refStr)
if err != nil {
return refStr
}
- return distreference.Domain(ref)
+ return ref.Name()
}
func (r *resolverCache) Get(ctx context.Context, ref string) remotes.Resolver {
r.mu.Lock()
defer r.mu.Unlock()
- ref = r.domain(ref) + "-" + session.FromContext(ctx)
+ ref = r.repo(ref) + "-" + session.FromContext(ctx)
cr, ok := r.m[ref]
if !ok {
diff --git a/cmd/dockerd/config_common_unix.go b/cmd/dockerd/config_common_unix.go
index c652628..021b2b2 100644
--- a/cmd/dockerd/config_common_unix.go
+++ b/cmd/dockerd/config_common_unix.go
@@ -9,12 +9,11 @@
"github.com/docker/docker/daemon/config"
"github.com/docker/docker/opts"
"github.com/docker/docker/pkg/homedir"
- "github.com/docker/docker/rootless"
"github.com/spf13/pflag"
)
func getDefaultPidFile() (string, error) {
- if !rootless.RunningWithNonRootUsername() {
+ if !honorXDG {
return "/var/run/docker.pid", nil
}
runtimeDir, err := homedir.GetRuntimeDir()
@@ -25,7 +24,7 @@
}
func getDefaultDataRoot() (string, error) {
- if !rootless.RunningWithNonRootUsername() {
+ if !honorXDG {
return "/var/lib/docker", nil
}
dataHome, err := homedir.GetDataHome()
@@ -36,7 +35,7 @@
}
func getDefaultExecRoot() (string, error) {
- if !rootless.RunningWithNonRootUsername() {
+ if !honorXDG {
return "/var/run/docker", nil
}
runtimeDir, err := homedir.GetRuntimeDir()
diff --git a/cmd/dockerd/config_unix.go b/cmd/dockerd/config_unix.go
index cc42ff3..d2a8cd2 100644
--- a/cmd/dockerd/config_unix.go
+++ b/cmd/dockerd/config_unix.go
@@ -3,10 +3,13 @@
package main
import (
+ "os/exec"
+
"github.com/docker/docker/daemon/config"
"github.com/docker/docker/opts"
"github.com/docker/docker/rootless"
"github.com/docker/go-units"
+ "github.com/pkg/errors"
"github.com/spf13/pflag"
)
@@ -35,7 +38,16 @@
flags.BoolVar(&conf.BridgeConfig.EnableIPv6, "ipv6", false, "Enable IPv6 networking")
flags.StringVar(&conf.BridgeConfig.FixedCIDRv6, "fixed-cidr-v6", "", "IPv6 subnet for fixed IPs")
flags.BoolVar(&conf.BridgeConfig.EnableUserlandProxy, "userland-proxy", true, "Use userland proxy for loopback traffic")
- flags.StringVar(&conf.BridgeConfig.UserlandProxyPath, "userland-proxy-path", "", "Path to the userland proxy binary")
+ defaultUserlandProxyPath := ""
+ if rootless.RunningWithRootlessKit() {
+ var err error
+ // use rootlesskit-docker-proxy for exposing the ports in RootlessKit netns to the initial namespace.
+ defaultUserlandProxyPath, err = exec.LookPath(rootless.RootlessKitDockerProxyBinary)
+ if err != nil {
+ return errors.Wrapf(err, "running with RootlessKit, but %s not installed", rootless.RootlessKitDockerProxyBinary)
+ }
+ }
+ flags.StringVar(&conf.BridgeConfig.UserlandProxyPath, "userland-proxy-path", defaultUserlandProxyPath, "Path to the userland proxy binary")
flags.StringVar(&conf.CgroupParent, "cgroup-parent", "", "Set parent cgroup for all containers")
flags.StringVar(&conf.RemappedRoot, "userns-remap", "", "User/Group setting for user namespaces")
flags.BoolVar(&conf.LiveRestoreEnabled, "live-restore", false, "Enable live restore of docker when containers are still running")
@@ -49,7 +61,8 @@
flags.BoolVar(&conf.NoNewPrivileges, "no-new-privileges", false, "Set no-new-privileges by default for new containers")
flags.StringVar(&conf.IpcMode, "default-ipc-mode", config.DefaultIpcMode, `Default mode for containers ipc ("shareable" | "private")`)
flags.Var(&conf.NetworkConfig.DefaultAddressPools, "default-address-pool", "Default address pools for node specific local networks")
- // Mostly users don't need to set this flag explicitly.
- flags.BoolVar(&conf.Rootless, "rootless", rootless.RunningWithNonRootUsername(), "Enable rootless mode (experimental)")
+ // rootless needs to be explicitly specified for running "rootful" dockerd in rootless dockerd (#38702)
+ // Note that defaultUserlandProxyPath and honorXDG are configured according to the value of rootless.RunningWithRootlessKit, not the value of --rootless.
+ flags.BoolVar(&conf.Rootless, "rootless", rootless.RunningWithRootlessKit(), "Enable rootless mode; typically used with RootlessKit (experimental)")
return nil
}
diff --git a/cmd/dockerd/daemon.go b/cmd/dockerd/daemon.go
index b1fad91..fcb7b0b 100644
--- a/cmd/dockerd/daemon.go
+++ b/cmd/dockerd/daemon.go
@@ -103,6 +103,12 @@
if cli.Config.IsRootless() {
logrus.Warn("Running in rootless mode. Cgroups, AppArmor, and CRIU are disabled.")
}
+ if rootless.RunningWithRootlessKit() {
+ logrus.Info("Running with RootlessKit integration")
+ if !cli.Config.IsRootless() {
+ return fmt.Errorf("rootless mode needs to be enabled for running with RootlessKit")
+ }
+ }
} else {
if cli.Config.IsRootless() {
return fmt.Errorf("rootless mode is supported only when running in experimental mode")
@@ -591,7 +597,7 @@
var hosts []string
for i := 0; i < len(cli.Config.Hosts); i++ {
var err error
- if cli.Config.Hosts[i], err = dopts.ParseHost(cli.Config.TLS, rootless.RunningWithNonRootUsername(), cli.Config.Hosts[i]); err != nil {
+ if cli.Config.Hosts[i], err = dopts.ParseHost(cli.Config.TLS, honorXDG, cli.Config.Hosts[i]); err != nil {
return nil, errors.Wrapf(err, "error parsing -H %s", cli.Config.Hosts[i])
}
@@ -668,9 +674,9 @@
return nil
}
-func systemContainerdRunning(isRootless bool) (string, bool, error) {
+func systemContainerdRunning(honorXDG bool) (string, bool, error) {
addr := containerddefaults.DefaultAddress
- if isRootless {
+ if honorXDG {
runtimeDir, err := homedir.GetRuntimeDir()
if err != nil {
return "", false, err
diff --git a/cmd/dockerd/daemon_unix.go b/cmd/dockerd/daemon_unix.go
index 2876c05..8f74026 100644
--- a/cmd/dockerd/daemon_unix.go
+++ b/cmd/dockerd/daemon_unix.go
@@ -18,14 +18,13 @@
"github.com/docker/docker/daemon/config"
"github.com/docker/docker/libcontainerd/supervisor"
"github.com/docker/docker/pkg/homedir"
- "github.com/docker/docker/rootless"
"github.com/docker/libnetwork/portallocator"
"github.com/pkg/errors"
"golang.org/x/sys/unix"
)
func getDefaultDaemonConfigDir() (string, error) {
- if !rootless.RunningWithNonRootUsername() {
+ if !honorXDG {
return "/etc/docker", nil
}
// NOTE: CLI uses ~/.docker while the daemon uses ~/.config/docker, because
@@ -148,7 +147,7 @@
func (cli *DaemonCli) initContainerD(ctx context.Context) (func(time.Duration) error, error) {
var waitForShutdown func(time.Duration) error
if cli.Config.ContainerdAddr == "" {
- systemContainerdAddr, ok, err := systemContainerdRunning(cli.Config.IsRootless())
+ systemContainerdAddr, ok, err := systemContainerdRunning(honorXDG)
if err != nil {
return nil, errors.Wrap(err, "could not determine whether the system containerd is running")
}
diff --git a/cmd/dockerd/docker.go b/cmd/dockerd/docker.go
index 4b4f5ac..bace6be 100644
--- a/cmd/dockerd/docker.go
+++ b/cmd/dockerd/docker.go
@@ -10,11 +10,16 @@
"github.com/docker/docker/pkg/jsonmessage"
"github.com/docker/docker/pkg/reexec"
"github.com/docker/docker/pkg/term"
+ "github.com/docker/docker/rootless"
"github.com/moby/buildkit/util/apicaps"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
+var (
+ honorXDG bool
+)
+
func newDaemonCommand() (*cobra.Command, error) {
opts := newDaemonOptions(config.New())
@@ -53,6 +58,14 @@
if dockerversion.ProductName != "" {
apicaps.ExportedProduct = dockerversion.ProductName
}
+ // When running with RootlessKit, $XDG_RUNTIME_DIR, $XDG_DATA_HOME, and $XDG_CONFIG_HOME needs to be
+ // honored as the default dirs, because we are unlikely to have permissions to access the system-wide
+ // directories.
+ //
+ // Note that even running with --rootless, when not running with RootlessKit, honorXDG needs to be kept false,
+ // because the system-wide directories in the current mount namespace are expected to be accessible.
+ // ("rootful" dockerd in rootless dockerd, #38702)
+ honorXDG = rootless.RunningWithRootlessKit()
}
func main() {
diff --git a/contrib/dockerd-rootless.sh b/contrib/dockerd-rootless.sh
index bfd0117..3206134 100755
--- a/contrib/dockerd-rootless.sh
+++ b/contrib/dockerd-rootless.sh
@@ -9,7 +9,9 @@
# External dependencies:
# * newuidmap and newgidmap needs to be installed.
# * /etc/subuid and /etc/subgid needs to be configured for the current user.
-# * Either slirp4netns (v0.3+) or VPNKit needs to be installed.
+# * Either one of slirp4netns (v0.3+), VPNKit, lxc-user-nic needs to be installed.
+# slirp4netns is used by default if installed. Otherwise fallsback to VPNKit.
+# The default value can be overridden with $DOCKERD_ROOTLESS_ROOTLESSKIT_NET=(slirp4netns|vpnkit|lxc-user-nic)
#
# See the documentation for the further information.
@@ -35,24 +37,32 @@
exit 1
fi
-net=""
-mtu=""
-if which slirp4netns >/dev/null 2>&1; then
- if slirp4netns --help | grep -- --disable-host-loopback; then
- net=slirp4netns
- mtu=65520
- else
- echo "slirp4netns does not support --disable-host-loopback. Falling back to VPNKit."
+: "${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:=}"
+: "${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:=}"
+net=$DOCKERD_ROOTLESS_ROOTLESSKIT_NET
+mtu=$DOCKERD_ROOTLESS_ROOTLESSKIT_MTU
+if [ -z $net ]; then
+ if which slirp4netns >/dev/null 2>&1; then
+ if slirp4netns --help | grep -- --disable-host-loopback; then
+ net=slirp4netns
+ if [ -z $mtu ]; then
+ mtu=65520
+ fi
+ else
+ echo "slirp4netns does not support --disable-host-loopback. Falling back to VPNKit."
+ fi
+ fi
+ if [ -z $net ]; then
+ if which vpnkit >/dev/null 2>&1; then
+ net=vpnkit
+ else
+ echo "Either slirp4netns (v0.3+) or vpnkit needs to be installed"
+ exit 1
+ fi
fi
fi
-if [ -z $net ]; then
- if which vpnkit >/dev/null 2>&1; then
- net=vpnkit
- mtu=1500
- else
- echo "Either slirp4netns (v0.3+) or vpnkit needs to be installed"
- exit 1
- fi
+if [ -z $mtu ]; then
+ mtu=1500
fi
if [ -z $_DOCKERD_ROOTLESS_CHILD ]; then
@@ -66,7 +76,8 @@
# (by either systemd-networkd or NetworkManager)
# * /run: copy-up is required so that we can create /run/docker (hardcoded for plugins) in our namespace
$rootlesskit \
- --net=$net --mtu=$mtu --disable-host-loopback --port-driver=builtin \
+ --net=$net --mtu=$mtu \
+ --disable-host-loopback --port-driver=builtin \
--copy-up=/etc --copy-up=/run \
$DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS \
$0 $@
diff --git a/daemon/cluster/executor/container/controller.go b/daemon/cluster/executor/container/controller.go
index 5552b13..ec758c5 100644
--- a/daemon/cluster/executor/container/controller.go
+++ b/daemon/cluster/executor/container/controller.go
@@ -376,6 +376,15 @@
return err
}
+ // Try removing networks referenced in this task in case this
+ // task is the last one referencing it
+ if err := r.adapter.removeNetworks(ctx); err != nil {
+ if isUnknownContainer(err) {
+ return nil
+ }
+ return err
+ }
+
return nil
}
@@ -419,15 +428,6 @@
log.G(ctx).WithError(err).Debug("shutdown failed on removal")
}
- // Try removing networks referenced in this task in case this
- // task is the last one referencing it
- if err := r.adapter.removeNetworks(ctx); err != nil {
- if isUnknownContainer(err) {
- return nil
- }
- return err
- }
-
if err := r.adapter.remove(ctx); err != nil {
if isUnknownContainer(err) {
return nil
diff --git a/docs/rootless.md b/docs/rootless.md
index b84a4f3..9cf6dd7 100644
--- a/docs/rootless.md
+++ b/docs/rootless.md
@@ -20,7 +20,6 @@
penguin:231072:65536
```
-* Either [slirp4netns](https://github.com/rootless-containers/slirp4netns) (v0.3+) or [VPNKit](https://github.com/moby/vpnkit) needs to be installed. slirp4netns is preferred for the best performance.
### Distribution-specific hint
@@ -55,10 +54,9 @@
You need to run `dockerd-rootless.sh` instead of `dockerd`.
```console
-$ dockerd-rootless.sh --experimental --userland-proxy --userland-proxy-path=$(which rootlesskit-docker-proxy)"
+$ dockerd-rootless.sh --experimental
```
As Rootless mode is experimental per se, currently you always need to run `dockerd-rootless.sh` with `--experimental`.
-Also, to expose ports, you need to set `--userland-proxy-path` to the path of `rootlesskit-docker-proxy` binary.
Remarks:
* The socket path is set to `$XDG_RUNTIME_DIR/docker.sock` by default. `$XDG_RUNTIME_DIR` is typically set to `/run/user/$UID`.
@@ -82,3 +80,12 @@
```console
$ sudo sh -c "echo 0 2147483647 > /proc/sys/net/ipv4/ping_group_range"
```
+
+### Changing network stack
+
+`dockerd-rootless.sh` uses [slirp4netns](https://github.com/rootless-containers/slirp4netns) (if installed) or [VPNKit](https://github.com/moby/vpnkit) as the network stack by default.
+These network stacks run in userspace and might have performance overhead. See [RootlessKit documentation](https://github.com/rootless-containers/rootlesskit/tree/v0.4.0#network-drivers) for further information.
+
+Optionally, you can use `lxc-user-nic` instead for the best performance.
+To use `lxc-user-nic`, you need to edit [`/etc/lxc/lxc-usernet`](https://github.com/rootless-containers/rootlesskit/tree/v0.4.0#--netlxc-user-nic-experimental) and set `$DOCKERD_ROOTLESS_ROOTLESSKIT_NET=lxc-user-nic`.
+
diff --git a/hack/dockerfile/install/rootlesskit.installer b/hack/dockerfile/install/rootlesskit.installer
index 7765d30..7872640 100755
--- a/hack/dockerfile/install/rootlesskit.installer
+++ b/hack/dockerfile/install/rootlesskit.installer
@@ -1,7 +1,7 @@
#!/bin/sh
-# v0.3.0
-ROOTLESSKIT_COMMIT=70e0502f328bc5ffb14692a7ea41abb77196043b
+# v0.4.0
+ROOTLESSKIT_COMMIT=e92d5e772ee7e103aecf380c5874a40c52876ff0
install_rootlesskit() {
case "$1" in
diff --git a/hack/dockerfile/install/runc.installer b/hack/dockerfile/install/runc.installer
index bfe5f41..dd9950f 100755
--- a/hack/dockerfile/install/runc.installer
+++ b/hack/dockerfile/install/runc.installer
@@ -4,7 +4,7 @@
# The version of runc should match the version that is used by the containerd
# version that is used. If you need to update runc, open a pull request in
# the containerd project first, and update both after that is merged.
-RUNC_COMMIT=029124da7af7360afa781a0234d1b083550f797c # v1.0.0-rc7-6-g029124da
+RUNC_COMMIT=425e105d5a03fabd737a126ad93d62a9eeede87f # v1.0.0-rc8
install_runc() {
# If using RHEL7 kernels (3.10.0 el7), disable kmem accounting/limiting
diff --git a/integration-cli/docker_api_containers_test.go b/integration-cli/docker_api_containers_test.go
index 3318f9f..c55a358 100644
--- a/integration-cli/docker_api_containers_test.go
+++ b/integration-cli/docker_api_containers_test.go
@@ -623,29 +623,6 @@
c.Assert(msg, checker.Contains, "net3")
}
-func (s *DockerSuite) TestContainerAPICreateWithHostName(c *check.C) {
- domainName := "test-domain"
- hostName := "test-hostname"
- config := containertypes.Config{
- Image: "busybox",
- Hostname: hostName,
- Domainname: domainName,
- }
-
- cli, err := client.NewClientWithOpts(client.FromEnv)
- assert.NilError(c, err)
- defer cli.Close()
-
- container, err := cli.ContainerCreate(context.Background(), &config, &containertypes.HostConfig{}, &networktypes.NetworkingConfig{}, "")
- assert.NilError(c, err)
-
- containerJSON, err := cli.ContainerInspect(context.Background(), container.ID)
- assert.NilError(c, err)
-
- c.Assert(containerJSON.Config.Hostname, checker.Equals, hostName, check.Commentf("Mismatched Hostname"))
- c.Assert(containerJSON.Config.Domainname, checker.Equals, domainName, check.Commentf("Mismatched Domainname"))
-}
-
func (s *DockerSuite) TestContainerAPICreateBridgeNetworkMode(c *check.C) {
// Windows does not support bridge
testRequires(c, DaemonIsLinux)
diff --git a/integration/build/build_test.go b/integration/build/build_test.go
index c09f746..183e714 100644
--- a/integration/build/build_test.go
+++ b/integration/build/build_test.go
@@ -468,6 +468,7 @@
}
func TestBuildWithEmptyDockerfile(t *testing.T) {
+ skip.If(t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.40"), "broken in earlier versions")
ctx := context.TODO()
defer setupTest(t)()
diff --git a/integration/container/ipcmode_linux_test.go b/integration/container/ipcmode_linux_test.go
index b4a9a15..5b07c0e 100644
--- a/integration/container/ipcmode_linux_test.go
+++ b/integration/container/ipcmode_linux_test.go
@@ -300,12 +300,14 @@
// by default, even when the daemon default is private.
func TestIpcModeOlderClient(t *testing.T) {
skip.If(t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.40"), "requires a daemon with DefaultIpcMode: private")
+ c := testEnv.APIClient()
+ skip.If(t, versions.LessThan(c.ClientVersion(), "1.40"), "requires client API >= 1.40")
+
t.Parallel()
ctx := context.Background()
// pre-check: default ipc mode in daemon is private
- c := testEnv.APIClient()
cID := container.Create(t, ctx, c, container.WithAutoRemove)
inspect, err := c.ContainerInspect(ctx, cID)
diff --git a/integration/container/run_linux_test.go b/integration/container/run_linux_test.go
index dfdde57..ec088ec 100644
--- a/integration/container/run_linux_test.go
+++ b/integration/container/run_linux_test.go
@@ -50,6 +50,10 @@
}
func TestNISDomainname(t *testing.T) {
+ // Older versions of the daemon would concatenate hostname and domainname,
+ // so hostname "foobar" and domainname "baz.cyphar.com" would produce
+ // `foobar.baz.cyphar.com` as hostname.
+ skip.If(t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.40"), "skip test from new feature")
skip.If(t, testEnv.DaemonInfo.OSType != "linux")
defer setupTest(t)()
diff --git a/integration/image/list_test.go b/integration/image/list_test.go
index 5b381d1..dcbd8c4 100644
--- a/integration/image/list_test.go
+++ b/integration/image/list_test.go
@@ -6,12 +6,15 @@
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters"
+ "github.com/docker/docker/api/types/versions"
"gotest.tools/assert"
is "gotest.tools/assert/cmp"
+ "gotest.tools/skip"
)
// Regression : #38171
func TestImagesFilterMultiReference(t *testing.T) {
+ skip.If(t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.40"), "broken in earlier versions")
defer setupTest(t)()
client := testEnv.APIClient()
ctx := context.Background()
diff --git a/integration/service/update_test.go b/integration/service/update_test.go
index 0fdc238..92a4368 100644
--- a/integration/service/update_test.go
+++ b/integration/service/update_test.go
@@ -7,6 +7,7 @@
"github.com/docker/docker/api/types"
swarmtypes "github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/client"
+ "github.com/docker/docker/integration/internal/network"
"github.com/docker/docker/integration/internal/swarm"
"gotest.tools/assert"
is "gotest.tools/assert/cmp"
@@ -194,6 +195,59 @@
assert.NilError(t, err)
}
+func TestServiceUpdateNetwork(t *testing.T) {
+ skip.If(t, testEnv.DaemonInfo.OSType != "linux")
+ defer setupTest(t)()
+ d := swarm.NewSwarm(t, testEnv)
+ defer d.Stop(t)
+ cli := d.NewClientT(t)
+ defer cli.Close()
+
+ ctx := context.Background()
+
+ // Create a overlay network
+ testNet := "testNet" + t.Name()
+ overlayID := network.CreateNoError(t, ctx, cli, testNet,
+ network.WithDriver("overlay"))
+
+ var instances uint64 = 1
+ // Create service with the overlay network
+ serviceName := "TestServiceUpdateNetworkRM_" + t.Name()
+ serviceID := swarm.CreateService(t, d,
+ swarm.ServiceWithReplicas(instances),
+ swarm.ServiceWithName(serviceName),
+ swarm.ServiceWithNetwork(testNet))
+
+ poll.WaitOn(t, swarm.RunningTasksCount(cli, serviceID, instances), swarm.ServicePoll)
+ service := getService(t, cli, serviceID)
+ netInfo, err := cli.NetworkInspect(ctx, testNet, types.NetworkInspectOptions{
+ Verbose: true,
+ Scope: "swarm",
+ })
+ assert.NilError(t, err)
+ assert.Assert(t, len(netInfo.Containers) == 2, "Expected 2 endpoints, one for container and one for LB Sandbox")
+
+ //Remove network from service
+ service.Spec.TaskTemplate.Networks = []swarmtypes.NetworkAttachmentConfig{}
+ _, err = cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, types.ServiceUpdateOptions{})
+ assert.NilError(t, err)
+ poll.WaitOn(t, serviceIsUpdated(cli, serviceID), swarm.ServicePoll)
+
+ netInfo, err = cli.NetworkInspect(ctx, testNet, types.NetworkInspectOptions{
+ Verbose: true,
+ Scope: "swarm",
+ })
+
+ assert.NilError(t, err)
+ assert.Assert(t, len(netInfo.Containers) == 0, "Load balancing endpoint still exists in network")
+
+ err = cli.NetworkRemove(ctx, overlayID)
+ assert.NilError(t, err)
+
+ err = cli.ServiceRemove(ctx, serviceID)
+ assert.NilError(t, err)
+}
+
func getService(t *testing.T, cli client.ServiceAPIClient, serviceID string) swarmtypes.Service {
t.Helper()
service, _, err := cli.ServiceInspectWithRaw(context.Background(), serviceID, types.ServiceInspectOptions{})
diff --git a/integration/system/ping_test.go b/integration/system/ping_test.go
index 6eba927..9858bfd 100644
--- a/integration/system/ping_test.go
+++ b/integration/system/ping_test.go
@@ -12,6 +12,7 @@
)
func TestPingCacheHeaders(t *testing.T) {
+ skip.If(t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.40"), "skip test from new feature")
defer setupTest(t)()
res, _, err := request.Get("/_ping")
diff --git a/integration/system/uuid_test.go b/integration/system/uuid_test.go
index ec7cd4f..d6df8fd 100644
--- a/integration/system/uuid_test.go
+++ b/integration/system/uuid_test.go
@@ -4,11 +4,14 @@
"context"
"testing"
+ "github.com/docker/docker/api/types/versions"
"github.com/google/uuid"
"gotest.tools/assert"
+ "gotest.tools/skip"
)
func TestUUIDGeneration(t *testing.T) {
+ skip.If(t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.40"), "ID format changed")
defer setupTest(t)()
c := testEnv.APIClient()
@@ -16,5 +19,5 @@
assert.NilError(t, err)
_, err = uuid.Parse(info.ID)
- assert.NilError(t, err)
+ assert.NilError(t, err, info.ID)
}
diff --git a/integration/volume/volume_test.go b/integration/volume/volume_test.go
index 7bc33e9..b2ee810 100644
--- a/integration/volume/volume_test.go
+++ b/integration/volume/volume_test.go
@@ -40,12 +40,20 @@
}
assert.Check(t, is.DeepEqual(vol, expected, cmpopts.EquateEmpty()))
- volumes, err := client.VolumeList(ctx, filters.Args{})
+ volList, err := client.VolumeList(ctx, filters.Args{})
assert.NilError(t, err)
+ assert.Assert(t, len(volList.Volumes) > 0)
- assert.Check(t, is.Equal(len(volumes.Volumes), 1))
- assert.Check(t, volumes.Volumes[0] != nil)
- assert.Check(t, is.DeepEqual(*volumes.Volumes[0], expected, cmpopts.EquateEmpty()))
+ volumes := volList.Volumes[:0]
+ for _, v := range volList.Volumes {
+ if v.Name == vol.Name {
+ volumes = append(volumes, v)
+ }
+ }
+
+ assert.Check(t, is.Equal(len(volumes), 1))
+ assert.Check(t, volumes[0] != nil)
+ assert.Check(t, is.DeepEqual(*volumes[0], expected, cmpopts.EquateEmpty()))
}
func TestVolumesRemove(t *testing.T) {
diff --git a/opts/hosts.go b/opts/hosts.go
index 3d8785f..a6f2662 100644
--- a/opts/hosts.go
+++ b/opts/hosts.go
@@ -45,13 +45,13 @@
}
// ParseHost and set defaults for a Daemon host string.
-// defaultToTLS is preferred over defaultToUnixRootless.
-func ParseHost(defaultToTLS, defaultToUnixRootless bool, val string) (string, error) {
+// defaultToTLS is preferred over defaultToUnixXDG.
+func ParseHost(defaultToTLS, defaultToUnixXDG bool, val string) (string, error) {
host := strings.TrimSpace(val)
if host == "" {
if defaultToTLS {
host = DefaultTLSHost
- } else if defaultToUnixRootless {
+ } else if defaultToUnixXDG {
runtimeDir, err := homedir.GetRuntimeDir()
if err != nil {
return "", err
diff --git a/rootless/rootless.go b/rootless/rootless.go
index cb4f897..376d526 100644
--- a/rootless/rootless.go
+++ b/rootless/rootless.go
@@ -5,22 +5,21 @@
"sync"
)
-var (
- runningWithNonRootUsername bool
- runningWithNonRootUsernameOnce sync.Once
+const (
+ // RootlessKitDockerProxyBinary is the binary name of rootlesskit-docker-proxy
+ RootlessKitDockerProxyBinary = "rootlesskit-docker-proxy"
)
-// RunningWithNonRootUsername returns true if we $USER is set to a non-root value,
-// regardless to the UID/EUID value.
-//
-// The value of this variable is mostly used for configuring default paths.
-// If the value is true, $HOME and $XDG_RUNTIME_DIR should be honored for setting up the default paths.
-// If false (not only EUID==0 but also $USER==root), $HOME and $XDG_RUNTIME_DIR should be ignored
-// even if we are in a user namespace.
-func RunningWithNonRootUsername() bool {
- runningWithNonRootUsernameOnce.Do(func() {
- u := os.Getenv("USER")
- runningWithNonRootUsername = u != "" && u != "root"
+var (
+ runningWithRootlessKit bool
+ runningWithRootlessKitOnce sync.Once
+)
+
+// RunningWithRootlessKit returns true if running under RootlessKit namespaces.
+func RunningWithRootlessKit() bool {
+ runningWithRootlessKitOnce.Do(func() {
+ u := os.Getenv("ROOTLESSKIT_STATE_DIR")
+ runningWithRootlessKit = u != ""
})
- return runningWithNonRootUsername
+ return runningWithRootlessKit
}
diff --git a/vendor.conf b/vendor.conf
index 78b0bef..ae99800 100644
--- a/vendor.conf
+++ b/vendor.conf
@@ -80,7 +80,7 @@
# 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 029124da7af7360afa781a0234d1b083550f797c # v1.0.0-rc7-6-g029124da
+github.com/opencontainers/runc 425e105d5a03fabd737a126ad93d62a9eeede87f # v1.0.0-rc8
github.com/opencontainers/runtime-spec 29686dbc5559d93fb1ef402eeda3e35c38d75af4 # v1.0.1-59-g29686db
github.com/opencontainers/image-spec d60099175f88c47cd379c4738d158884749ed235 # v1.0.1
github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0
@@ -162,6 +162,6 @@
# metrics
github.com/docker/go-metrics d466d4f6fd960e01820085bd7e1a24426ee7ef18
-github.com/opencontainers/selinux 0bb7b9fa9ba5c1120e9d22caed4961fca4228408 # v1.2.1
+github.com/opencontainers/selinux 3a1f366feb7aecbf7a0e71ac4cea88b31597de9e # v1.2.2
# DO NOT EDIT BELOW THIS LINE -------- reserved for downstream projects --------
diff --git a/vendor/github.com/opencontainers/runc/vendor.conf b/vendor/github.com/opencontainers/runc/vendor.conf
index fb97650..22cba0f 100644
--- a/vendor/github.com/opencontainers/runc/vendor.conf
+++ b/vendor/github.com/opencontainers/runc/vendor.conf
@@ -5,7 +5,7 @@
# Core libcontainer functionality.
github.com/checkpoint-restore/go-criu v3.11
github.com/mrunalp/fileutils ed869b029674c0e9ce4c0dfa781405c2d9946d08
-github.com/opencontainers/selinux v1.2.1
+github.com/opencontainers/selinux v1.2.2
github.com/seccomp/libseccomp-golang 84e90a91acea0f4e51e62bc1a75de18b1fc0790f
github.com/sirupsen/logrus a3f95b5c423586578a4e099b11a46c2479628cac
github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16
diff --git a/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go b/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go
index 51fa8de..d7786c3 100644
--- a/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go
+++ b/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go
@@ -406,7 +406,14 @@
// SetKeyLabel takes a process label and tells the kernel to assign the
// label to the next kernel keyring that gets created
func SetKeyLabel(label string) error {
- return writeCon("/proc/self/attr/keycreate", label)
+ err := writeCon("/proc/self/attr/keycreate", label)
+ if os.IsNotExist(err) {
+ return nil
+ }
+ if label == "" && os.IsPermission(err) && !GetEnabled() {
+ return nil
+ }
+ return err
}
// KeyLabel retrieves the current kernel keyring label setting
