docker-utils 0.1.33 → 0.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 657fc060cc0403e0ae51c9323c6847474288aee9
-  data.tar.gz: a44c61a4b4a6a1df723bad549b56ed932682c36d
+  metadata.gz: ca2be09a117367fb3ed4b4d9b1d071f1eb44c186
+  data.tar.gz: f6832ac00be7b852cdec01a2752a7e9d2b62b8b6
 SHA512:
-  metadata.gz: 4d404bacfe5afe14f01d317405c9ba62dca50bd678e91ff60b599a78f4c630c7f12463bfab4c612c9e059d21ed073eb076293bd6f338f30b0f838ac184fcb13d
-  data.tar.gz: a1ddd22c325b7252e6d95bc3fbb9ba10d446ea1ea6052254fb080a5970c829f58c3d132a45c16e1d79b0a1858ab4ff7f7878cd9d7b56857e4bffe2fb7f7d5bbf
+  metadata.gz: 0ec8a28f5049794aebde5f254516749e848d8d431b5df28f61dc913d523fd4fd49f2aa8a9f55274749f732da9d47d6223ae0d8fa9210f964e5340cc9f50e1ffb
+  data.tar.gz: e9747a85ebd68a2aa5733d4d54b4e3db8d19a4ffaff2e682180bdc6bf242693c5aade676a4b886800b6e2b5b86c8850b55087ac63751fcf3e5cfe5c76859e6e4

data/share/scripts/exposed

@@ -0,0 +1,46 @@
+#!/usr/bin/env ruby
+
+DockerBinaryLocation = `which docker`.chomp
+
+def cmd(*args)
+  io = IO.popen(args, err: [:child, :out])
+  io.read.split("\n")
+end
+
+def docker(*args)
+  cmd(DockerBinaryLocation, *args).first
+end
+
+if ARGV.delete('-p') or ARGV.delete('--ports')
+  print = :ports
+elsif ARGV.delete('-o') or ARGV.delete('--origins')
+  print = :ip_and_port_pairs
+else
+  print = :connstrings
+end
+
+unless container = ARGV[0]
+  $stderr.puts "invalid argument"
+  Kernel.exit 1
+end
+
+ip = docker 'inspect', '--format', '{{.NetworkSettings.IPAddress}}', container
+ports_and_transports = docker 'inspect', '--format', '{{range $port, $v := .NetworkSettings.Ports}}{{$port}} {{end}}', container
+
+conns = ports_and_transports.split(' ').map do |port_and_transport|
+  port, transport = port_and_transport.split('/')
+  port = port.to_i
+  {port: port, transport: transport, ip: ip}
+end
+
+conns.each do |conn|
+  case print
+  when :ports
+    puts conn[:port]
+  when :ip_and_port_pairs
+    puts "#{conn[:ip]}:#{conn[:port]}"
+  when :connstrings
+    puts "#{conn[:transport]}://#{conn[:ip]}:#{conn[:port]}"
+  end
+end
+

data/share/scripts/gc

@@ -1,39 +1,70 @@
 #!/usr/bin/env ruby
 
-containers = `docker ps -a -q`.chomp.split("\n").sort
+DockerBinaryLocation = `which docker`.chomp
 
-purge_all = ARGV.delete('-a')
-kill_running_containers = ARGV.delete('-r') || purge_all
-delete_data_containers = ARGV.delete('-d') || purge_all
-delete_tagged_images = ARGV.delete('-t') || purge_all
+def cmd(*args)
+  io = IO.popen(args, err: '/dev/null')
+  io.read.split("\n")
+end
 
-unless kill_running_containers
-  running_containers = `docker ps -q`.chomp.split("\n").sort
-  containers = containers - running_containers
+def docker(*args)
+  cmd(DockerBinaryLocation, *args)
 end
 
-unless delete_data_containers
-  containers = containers.find_all do |cid|
-    container_name = `docker inspect -f '{{.Name}}' #{cid}`.chomp[1..-1]
-    container_name !~ /-data$/
+tasks = [:remove_containers, :remove_volumes, :remove_images]
+container_filter = [:running]
+image_filter = [:untagged]
+
+while task_pattern = ARGV.shift
+  case task_pattern.intern
+  when :all
+    container_filter = []
+    image_filter = []
+  when :running
+    container_filter -= [:running]
+  when :volumes
+    #
+  when :images
+    image_filter -= [:untagged]
   end
 end
 
-containers.each do |cid|
-  system 'docker', 'kill', cid, err: '/dev/null'
-  system 'docker', 'rm', cid, err: '/dev/null'
+
+containers = docker('ps', '-a', '-q').sort
+
+if container_filter.include? :running
+  running_containers = docker('ps', '-q').sort
+  containers = containers - running_containers
 end
 
