stacco 0.1.3 → 0.1.4

data/bin/stacco

@@ -81,7 +81,33 @@ if subcommand == :define
   Kernel.exit 0
 end
 
-stack = orch.stacks.first
+stacks = orch.stacks
+case stacks.length
+when 0
+  $stderr.puts "no stacks defined!"
+  $stderr.puts "run 'cat ./stack.yml | stacco define'"
+  Kernel.exit 1
+when 1
+  stack = stacks.first
+else
+  unless ARGV.length >= 1
+    $stderr.puts "ambiguous target stack"
+    $stderr.puts "try '#{File.basename($0)} #{subcommand} <stackname>'"
+    Kernel.exit 1
+  end
+
+  stack_name = ARGV.shift
+  stack = stacks.find{ |st| st.name == stack_name }
+
+  unless stack
+    $stderr.puts "unknown stack '#{stack}'"
+    $stderr.puts "known stacks:"
+    stacks.each do |st|
+      $stderr.puts "  #{st.name}"
+    end
+    Kernel.exit 1
+  end
+end
 
 case subcommand
 when :up
@@ -127,7 +153,7 @@ when :connect
     '-o', 'UserKnownHostsFile=/dev/null',
     '-o', 'StrictHostKeyChecking=no',
     "ubuntu@#{use_eip.ip_address}",
-    'sudo', '/bin/bash', '-il'
+    'sudo', 'su', '-'
 
 when :status
   stack.must_be_up!

data/priv/cloud-init/roles/docker-host.sh

@@ -7,7 +7,6 @@ mount -t btrfs -o "rw,noatime,space_cache" "${docker_volume}" /var/lib/docker
 apt-get install -qy lxc-docker
 gpasswd -a ubuntu docker
 docker login -e="${DOCKER_REGISTRY_EMAIL}" -p="${DOCKER_REGISTRY_PASSWORD}" -u="${DOCKER_REGISTRY_USER}" "${DOCKER_REGISTRY}"
-cp /home/ubuntu/.dockercfg /root/.dockercfg
 
 # start containers
 declare -A containers

data/stacco.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'stacco'
-  s.version     = '0.1.3'
+  s.version     = '0.1.4'
   s.licenses    = ['MIT']
   s.summary     = "Stack manipulator"
   s.description = "AWS CloudFromation stack manipulation toolsuite"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stacco
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors: