[PLDWWW] page changed: packages:lxc-docker

["Elan Ruusamäe (glen)"]

recent vagrant images need less hacking

--- https://www.pld-linux.org/packages/lxc-docker?rev=1389297934
+++ https://www.pld-linux.org/packages/lxc-docker
@@ -103,35 +103,28 @@
    if Dir.glob("#{File.dirname(__FILE__)}/.vagrant/machines/default/*/id").empty?
      pkg_cmd = "set -xe; "
  
      # install libcgroup and enable mounts
-     pkg_cmd << "poldek -u --noask libcgroup lxc iptables; "
+     pkg_cmd << "poldek -u --noask libcgroup; "
      pkg_cmd << "sed -i -e '/^#mount/,$ s/^#//' /etc/cgconfig.conf; "
-     pkg_cmd << "echo 'docker -d &' >> /etc/rc.d/rc.local; "
+     pkg_cmd << "service cgconfig start; "
  
      # ensure ip forward is enabled
      pkg_cmd << "sed -i -e '/^net.ipv4.ip_forward/ s/0/1/' /etc/sysctl.conf; "
+     pkg_cmd << "sysctl -p; "
  
-     # Add lxc-docker package
-     # https://bugs.launchpad.net/poldek/+bug/1216250
-     pkg_cmd << "poldek -u --noask lxc-docker --nodeps; "
+     # Add lxc-docker package and start it
+     pkg_cmd << "poldek -u --noask lxc-docker; "
+     pkg_cmd << "service lxc-docker start; "
+     pkg_cmd << "usermod -A docker vagrant; "
+ 
+     # Add glibc locales
      pkg_cmd << "poldek -u glibc-localedb-all; "
  
-     # Add 3.10 kernel
-     pkg_cmd << "poldek -u --noask kernel; "
- 
-     # Make some more space
+     # Make some more space for containers
      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; "
-     end
-     # Activate new kernel
-     pkg_cmd << "shutdown -h now; "
      config.vm.provision :shell, :inline => pkg_cmd
    end
  end
  
@@ -147,6 +140,6 @@
  
      # Make VM accessible outside VM itself, and use eth1 device
      #config.vm.network :public_network, { bridge: 'eth1', auto_config: true }
    end
- end
+ end 
  </code>


Diff URL:
  https://www.pld-linux.org/packages/lxc-docker?do=diff&r1=1389297934&r2=1389461794
-- 
This mail was generated by DokuWiki at
https://www.pld-linux.org/