Skip to content

Instantly share code, notes, and snippets.

diff --git a/integration-cli/docker_cli_run_unix_test.go b/integration-cli/docker_cli_run_unix_test.go
index a8fdac0..a3d0a35 100644
--- a/integration-cli/docker_cli_run_unix_test.go
+++ b/integration-cli/docker_cli_run_unix_test.go
@@ -227,6 +227,7 @@ func (s *DockerSuite) TestRunEchoStdoutWitCPUShares(c *check.C) {
func (s *DockerSuite) TestRunEchoStdoutWithCPUSharesAndMemoryLimit(c *check.C) {
testRequires(c, cpuShare)
testRequires(c, memoryLimitSupport)
+ testRequires(c, swapMemorySupport)
out, _ := dockerCmd(c, "run", "--cpu-shares", "1000", "-m", "16m", "busybox", "echo", "test")
$ AUTO_GOPATH=1 BUILDFLAGS="-race" DOCKER_BUILDTAGS="experimental selinux journald exclude_graphdriver_btrfs exclude_graphdriver_zfs exclude_graphdriver_aufs exclude_graphdriver_devicemapper" ./hack/make.sh dynbinary
$ sudo cp bundles/latest/dynbinary/docker /usr/bin/docker && sudo cp bundles/latest/dynbinary/dockerinit /usr/libexec/docker/dockerinit
Sep 14 14:39:38 localhost.localdomain kernel: mce: [Hardware Error]: Machine check events logged
Sep 14 15:15:45 localhost.localdomain kernel: show_signal_msg: 19 callbacks suppressed
Sep 14 15:15:45 localhost.localdomain kernel: gdm[1154]: segfault at 10 ip 0000556678e0921a sp 00007ffd31b997c0 error 4 in gdm[556678de9000+5d000]
Sep 14 15:15:46 localhost.localdomain kernel: nouveau E[ DRM] DDC responded, but no EDID for DP-2
Sep 14 15:15:46 localhost.localdomain kernel: gnome-shell[27104]: segfault at 14 ip 00007f0a8daa0c4f sp 00007ffca79483c0 error 4 in libmutter.so.0.0.0[7f0a8da60000+f0000]
Sep 14 15:15:47 localhost.localdomain kernel: [drm:intel_set_pch_fifo_underrun_reporting [i915]] *ERROR* uncleared pch fifo underrun on pch transcoder A
Sep 14 15:15:47 localhost.localdomain kernel: [drm:intel_pch_fifo_underrun_irq_handler [i915]] *ERROR* PCH transcoder A FIFO underrun
Sep 14 15:15:47 localhost.localdomain kernel: [drm:intel_set_cpu_fifo_underrun_reporting [i915]] *ERROR* uncleared fifo underrun on p
docker run --rm -it --privileged -e BUILDFLAGS -e DOCKER_CLIENTONLY -e DOCKER_DEBUG -e DOCKER_EXECDRIVER -e DOCKER_EXPERIMENTAL -e DOCKER_GRAPHDRIVER -e DOCKER_STORAGE_OPTS -e DOCKER_USERLANDPROXY -e TESTDIRS -e TESTFLAGS -e TIMEOUT -v "/home/runcom/koding/docker/bundles:/go/src/github.com/docker/docker/bundles" "docker-dev:feature/host-arch-output-13634" hack/make.sh binary
no such file or directory
==================
WARNING: DATA RACE
Write by goroutine 16:
os.(*file).close()
/usr/local/go/src/os/file_unix.go:109 +0x1d7
os.(*File).Close()
/usr/local/go/src/os/file_unix.go:98 +0x91
github.com/docker/docker/api/client.func·009()
diff --git a/api/client/info.go b/api/client/info.go
index 3dba752..b508f93 100644
--- a/api/client/info.go
+++ b/api/client/info.go
@@ -46,6 +46,7 @@ func (cli *DockerCli) CmdInfo(args ...string) error {
ioutils.FprintfIfNotEmpty(cli.out, "Operating System: %s\n", info.OperatingSystem)
ioutils.FprintfIfNotEmpty(cli.out, "OS: %s\n", info.OS)
ioutils.FprintfIfNotEmpty(cli.out, "Architecture: %s\n", info.Architecture)
+ ioutils.FprintfIfNotEmpty(cli.out, "OSVariant: %s\n", info.OSVariant)
fmt.Fprintf(cli.out, "CPUs: %d\n", info.NCPU)
diff --git a/hack/make/validate-lint b/hack/make/validate-lint
index 870b6c0..0683d6a 100644
--- a/hack/make/validate-lint
+++ b/hack/make/validate-lint
@@ -30,7 +30,7 @@ packages=(
)
errors=()
-for p in "$packages"; do
+for p in "${packages[@]}"; do
server {
listen 80;
server_name _;
default_type text/html;
location = /ping.php {
return 200;
}
}
server {
(00.000042) Added /etc/resolv.conf:/etc/resolv.conf ext mount mapping
(00.000064) Added /etc/hostname:/etc/hostname ext mount mapping
(00.000066) Added /etc/hosts:/etc/hosts ext mount mapping
(00.000069) ========================================
(00.000071) Dumping processes (pid: 116)
(00.000072) ========================================
(00.000118) Found anon-shmem device at 5
(00.000124) Reset 135's dirty tracking
(00.000157) ... done
(00.000178) Dirty track supported on kernel
@runcom
runcom / gist:5791bd0befbe8f0c7d3b
Created May 24, 2015 20:32
race stats native driver 2
==================
WARNING: DATA RACE
Write by goroutine 96:
runtime.mapdelete()
/usr/local/go/src/runtime/hashmap.go:495 +0x0
github.com/docker/libcontainer/cgroups.RemovePaths()
/go/src/github.com/docker/docker/vendor/src/github.com/docker/libcontainer/cgroups/utils.go:230 +0x1f6
github.com/docker/libcontainer/cgroups/fs.(*Manager).Destroy()
/go/src/github.com/docker/docker/vendor/src/github.com/docker/libcontainer/cgroups/fs/apply_raw.go:127 +0x5e
github.com/docker/libcontainer.(*linuxContainer).Destroy()
@runcom
runcom / gist:c8be5b347dfc1deddba3
Created May 24, 2015 20:31
race stats native driver 1
==================
WARNING: DATA RACE
Write by goroutine 32:
runtime.mapassign1()
/usr/local/go/src/runtime/hashmap.go:383 +0x0
github.com/docker/docker/daemon/execdriver/native.(*driver).Run()
/go/src/github.com/docker/docker/daemon/execdriver/native/driver.go:142 +0x7cb
github.com/docker/docker/daemon.(*Daemon).Run()
/go/src/github.com/docker/docker/daemon/daemon.go:1033 +0xe1
github.com/docker/docker/daemon.(*containerMonitor).Start()