vx-container_connector 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a348cbdf287afbfe80e01f988a9cd1018782ece1
-  data.tar.gz: da5843b416b07fb78bb83a968ae23f779bd4fc33
+  metadata.gz: 610affa1f2a3b5a3693c419867206c353fb57c7f
+  data.tar.gz: 5791d02e99cf00c10f43e4dc47c1fd469c6f90cc
 SHA512:
-  metadata.gz: c61f82313b5fc2ce0ac30d17ddc770fe32febacbaa652709435536da9817a79a5dccba20dccf94fe5b705e522a1da6e10da46443e7bf1fc8b12e3277929ac4b4
-  data.tar.gz: 793882e64a7df67228c1483bc0afac19292cc0ecc40050b72e76545b368121d955730541cab682a8b278127e616ff84b86ea34db47b56d73f06f23dfbed1df9d
+  metadata.gz: 0247e615b02df5bf60986acc3455293cf5b4d5bb8cd1c962825aaf2265434206755d1a05506786b8302dc34ea8a17e633bc9c016506e1d7adae0110daf92d740
+  data.tar.gz: 9c717b2254794f0d487ae755ed19e62ef358551ecabb64640ccb94763c5e76e3e6845a5e7dd71bfc5869a7b1b9f3885e40bb8f79a8155ea0c2ce4bd6b671d384

data/.travis.yml

@@ -1,7 +1,5 @@
-services:
-  - rabbitmq
-
 rvm:
   - 2.0.0
 
-script: "bundle exec rake travis"
+before_script: "scripts/ci_env.sh"
+script: "rake spec"

data/lib/vx/container_connector/docker.rb

@@ -50,8 +50,9 @@ module Vx
 
       def container_options
         self.class.default_container_options.merge(
-          'Cmd'       => init,
-          'Image'     => image,
+          'Cmd'        => init,
+          'Image'      => image,
+          'Privileged' => true
         )
       end
 

data/lib/vx/container_connector/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module ContainerConnector
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/scripts/Dockerfile

@@ -0,0 +1,35 @@
+# ssh
+
+FROM ubuntu:12.04
+
+ENV RUNLEVEL 1
+
+RUN echo "deb mirror://mirrors.ubuntu.com/mirrors.txt precise main restricted universe" > /etc/apt/sources.list
+RUN apt-get -qy update
+
+# add ssh
+RUN DEBIAN_FRONTEND=noninteractive RUNLEVEL=1 apt-get install -qy openssh-server
+RUN sed -i 's/start on filesystem/start on filesystem or dockerboot/' /etc/init/ssh.conf
+
+# add dbus, need for upstart jobs
+RUN DEBIAN_FRONTEND=noninteractive RUNLEVEL=1 apt-get install -qy dbus
+RUN sed -i 's/start on local-filesystems/start on local-filesystems or dockerboot/' /etc/init/dbus.conf
+
+# change /bin/mknod, need for openjdk-7-jdk => fuse
+RUN dpkg-divert --local --rename --add /sbin/mknod && ln -s /bin/true /sbin/mknod
+
+# create user
+RUN useradd -m vexor -s /bin/bash
+RUN echo "vexor:vexor" | chpasswd
+RUN apt-get -qy install sudo
+RUN echo "vexor ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers
+
+# fix locales
+RUN locale-gen en_US.UTF-8
+RUN dpkg-reconfigure -fnoninteractive locales
+RUN update-locale LC_ALL="en_US.UTF-8" LANG="en_US.UTF-8" LANGUAGE="en_US"
+
+# install python and modules, needed for ansible
+RUN DEBIAN_FRONTEND=noninteractive RUNLEVEL=1 apt-get install -qy python
+
+ENTRYPOINT ["/sbin/init", "--startup-event", "dockerboot"]

data/scripts/ci_env.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+curl -s https://get.docker.io/gpg | sudo apt-key add -
+echo deb http://get.docker.io/ubuntu docker main | sudo tee /etc/apt/sources.list.d/docker.list
+sudo apt-get -qqy update > /dev/null
+sudo apt-get -qqy install lxc lxc-docker
+sudo chmod 0666 /var/run/docker.sock
+
+service docker start
+
+docker build -t dmexe/precise scripts/Dockerfile
+sleep 1
+
+exit 0
+
+

data/spec/lib/docker_spec.rb

@@ -9,8 +9,9 @@ describe Vx::ContainerConnector::Docker do
 
   context "container_options" do
     subject { conn.container_options }
-    it { should eq("Cmd"       => ["/sbin/init", "--startup-event", "dockerboot"],
-                   "Image"     => "dmexe/precise") }
+    it { should eq("Cmd"        => ["/sbin/init", "--startup-event", "dockerboot"],
+                   "Image"      => "dmexe/precise",
+                   "Privileged" => true) }
   end
 
   context "user" do

data/vx-container_connector.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'docker-api',      '= 1.5.4'
+  spec.add_runtime_dependency 'docker-api' #,      '= 1.5.4'
   spec.add_runtime_dependency 'vx-common-spawn', '= 0.0.7'
 
   spec.add_development_dependency "bundler", "~> 1.3"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: vx-container_connector
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-19 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: vx-common-spawn
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +114,8 @@ files:
 - lib/vx/container_connector/local.rb
 - lib/vx/container_connector/local/spawner.rb
 - lib/vx/container_connector/version.rb
+- scripts/Dockerfile
+- scripts/ci_env.sh
 - spec/lib/container_connector_spec.rb
 - spec/lib/docker_spec.rb
 - spec/lib/local_spec.rb