diff options
| author | Riku Voipio <riku.voipio@linaro.org> | 2019-01-02 14:55:27 +0200 |
|---|---|---|
| committer | Riku Voipio <riku.voipio@linaro.org> | 2019-01-03 12:59:58 +0000 |
| commit | e1e01db983cfafcf00fae1aaad5036ceb76fbc91 (patch) | |
| tree | 2da1108bc616e66d11220a8089f57ef703461ff4 | |
| parent | 5a1e3c0c7291f2214c0231baf2bf4227951ad775 (diff) | |
jenkis_slave: support docker-ce > 18.06
Since docker-ce 18.09, starting docker with systemd
socket activation isn't supported anymore. Since we have
an TCP socket, systemd activation is useless for us anyways.
Thus remove the fd:// option that fails when docker is
started via other means.
Change-Id: I308ed09c865d0ae1566c586a595c62ddd1ce2a56
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Reviewed-on: https://review.linaro.org/29648
Reviewed-by: Benjamin Copeland <ben.copeland@linaro.org>
| -rw-r--r-- | group_vars/jenkins_slaves | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/group_vars/jenkins_slaves b/group_vars/jenkins_slaves index 3a99ccb3..eb4fb5c5 100644 --- a/group_vars/jenkins_slaves +++ b/group_vars/jenkins_slaves @@ -16,7 +16,6 @@ docker_group_user: - buildslave docker_engine_opts: - - "-H fd://" - "-H tcp://0.0.0.0:2375" - "-H unix:///var/run/docker.sock" - "--dns 8.8.8.8 --dns 8.8.4.4" |