External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-12 15:04:46 -03:30
Code Issues Packages Projects Releases Wiki Activity

Hack all problem images and put resolv.conf there

Browse Source
This commit is contained in:
Aleksandr Didenko
2016-06-30 16:12:26 +02:00
parent 6be93a3b87
commit bb3a57a719
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ccp/ccp-build.sh
View File

@@ -51,13 +51,15 @@ build_images() {
mcp-microservices --config-file /root/mcp.conf build &> /var/log/mcp-build.log
}
hack_base_image() {
cp /root/resolv.conf ccp/microservices-repos/ms-debian-base/docker/base/
sed '/COPY requirements.txt/a COPY resolv.conf /etc/resolv.conf' -i ccp/microservices-repos/ms-debian-base/docker/base/Dockerfile.j2
hack_images() {
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
done
}
create_mcp_conf
create_registry
create_resolvconf
hack_base_image
hack_images
build_images