From 28ebd97265ce4ec1426a18cdfcedea05ce0ca978 Mon Sep 17 00:00:00 2001 From: Noah Meyerhans Date: Thu, 12 Sep 2019 12:03:45 -0700 Subject: [PATCH] Remove dhclient resources Newer ECS agent versions don't rely on the host's dhclient binary, so don't mount those paths into the container. --- integration/systemd/ecs-agent.service | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/integration/systemd/ecs-agent.service b/integration/systemd/ecs-agent.service index 1f5fc466..7ad17969 100644 --- a/integration/systemd/ecs-agent.service +++ b/integration/systemd/ecs-agent.service @@ -30,7 +30,7 @@ After=docker.service WantedBy=multi-user.target [Service] -Environment=AGENT_TAG=v1.17.2 +Environment=AGENT_TAG=v1.30.0 Type=simple # Load an updated agent, if it exists: ExecStartPre=-/bin/sh -c 'test -f /var/cache/ecs/desired-image && docker load $(cat /var/cache/ecs/desired-image) && rm -f $(cat /var/cache/ecs/desired-image) /var/cache/ecs/desired-image' @@ -42,7 +42,6 @@ ExecStartPre=/sbin/iptables -t nat -A OUTPUT -d 169.254.170.2/32 \ -p tcp -m tcp --dport 80 -j REDIRECT --to-ports 51679 ExecStartPre=/sbin/sysctl -w net.ipv4.conf.all.route_localnet=1 ExecStartPre=-/usr/bin/docker rm ecs-agent -ExecStartPre=-/bin/mkdir -p /var/lib/ecs/dhclient ExecStart=/usr/bin/docker run --name ecs-agent \ --init \ --restart=on-failure:10 \ @@ -50,13 +49,8 @@ ExecStart=/usr/bin/docker run --name ecs-agent \ --volume=/var/log/ecs/:/log \ --volume=/var/lib/ecs/data:/data \ --volume=/etc/ecs:/etc/ecs \ - --volume=/sbin:/sbin \ - --volume=/lib:/lib \ - --volume=/lib64:/lib64 \ - --volume=/usr/lib:/usr/lib \ --volume=/proc:/host/proc \ --volume=/sys/fs/cgroup:/sys/fs/cgroup \ - --volume=/var/lib/ecs/dhclient:/var/lib/dhclient \ --net=host \ --env ECS_LOGFILE=/log/ecs-agent.log \ --env ECS_DATADIR=/data \