open-dock 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6158bd28ab0c340c53b9dc9fe6019de1d0b60f17
-  data.tar.gz: 23d656ae3e8bfc3211790759491273caabb29dcd
+  metadata.gz: a90f4844b63083092eb249348d863db04035369a
+  data.tar.gz: f9ce5ecc98239076bb0de40231840a4297c6f314
 SHA512:
-  metadata.gz: 1571e13622d09bf5af5e036fc6ae1c8967d0b5cdb042f80457ad188e5a3f4b5ae8e639f9c8609d6f9b5da805494b4fefa0d4dcfff851ec5ed0941bc7926ba75e
-  data.tar.gz: 3c7d3ac8960b24d189c52790595b532e4839b8c280a2857da7e0cf96cc5cf5850f2a2446fbe2f92f20d4291fb0dfdfb1c204da847fc11b7fce114415f39bd29b
+  metadata.gz: 168c4982f31df7b36926b837d3d8a5145a52e55d625406906fc95b26702a533f06783f8eac248acd580a81e1e83be5d40766a276e1e5e18561b7ee77306185f8
+  data.tar.gz: 390c024ee53331ea76cd60aa263f71437a3c64584633449abb0d7dc5afc8b2557fe41d6f4d35892bdfe77335aca414f7e49c091e19c4d5184cbe767bd0feaab2

data/README.md

@@ -120,6 +120,8 @@ disk_size_gb: 10
 
 ##Configure hosted CONTAINERS (Docker)
 
+To use this command you need [Docker](https://docs.docker.com/installation/) installed in the server.
+
 In this file we can configure all containers to run in the host provided in the name:
 
 ```yml
@@ -150,7 +152,7 @@ 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.
+Note: host SSH credentials (id_rsa.pub and authorized_keys) are copied by default to container, in order to have the same access to container.
 
 ### Shipping your local Docker
 
@@ -166,6 +168,11 @@ By convention:
 
 ## Configure Containers (are nodes for Chef)
 
+To use this command you need:
+
+* Chef installed in your nodes
+* SSHd running in your nodes
+
 Configuration with chef commands
 
 * `ops configure HOST_NAME`: configure with chef all containers in host. Here you need to install knife-solo gem.
@@ -174,9 +181,30 @@ Configuration with chef commands
 
 By convention:
 
-* "root" is the user in all containers
+* "root" is the user by default in all containers
 * Each container configuration is defined in a Chef node: `nodes/[host_name]/[container_name].json`
 
+```
+# Configure all containers in 'example.com' host
+ops configure example.com
+# Configure 'www' container in 'example.com' host
+ops configure example.com --container www
+# == knife solo cook root@example.com nodes/example.com/www.json -p 2222
+```
+
+## SSH connections
+
+SSH connection to host or container:
+
+```
+ops ssh HOST_NAME [CONTAINER_NAME]
+```
+
+Assuming SSHd installed in containers and hosts, you can
+
+* Access to host: `ops ssh example.com` equivalent to `ssh root@example.com`
+* Access to 'www' container: `ops ssh example.com www` equivalent to `ssh root@example.com -p 2222`
+
 ## Commands
 
 Create/delete domain names, create/delete hosts and ship/unship hosts:

data/lib/open-dock/docker.rb

@@ -16,16 +16,20 @@ module Docker
 
   def self.copy_ssh_credentials_command(container_name)
     <<-EOH
+      ID=$(docker inspect -f   '{{.Id}}' #{container_name})
       # Container folder
       if sudo test -d "/var/lib/docker/aufs"; then
         CONTAINERS_DIR=/var/lib/docker/aufs/mnt
+        SSH_DIR=$CONTAINERS_DIR/$ID/root/.ssh
       elif sudo test -d "/var/lib/docker/btrfs"; then
         CONTAINERS_DIR=/var/lib/docker/btrfs/subvolumes
+        SSH_DIR=$CONTAINERS_DIR/$ID/root/.ssh
+      elif sudo test -d "/var/lib/docker/devicemapper"; then
+        CONTAINERS_DIR=/var/lib/docker/devicemapper/mnt
+        SSH_DIR=$CONTAINERS_DIR/$ID/rootfs/root/.ssh
       fi
 
-      ID=$(docker inspect -f   '{{.Id}}' #{container_name})
-      SSH_DIR=$CONTAINERS_DIR/$ID/root/.ssh
-      echo SSH container folder is $SSH_DIR
+      echo SSH container folder: $SSH_DIR
       if sudo test ! -d "$SSH_DIR" ; then
         sudo mkdir $SSH_DIR
       fi

data/lib/open-dock/version.rb

@@ -1,3 +1,3 @@
 module OpenDock
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open-dock
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Juan Lebrijo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-18 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler