From 87856513c6f52e4e562e1b99be20e0cebf59cb8e Mon Sep 17 00:00:00 2001 From: Aleksandr Didenko Date: Thu, 30 Jun 2016 19:01:01 +0200 Subject: [PATCH] Hack for resolv.conf is back, a bit different this time --- ccp/ccp-build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ccp/ccp-build.sh b/ccp/ccp-build.sh index 3045b1b87..e59deabd3 100755 --- a/ccp/ccp-build.sh +++ b/ccp/ccp-build.sh @@ -55,11 +55,12 @@ hack_images() { # useless, but let's keep it just in case we need to hack something else for dir in ~/microservices-repos/ms-{nova,neutron}*/docker/* ; do cp /root/resolv.conf $dir/ - sed '/MAINTAINER/a COPY resolv.conf /etc/resolv.conf' -i $dir/Dockerfile.j2 + sed '/MAINTAINER/a COPY resolv.conf /var/tmp/resolv.conf' -i $dir/Dockerfile.j2 done } create_mcp_conf create_registry create_resolvconf +hack_images build_images