From 26481c54385fd2b7584c2adb779a6ee1fc56c28c Mon Sep 17 00:00:00 2001 From: Kay Yan Date: Fri, 1 Jul 2022 08:15:30 +0000 Subject: [PATCH] fix-docker-option-in-centos-arm64 --- .../docker/templates/docker-options.conf.j2 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/roles/container-engine/docker/templates/docker-options.conf.j2 b/roles/container-engine/docker/templates/docker-options.conf.j2 index c9b7d4b8c1a..ae661adb321 100644 --- a/roles/container-engine/docker/templates/docker-options.conf.j2 +++ b/roles/container-engine/docker/templates/docker-options.conf.j2 @@ -4,11 +4,7 @@ Environment="DOCKER_OPTS={{ docker_options|default('') }} --iptables={{ docker_i {% for i in docker_insecure_registries %}--insecure-registry={{ i }} {% endfor %} \ {% for i in docker_registry_mirrors %}--registry-mirror={{ i }} {% endfor %} \ --data-root={{ docker_daemon_graph }} \ -{% if ansible_os_family not in ["openSUSE Leap", "openSUSE Tumbleweed", "Suse"] %}{{ docker_log_opts }}{% endif %} \ -{% if ansible_architecture == "aarch64" and ansible_os_family == "RedHat" %} \ ---add-runtime docker-runc=/usr/libexec/docker/docker-runc-current --default-runtime=docker-runc \ ---userland-proxy-path=/usr/libexec/docker/docker-proxy-current --signature-verification=false \ -{% endif %}" +{% if ansible_os_family not in ["openSUSE Leap", "openSUSE Tumbleweed", "Suse"] %}{{ docker_log_opts }}{% endif %}" {% if docker_mount_flags is defined and docker_mount_flags != "" %} MountFlags={{ docker_mount_flags }}