Merge pull request #25592 from thaJeztah/carry-25344-fix-firewalld-startup-order

[carry 25344] deal with firewalld/docker startup issues
Upstream-commit: 39b379cc632e9e2d7a6ace6e9aa7b40099945679
Component: engine
This commit is contained in:
Vincent Demeester
2016-08-11 09:46:44 +02:00
committed by GitHub
2 changed files with 2 additions and 2 deletions

View File

@ -1,7 +1,7 @@
[Unit]
Description=Docker Application Container Engine
Documentation=https://docs.docker.com
After=network.target docker.socket
After=network.target docker.socket firewalld.service
Requires=docker.socket
[Service]

View File

@ -1,7 +1,7 @@
[Unit]
Description=Docker Application Container Engine
Documentation=https://docs.docker.com
After=network.target
After=network.target firewalld.service
[Service]
Type=notify