From 7a3b5ab285c032a7a2b24f6e9b91789c44c5ac7a Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Tue, 15 Sep 2015 14:16:44 -0700 Subject: [PATCH 1/2] app-emulation/docker: use journald logger --- .../coreos-overlay/app-emulation/docker/files/docker.service | 2 +- .../app-emulation/docker/files/early-docker.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service index befd882b25..9aa28aa3ef 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service @@ -9,7 +9,7 @@ EnvironmentFile=-/run/flannel_docker_opts.env MountFlags=slave LimitNOFILE=1048576 LimitNPROC=1048576 -ExecStart=/usr/lib/coreos/dockerd daemon --host=fd:// $DOCKER_OPTS $DOCKER_OPT_BIP $DOCKER_OPT_MTU $DOCKER_OPT_IPMASQ +ExecStart=/usr/lib/coreos/dockerd daemon --host=fd:// --log-driver=journald $DOCKER_OPTS $DOCKER_OPT_BIP $DOCKER_OPT_MTU $DOCKER_OPT_IPMASQ [Install] WantedBy=multi-user.target diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service index 2b074f0bda..0244dc332f 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service @@ -9,7 +9,7 @@ Environment=TMPDIR=/var/tmp MountFlags=slave LimitNOFILE=1048576 LimitNPROC=1048576 -ExecStart=/usr/lib/coreos/dockerd daemon --host=fd:// --bridge=none --iptables=false --ip-masq=false --graph=/var/lib/early-docker --pidfile=/var/run/early-docker.pid +ExecStart=/usr/lib/coreos/dockerd daemon --host=fd:// --bridge=none --iptables=false --ip-masq=false --graph=/var/lib/early-docker --pidfile=/var/run/early-docker.pid --log-driver=journald [Install] WantedBy=early-docker.target From 34c7d9c5514e0989b3be1b69729000f96d337639 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Tue, 15 Sep 2015 14:17:06 -0700 Subject: [PATCH 2/2] app-emulation/docker: bump to v1.8.2 --- .../docker/{docker-1.8.1-r1.ebuild => docker-1.8.2.ebuild} | 0 .../coreos-overlay/app-emulation/docker/docker-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.8.1-r1.ebuild => docker-1.8.2.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.8.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.8.2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.8.1-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.8.2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild index 4e53f1a83e..03e0f3b15c 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then DOCKER_GITCOMMIT="unknown" KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="164090854b6505e77d4068ccd86f3102d6b4816d" # v1.8.1 with backports + CROS_WORKON_COMMIT="fae44362ed4c7e161ab52f6bba6d5ee93ffbc28f" # v1.8.2 with backports DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}" KEYWORDS="amd64 arm64" fi