open-dock 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f1505c1a79c47a3eaf3547ba9cb41d0b2a5947b
-  data.tar.gz: ab491f5bf6610a624e9f8473806cbfb1b0fc0fe1
+  metadata.gz: 6f95a46172f0a2194702ba0a6219e3b5c7a2102a
+  data.tar.gz: 129b68d7a9c44cf0d89ce8718f0bd46196247c7d
 SHA512:
-  metadata.gz: 86e3b55323382232ac6f29a1c20bb3d2725ab7dce58f39958c7a37c3718a7993ca5612b16b1dbca04e7b3d4cf5bb5c91818e7fd1f517ff337a149ea5ef489837
-  data.tar.gz: c74ede46fee31e533eb8d55da0cc472420d7e12bcd9a14bbfb0d23cd04ac8f7e9d2ec01111025ddf107604e7a7a9dc1bc6620a3ba62e67d1446a2cdcf1235500
+  metadata.gz: b3f5e9f131355747abb2abb46661fe5b5d381b8fdad3374b911f4e3e09bedf133b31806e5decd3048023d1b989c45772ed1b7f0c4c7fe0391a7687607aa165a5
+  data.tar.gz: e1f4836d8cdc76ac7e456b75886f931fcf36c073d95560de9415ed7fb41eae243891f3fc3947cd4aa946a1ad619c97d183d9534b0ad889ea1c2e11a234532922

data/README.md

@@ -138,9 +138,9 @@ www:
 #  cpuset: 0-7
 
 # POST-CONDITIONS: execute after build the container:
-  post-conditions:
-    - sshpass -p 'J3mw?$_6' ssh-copy-id -o 'StrictHostKeyChecking no' -i ~/.ssh/id_rsa.pub root@lebrijo.com -p 2222
-    - ssh root@lebrijo.com -p 2222 "echo 'root:Kxxxxx1' | chpasswd"
+#  post-conditions:
+#    - sshpass -p 'J3mw?$_6' ssh-copy-id -o 'StrictHostKeyChecking no' -i ~/.ssh/id_rsa.pub root@lebrijo.com -p 2222
+#    - ssh root@lebrijo.com -p 2222 "echo 'root:Kxxxxx1' | chpasswd"
 
 # here you can create other containers
 # db:
@@ -150,6 +150,8 @@ www:
 
 `ops ship example.com` will create all containers configured on 'containers/example.com.yml' file
 
+Note: host SSH credentials (id_rsa.pub and authorized_keys) are copied by default to container, in order to have the same access to conainer.
+
 ### Shipping your local Docker
 
 You can create a file `containers/localhost.example.com.yml` where you can define containers. And launch them on your workstation:
@@ -160,7 +162,7 @@ ops ship localhost.example.com
 
 By convention:
 
-* If [host_name] include "localhost" string, it is assumed that containers are shipped on local workstation
+* If [host_name] includes "localhost" string, it is assumed that containers are shipped as docker containers in local workstation
 
 ## Configure Containers (are nodes for Chef)
 
@@ -189,6 +191,7 @@ Create/delete domain names, create/delete hosts and ship/unship hosts:
 * `ops unship HOST_NAME`
 * TODO: `ops reship HOST_NAME` unship/ship all containers from host.
 * `ops configure HOST_NAME` configure all containers with chef.
+* TODO: `ops ssh [CONTAINER_NAME] HOST_NAME` ssh connection to host or container
 
 ## Create your infrastructure project (/ops)
 
@@ -262,4 +265,8 @@ Create command `ops configure [host_name]` this will cook all containers. By con
 * "root" is the user in all containers
 * Each container configuration is defined in a Chef node: `nodes/[container_name].[host_name].json`
 * Then you have to create all container name records in your DNS provider: `[container_name].[host_name]   CNAME   [host_name].`
-* If [host_name] include "localhost" string, it is assumed that containers are shipped on local workstation
+* If [host_name] include "localhost" string, it is assumed that containers are shipped on local workstation
+
+### v0.1.2
+
+* Delete post-conditions from containers files. By default host credentials are passed to conainers.

data/lib/open-dock/commands/ship_host.rb

@@ -17,14 +17,16 @@ command :ship do |c|
       command = "docker run #{options.join(" ")} --name #{container_name} #{ports} #{config["image"]} #{config["command"]}"
       say "Docker CMD: #{command}\n"
       if host.include? "localhost"
-        system command
+        system "#{command} ; #{Docker::copy_ssh_credentials_command(container_name)}"
       else
         Net::SSH.start(host, user) do |ssh|
-          ssh.exec command
+          ssh.exec "#{command} ; #{Docker::copy_ssh_credentials_command(container_name)}"
         end
       end
-      sleep 5
-      config["post-conditions"].each { |c| system c }
+      if config["post-conditions"]
+        sleep 5
+        config["post-conditions"].each { |c| system c }
+      end
     end
   end
 end

data/lib/open-dock/commands/unship_host.rb

@@ -6,7 +6,7 @@ command :unship do |c|
   c.action do |args, options|
     host = args[0]
 
-    if host == "localhost"
+    if host.include? "localhost"
       Docker::containers_for(host).each do |container_name, config|
         system "docker rm -f #{container_name}"
       end

data/lib/open-dock/docker.rb

@@ -14,4 +14,28 @@ module Docker
     end
   end
 
+  def self.copy_ssh_credentials_command(container_name)
+    <<-EOH
+      # Container folder
+      if sudo test -d "/var/lib/docker/aufs"; then
+        CONTAINERS_DIR=/var/lib/docker/aufs/mnt
+      elif sudo test -d "/var/lib/docker/aufs"; then
+        CONTAINERS_DIR=/var/lib/docker/btrfs/subvolumes
+      fi
+
+      ID=$(docker inspect -f   '{{.Id}}' #{container_name})
+      SSH_DIR=$CONTAINERS_DIR/$ID/root/.ssh
+      echo SSH container folder is $SSH_DIR
+      if sudo test ! -d "$SSH_DIR" ; then
+        sudo mkdir $SSH_DIR
+      fi
+
+      echo Copying authorized_keys and id_rsa.pub files
+      sudo touch $SSH_DIR/authorized_keys
+      sudo cat ~/.ssh/authorized_keys | sudo tee -a $SSH_DIR/authorized_keys
+      sudo cat ~/.ssh/id_rsa.pub | sudo tee -a $SSH_DIR/authorized_keys
+      sudo chmod 600 $SSH_DIR/authorized_keys
+    EOH
+  end
+
 end

data/lib/open-dock/version.rb

@@ -1,3 +1,3 @@
 module OpenDock
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: open-dock
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Juan Lebrijo