From 6022ee36801402cfaed882b292a13bac555716b3 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 21 Sep 2015 09:35:53 -0700 Subject: [PATCH] Revert "app-emulation/docker: use journald logger" This reverts commit 3aaf6715af392de36877710c5f0e8d02d60bb1fd. The `docker log` command does not work with anything other than the default log driver. Leave this alone for now. --- .../docker/{docker-1.8.2.ebuild => docker-1.8.2-r1.ebuild} | 0 .../coreos-overlay/app-emulation/docker/files/docker.service | 2 +- .../app-emulation/docker/files/early-docker.service | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.8.2.ebuild => docker-1.8.2-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.8.2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.8.2-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.8.2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.8.2-r1.ebuild 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 9aa28aa3ef..befd882b25 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:// --log-driver=journald $DOCKER_OPTS $DOCKER_OPT_BIP $DOCKER_OPT_MTU $DOCKER_OPT_IPMASQ +ExecStart=/usr/lib/coreos/dockerd daemon --host=fd:// $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 0244dc332f..2b074f0bda 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 --log-driver=journald +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 [Install] WantedBy=early-docker.target