-images = `docker images`.chomp.split("\n")[1..-1].map do |ln|
+
+images = docker('images')[1..-1].map do |ln|
   parts = ln.split(' ').map{ |part| part unless part == '<none>' }
   image_name = (parts[0] and parts[1]) ? "#{parts[0]}:#{parts[1]}" : nil
   {id: parts[2], name: image_name}
 end
 
-unless delete_tagged_images
+if image_filter.include? :untagged
   images = images.delete_if{ |image| image[:name] }
 end
 
-images.each do |image|
-  system 'docker', 'rmi', '-f', image[:id]
-end
+
+
+if tasks.include? :remove_containers and containers.length.nonzero?
+  puts "removing containers"
+  containers.each do |cid|
+    docker 'kill', cid
+    docker 'rm', cid
+
+    puts "  #{cid}"
+  end
+end
+
+if tasks.include? :remove_images and images.length.nonzero?
+  puts "removing image layers"
+  images.each do |image|
+    docker 'rmi', '-f', image[:id]
+
+    puts "  #{image[:name]} #{image[:id]}"
+  end
+end

data/share/scripts/instances

@@ -0,0 +1,51 @@
+#!/usr/bin/env ruby
+
+DockerBinaryLocation = `which docker`.chomp
+
+def cmd(*args)
+  io = IO.popen(args, err: '/dev/null')
+  io.read.split("\n")
+end
+
+def docker(*args)
+  cmd(DockerBinaryLocation, *args)
+end
+
+output_type = (ARGV.delete('-n') or ARGV.delete('--by-name')) ? :name : :id
+show_only_running = not(ARGV.delete('-a') or ARGV.delete('--all'))
+
+unless pattern = ARGV.shift
+  $stderr.puts "usage: #{$0} /search-pattern/"
+  Kernel.exit 1
+end
+
+if pattern.index(':')
+  pattern_name, pattern_tag = pattern.split(':')
+  pattern = {name: pattern_name, tag: pattern_tag}
+else
+  pattern = {name: pattern, tag: 'latest'}
+end
+
+images = docker('images', '--no-trunc', pattern[:name])[1..-1].map do |ln|
+  parts = ln.split(' ').map{ |part| part unless part == '<none>' }
+  {tag: parts[1], ref: parts[2]}
+end
+
+pattern[:ref] = images.find{ |image| image[:tag] == pattern[:tag] }[:ref]
+pattern[:tags] = images.find_all{ |image| image[:ref] == pattern[:ref] }.map{ |image| image[:tag] }
+
+only_running_stanza = show_only_running ? [] : ['-a']
+containers = docker('ps', *only_running_stanza, '--no-trunc')[1..-1].map do |ln|
+  parts = ln.split(' ').map{ |part| part unless part == '<none>' }
+  image_repo = parts[1]
+  image_name, image_tag = image_repo.split(':')
+  {id: parts[0], name: parts[-1], image: {repo: image_repo, name: image_name, tag: image_tag}}
+end
+
+containers = containers.find_all do |cont|
+  (pattern[:name] == cont[:image][:name]) and pattern[:tags].include?(cont[:image][:tag])
+end
+
+containers.each do |cont|
+  puts cont[output_type]
+end

data/share/scripts/ip

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+command docker inspect --format '{{.NetworkSettings.IPAddress}}' "$1"

data/share/scripts/tags

