From ab09a32c781dd349bca43d948aa9a2d3bfe61f16 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: Tue, 26 Jul 2016 14:37:20 +0000
Subject: [PATCH] Fix docker service file for the new version

Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
---
 roles/osbs-master/files/docker.service | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/roles/osbs-master/files/docker.service b/roles/osbs-master/files/docker.service
index 0e2391f45e..80544cf46a 100644
--- a/roles/osbs-master/files/docker.service
+++ b/roles/osbs-master/files/docker.service
@@ -11,12 +11,12 @@ EnvironmentFile=-/etc/sysconfig/docker
 EnvironmentFile=-/etc/sysconfig/docker-storage
 EnvironmentFile=-/etc/sysconfig/docker-network
 Environment=GOTRACEBACK=crash
-ExecStart=/bin/sh -c '/usr/bin/docker daemon \
+ExecStart=/usr/bin/docker daemon \
+          --exec-opt native.cgroupdriver=systemd \
           $OPTIONS \
           $DOCKER_STORAGE_OPTIONS \
           $DOCKER_NETWORK_OPTIONS \
-          $INSECURE_REGISTRY \
-          2>&1 | /usr/bin/forward-journald -tag docker'
+          $INSECURE_REGISTRY
 ExecStartPost=/usr/local/bin/fix-docker-iptables
 LimitNOFILE=1048576
 LimitNPROC=1048576