C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

No need to hack resolv.conf in dockerfiles

Browse source
This commit is contained in:
Aleksandr Didenko 2016-06-30 18:18:33 +02:00
parent 7a8ead07d8
commit f7f560de2e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ccp/ccp-build.sh
View file

@ -52,6 +52,7 @@ build_images() {
} }
hack_images() { 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 for dir in ~/microservices-repos/ms-{nova,neutron}*/docker/* ; do
cp /root/resolv.conf $dir/ cp /root/resolv.conf $dir/
sed '/MAINTAINER/a COPY resolv.conf /etc/resolv.conf' -i $dir/Dockerfile.j2 sed '/MAINTAINER/a COPY resolv.conf /etc/resolv.conf' -i $dir/Dockerfile.j2
@ -61,5 +62,4 @@ hack_images() {
create_mcp_conf create_mcp_conf
create_registry create_registry
create_resolvconf create_resolvconf
hack_images
build_images build_images