@@ -0,0 +1,79 @@
+#!/usr/bin/env ruby
+
+DockerBinaryLocation = `which docker`.chomp
+
+def cmd(*args)
+  io = IO.popen(args, err: '/dev/null')
+  io.read.split("\n")
+end
+
+def docker(*args)
+  cmd(DockerBinaryLocation, *args)
+end
+
+output_format = (ARGV.delete('-f') or ARGV.delete('--full')) ? :name_and_tag : :tag
+group_by_ref = (ARGV.delete('-g') or ARGV.delete('--group-by-ref'))
+
+unless pattern_str = ARGV.shift
+  prefix = "usage: #{$0}"
+  spacer = " " * prefix.length
+  $stderr.puts "#{prefix} image-name"
+  $stderr.puts "#{spacer} image-name:tag"
+  $stderr.puts "#{spacer} layer-id"
+  Kernel.exit 1
+end
+
+if pattern_str.index(':')
+  pattern_name, pattern_tag = pattern_str.split(':')
+  pattern = {name: pattern_name, tag: pattern_tag}
+elsif pattern_str =~ /^[0-9a-f]+$/i and [12, 64].include?(pattern_str.length)
+  pattern = {ref: pattern_str}
+else
+  pattern = {name: pattern_str}
+end
+
+pattern[:effective_tag] = pattern[:tag] || 'latest'
+
+images = docker('images', '-a', '--no-trunc')[1..-1].map do |ln|
+  parts = ln.split(' ').map{ |part| part unless part == '<none>' }
+  {name: parts[0], tag: parts[1], ref: parts[2]}
+end
+
+
+if pattern[:ref]
+  ref_rxp = /^#{pattern[:ref]}([0-9a-f]{52})?$/
+  pattern[:name] = images.find{ |image| image[:ref] =~ ref_rxp }[:name]
+elsif pattern[:name]
+  pattern[:ref] = images.find{ |image| image[:tag] == pattern[:effective_tag] }[:ref]
+end
+
+images = images.find_all{ |image| image[:name] == pattern[:name] }
+
+if pattern[:explicit_tag]
+  images = images.find_all{ |image| image[:tag] == pattern[:explicit_tag] }
+end
+
+format_tag = lambda do |tag|
+  case output_format
+  when :name_and_tag
+    "#{pattern[:name]}:#{tag}"
+  when :tag
+    tag
+  end
+end
+
+if group_by_ref
+  image_groups = images.group_by{ |image| image[:ref] }.map{ |(_, v)| v }
+  image_groups.each do |image_set|
+    synonyms = image_set.map{ |image| image[:tag] }.sort
+    synonym_strs = synonyms.map(&format_tag)
+
+    main_name_str = synonym_strs.shift
+    puts "#{main_name_str}: #{synonym_strs.join(', ')}"
+  end
+else
+  images.map{ |image| image[:tag] }.each do |tag|
+    puts format_tag.call(tag)
+  end
+end
+

data/share/scripts/up?

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+command docker inspect --format '{{.NetworkSettings.IPAddress}}' "$1" >/dev/null 2>&1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-utils
 version: !ruby/object:Gem::Version
-  version: 0.1.33
+  version: 0.1.34
 platform: ruby
 authors:
 - Levi Aul
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-uuid
@@ -35,16 +35,19 @@ files:
 - "./Rakefile"
 - "./bin/docker-utils"
 - "./docker-utils.gemspec"
-- "./share/scripts/bootstrap"
 - "./share/scripts/container-links-for"
 - "./share/scripts/define-ambassador-service"
 - "./share/scripts/define-service"
+- "./share/scripts/exposed"
 - "./share/scripts/gc"
 - "./share/scripts/get"
 - "./share/scripts/get-host-uuid"
+- "./share/scripts/instances"
+- "./share/scripts/ip"
 - "./share/scripts/make-ref"
-- "./share/scripts/provision-volume"
+- "./share/scripts/tags"
 - "./share/scripts/toolchain"
+- "./share/scripts/up?"
 - bin/docker-utils
 homepage: https://github.com/tsutsu/docker-utils
 licenses:

data/share/scripts/bootstrap

@@ -1,25 +0,0 @@
-#!/bin/bash
-if [ -b "/dev/xvdc" ]; then
-  docker-utils provision-volume "/dev/xvdc" "/var/lib/docker"
-fi
-
-if [ -b "/dev/xvdd" ]; then
-  docker-utils provision-volume "/dev/xvdd" "/var/lib/docker/vfs/dir"
-fi
-
-if ! hash docker; then
-  echo "installing docker..."
-  echo 'deb http://get.docker.io/ubuntu docker main' > /etc/apt/sources.list.d/docker.list
-  apt-key adv --keyserver 'hkp://pgp.mit.edu:80' --recv-keys '36A1D7869245C8950F966E92D8576A8BA88D21E9'
-  apt-get update
-  apt-get install -qy lxc-docker
-  gpasswd -a ubuntu docker
-fi
-
-echo "logging into ${DOCKER_REGISTRY_URL}..."
-cat >"$HOME/.dockercfg" <<EOF
-{"${DOCKER_REGISTRY_URL}": {
-  "auth": "${DOCKER_REGISTRY_AUTH}",
-  "email": "${DOCKER_REGISTRY_EMAIL}"
-}}
-EOF

data/share/scripts/provision-volume

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-device="$1"; shift
-mntpt="$1"; shift
-
-mkfs.btrfs "${device}" 2>/dev/null || :
-
-mount "${device}" /mnt 2>/dev/null || :
-btrfs filesystem resize max /mnt 2>/dev/null || :
-umount /mnt 2>/dev/null || :
-
-mkdir -p "${mntpt}"
-mount -t btrfs -o "rw,noatime,space_cache" "${device}" "${mntpt}"