diff --git a/contrib/k8s-seed.txt b/contrib/k8s-seed.txt index 5941c87..f5da0ff 100644 --- a/contrib/k8s-seed.txt +++ b/contrib/k8s-seed.txt @@ -103,6 +103,8 @@ d-i preseed/late_command string in-target /bin/sh -c " \ chmod +x /usr/bin/werf ; \ git clone https://git.ix.gs/public/coins-demo.git /opt/coins-demo ; \ cp /opt/coins-demo/contrib/mfg.service /etc/systemd/system/ ; \ + mkdir -p /lib/systemd/system/docker.service.d ; \ + sed -i 's/sock$/sock --insecure-registry="registry.k8s-demo.ix.gs"/' /lib/systemd/system/docker.service ; \ systemctl daemon-reload ; \ systemctl enable mfg.service ; \ systemctl enable serial-getty@ttyS0.service ; \ diff --git a/runme.sh b/runme.sh index 5c33cdf..e0c72e5 100755 --- a/runme.sh +++ b/runme.sh @@ -7,7 +7,7 @@ vcpu=`cat /proc/cpuinfo|grep proc|tail -1|awk '{print $NF}'` k8sdsk="${apptmp}/k8s-demo.raw" httpboot='http://ftp.debian.org/debian/dists/stretch/main/installer-amd64/current/images/netboot/debian-installer/amd64' seed='https://git.ix.gs/public/coins-demo/raw/branch/master/contrib/k8s-seed.txt' -qemu="${appdir}/contrib/qemu-system-x86_64 -L ${appdir}/contrib/share/qemu -net nic -net user,net=100.100.100.0/24,hostfwd=tcp::8888-:8888 -m ${vmmem} -smp ${vcpu} -localtime -enable-kvm -cpu host,+nx -M pc -vga std -usbdevice tablet -k en-us -hda ${k8sdsk} -boot once=d -nographic" +qemu="${appdir}/contrib/qemu-system-x86_64 -L ${appdir}/contrib/share/qemu -net nic -net user,net=100.100.100.0/24,hostfwd=tcp::8888-:80 -m ${vmmem} -smp ${vcpu} -localtime -enable-kvm -cpu host,+nx -M pc -vga std -usbdevice tablet -k en-us -hda ${k8sdsk} -boot once=d -nographic" wget='wget -cq4O' ### installvm() {