[PLDWWW] page changed: packages:lxc-docker
"Elan Ruusamäe (glen)"
glen at pld-linux.org
Mon Sep 16 10:07:26 CEST 2013
update Vagrant instructions now that th has new kernel
--- https://www.pld-linux.org/packages/lxc-docker?rev=1379207675
+++ https://www.pld-linux.org/packages/lxc-docker
@@ -88,8 +88,14 @@
Vagrant::Config.run do |config|
# Setup virtual machine box. This VM configuration code is always executed.
config.vm.box = BOX_NAME
config.vm.box_url = BOX_URI
+
+ # ssh agent forwarding can be useful
+ #config.ssh.forward_agent = true
+
+ # Make VM accessible outside VM itself, and use eth1 device
+ #config.vm.network :public_network, { bridge: 'eth1', auto_config: true }
# Provision docker and new kernel if deployment was not done
if Dir.glob("#{File.dirname(__FILE__)}/.vagrant/machines/default/*/id").empty?
pkg_cmd = "set -xe; "
@@ -97,23 +103,32 @@
# install libcgroup and enable mounts
pkg_cmd << "poldek -u --noask libcgroup lxc iptables; "
pkg_cmd << "sed -i -e '/^#mount/,$ s/^#//' /etc/cgconfig.conf; "
pkg_cmd << "echo 'docker -d &' >> /etc/rc.d/rc.local; "
- pkg_cmd << "ldconfig; "
+
+ # ensure ip forward is enabled
+ pkg_cmd << "sed -i -e '/^net.ipv4.ip_forward/ s/0/1/' /etc/sysctl.conf; "
# Add lxc-docker package
# https://bugs.launchpad.net/poldek/+bug/1216250
- pkg_cmd << "poldek -u --noask lxc-docker --sn th-ready --nodeps; "
- # Add 3.10 kernel from th-ready
- pkg_cmd << "poldek -u --noask kernel --sn th-ready; "
+ pkg_cmd << "poldek -u --noask lxc-docker --nodeps; "
+ pkg_cmd << "poldek -u glibc-localedb-all; "
+
+ # Add 3.10 kernel
+ pkg_cmd << "poldek -u --noask kernel; "
+
+ # Make some more space
+ pkg_cmd << "poldek -u xfsprogs; ldconfig; "
+ pkg_cmd << "lvextend --size=+3G /dev/sys/rootfs; xfs_growfs /; "
+
# Add guest additions if local vbox VM
is_vbox = true
ARGV.each do |arg| is_vbox &&= !arg.downcase.start_with?("--provider") end
if is_vbox
- pkg_cmd << "poldek -u --noask kernel-misc-vboxguest kernel-misc-vboxsf --sn th-ready; "
+ pkg_cmd << "poldek -u --noask kernel-misc-vboxguest kernel-misc-vboxsf; "
end
# Activate new kernel
- pkg_cmd << "shutdown -r +1; "
+ pkg_cmd << "shutdown -h now; "
config.vm.provision :shell, :inline => pkg_cmd
end
end
Diff URL:
https://www.pld-linux.org/packages/lxc-docker?do=diff&r1=1379207675&r2=1379318844
--
This mail was generated by DokuWiki at
https://www.pld-linux.org/
More information about the pld-cvs-commit
mailing list