docker-utils 0.1.34 → 0.1.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca2be09a117367fb3ed4b4d9b1d071f1eb44c186
-  data.tar.gz: f6832ac00be7b852cdec01a2752a7e9d2b62b8b6
+  metadata.gz: 0883a41958efe271528f4332c796ff3730412183
+  data.tar.gz: d1606eecb3cfd88a9af89dea35f15fcc35e716a9
 SHA512:
-  metadata.gz: 0ec8a28f5049794aebde5f254516749e848d8d431b5df28f61dc913d523fd4fd49f2aa8a9f55274749f732da9d47d6223ae0d8fa9210f964e5340cc9f50e1ffb
-  data.tar.gz: e9747a85ebd68a2aa5733d4d54b4e3db8d19a4ffaff2e682180bdc6bf242693c5aade676a4b886800b6e2b5b86c8850b55087ac63751fcf3e5cfe5c76859e6e4
+  metadata.gz: 1baa416396040c0f4d7e43000d7c58b395ccaab821d8dd88fb6b80b81e8e76ca3eb18c431c8e33344b822f69afcfa724f7ace65e2e618462b34c3a265ff4e88b
+  data.tar.gz: 26a4b554aa0c473257bbf5a5e5419a498e6e1a5341e7b4fe6ecd14b9c1f4b710fbd59532a46467959d0503ae1fe603ebbcf2e681071be04ca157768202ada940

data/share/scripts/block-until-port-open

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+container_name="$1"; shift
+
+if [ -n "$1" ]; then
+  container_port="$1"; shift
+fi
+
+container_ip_addr="$(docker-utils ip -w "${container_name}")"
+
+if [ -z "${container_port}" ]; then
+  container_port=$(docker-utils exposed -p "${container_name}" | head -n 1)
+fi
+
+until docker-utils "port-open?" "${container_name}" "${container_port}"; do
+  sleep 0.1
+done

data/share/scripts/{exposed → exposed-ports}

@@ -33,6 +33,8 @@ conns = ports_and_transports.split(' ').map do |port_and_transport|
   {port: port, transport: transport, ip: ip}
 end
 
+conns = conns.sort_by{ |conn| [conn[:port], conn[:transport]] }
+
 conns.each do |conn|
   case print
   when :ports

data/share/scripts/ip

@@ -1,3 +1,28 @@
-#!/bin/bash
+#!/bin/sh
 
-command docker inspect --format '{{.NetworkSettings.IPAddress}}' "$1"
+mode="once"
+if [ "$1" = "-w" ]; then
+  mode="wait"; shift
+fi
+
+container_name="$1"; shift
+
+container_ip_addr=""
+
+if [ "${mode}" = "wait" ]; then
+  while :; do
+    container_ip_addr=$(command docker inspect --format '{{.NetworkSettings.IPAddress}}' "${container_name}" 2>/dev/null)
+    if [ -n "${container_ip_addr}" ]; then
+      break
+    fi
+    sleep 0.1
+  done
+else
+  container_ip_addr=$(command docker inspect --format '{{.NetworkSettings.IPAddress}}' "${container_name}" 2>/dev/null)
+fi
+
+if [ -n "${container_ip_addr}" ]; then
+  echo "${container_ip_addr}"
+else
+  exit 1
+fi

data/share/scripts/port-open?

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+container_name="$1"; shift
+container_port="$1"; shift
+
+nc -w 1 "$(command docker inspect --format '{{.NetworkSettings.IPAddress}}' "${container_name}")" "${container_port}" </dev/null 2>/dev/null

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-utils
 version: !ruby/object:Gem::Version
-  version: 0.1.34
+  version: 0.1.35
 platform: ruby
 authors:
 - Levi Aul
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-uuid
@@ -35,16 +35,16 @@ files:
 - "./Rakefile"
 - "./bin/docker-utils"
 - "./docker-utils.gemspec"
+- "./share/scripts/block-until-port-open"
 - "./share/scripts/container-links-for"
-- "./share/scripts/define-ambassador-service"
-- "./share/scripts/define-service"
-- "./share/scripts/exposed"
+- "./share/scripts/exposed-ports"
 - "./share/scripts/gc"
 - "./share/scripts/get"
 - "./share/scripts/get-host-uuid"
 - "./share/scripts/instances"
 - "./share/scripts/ip"
 - "./share/scripts/make-ref"
+- "./share/scripts/port-open?"
 - "./share/scripts/tags"
 - "./share/scripts/toolchain"
 - "./share/scripts/up?"

data/share/scripts/define-ambassador-service

@@ -1,53 +0,0 @@
-#!/bin/bash
-
-echo -n "defining ambassador service '$1'... "
-
-service_name=$1; shift
-
-remote_host=$1; shift
-remote_port=$1; shift
-
-cat >"/etc/init/${service_name}.conf" <<EOF
-stop on stopping docker
-
-env HOME=/root
-
-respawn
-respawn limit 5 20
-
-pre-start script
-  . /etc/environment.local
-
-  touch "/var/log/upstart/${service_name}.log"
-  chown root:syslog "/var/log/upstart/${service_name}.log"
-
-  mkdir -p /run/docker/upstart-service-containers
-  run_id=\$(docker-utils make-ref 5)
-  echo "${service_name}" > '/run/docker/upstart-service-containers/${service_name}'
-end script
-
-post-stop script
-  container_name="\$(cat '/run/docker/upstart-service-containers/${service_name}')"
-  docker stop "\${container_name}" || :
-  docker rm "\${container_name}" || :
-  rm '/run/docker/upstart-service-containers/${service_name}'
-end script
-
-script
-  . /etc/environment.local
-
-  container_name="\$(cat '/run/docker/upstart-service-containers/${service_name}')"
-
-  echo "starting container: \${container_name} (from bexio/amb:latest)..."
-
-  running_container_id=\$(docker run -d \
-    --name="\${container_name}" \
-    "bexio/amb:latest" \
-    '${remote_host}' '${remote_port}'
-  )
-
-  exec docker attach --sig-proxy=true "\${running_container_id}"
-end script
-EOF
-
-echo "defined."

data/share/scripts/define-service

@@ -1,137 +0,0 @@
-#!/bin/bash
-
-echo -n "defining container service '$1'... "
-
-image_repo=$1
-shift
-
-image_tag=$(echo "${image_repo}" | tr ':' ' ' | awk '{print $2;}')
-image_repo=$(echo "${image_repo}" | tr ':' ' ' | awk '{print $1;}')
-image_tag=${image_tag:-latest}
-
-image_name=$(echo "${image_repo}" | tr '/' ' ' | awk '{print $NF;}')
-
-data_container_name="${image_name}-data"
-
-dependencies=""
-volumes=""
-published_ports=""
-misc_args=""
-command_args=()
-
-while [ "$#" -gt 0 ]; do
-  case "$1" in
-  --tag)
-    shift; tag_name="$1"; shift
-    image_tag="${tag_name}"
-    ;;
-  --dependency)
-    shift; dep_name="$1"; shift
-    dependencies="${dependencies} ${dep_name}"
-    ;;
-  --volume)
-    shift; volume_arg="$1"; shift
-    volumes="${volumes} ${volume_arg}"
-    ;;
-  --publish-all-ports)
-    shift
-    publishing_all_ports=1
-    ;;
-  --before-start)
-    shift; before_start_script="$1"; shift
-    ;;
-  --cmd-arg)
-    shift; command_args+=($1); shift
-    ;;
-  *)
-    misc_arg="$1"; shift
-    misc_args="${misc_args} ${misc_arg}"
-    ;;
-  esac
-done
-
-stopping_stanza="stopping docker"
-for dep_name in ${dependencies}; do
-  stopping_stanza="${stopping_stanza} or stopping ${dep_name}"
-done
-
-
-data_container_volume_args=""
-for volume_mapping in ${volumes}; do
-  data_container_volume_args="${data_container_volume_args} --volume=\"${volume_mapping}\""
-done
-
-service_name="${image_name}"
-
-cat >"/etc/rsyslog.d/92-${service_name}.conf" <<EOF
-input(type="imfile" File="/var/log/upstart/${service_name}.log" Tag="${service_name}" StateFile="${service_name}")
-EOF
-
-restart rsyslog
-
-cat >"/etc/init/${service_name}.conf" <<EOF
-#stop on (${stopping_stanza})
-stop on stopping docker
-
-env HOME=/root
-
-respawn
-respawn limit 5 20
-
-pre-start script
-  . /etc/environment.local
-
-  touch "/var/log/upstart/${service_name}.log"
-  chown root:syslog "/var/log/upstart/${service_name}.log"
-
-  echo "creating data container (${data_container_name}) if it doesn't exist..."
-  docker run --name="${data_container_name}" ${data_container_volume_args} "${image_repo}:${image_tag}" /bin/true 2>/dev/null || :
-
-  ${before_start_script}
-
-  mkdir -p /run/docker/upstart-service-containers
-  run_id=\$(docker-utils make-ref 5)
-  echo "${service_name}" > '/run/docker/upstart-service-containers/${service_name}'
-end script
-
-post-stop script
-  container_name="\$(cat '/run/docker/upstart-service-containers/${service_name}')"
-  docker stop "\${container_name}" || :
-  docker rm "\${container_name}" || :
-  rm '/run/docker/upstart-service-containers/${service_name}'
-end script
-
-script
-  . /etc/environment.local
-
-  container_name="\$(cat '/run/docker/upstart-service-containers/${service_name}')"
-
-  echo "discovering links for container \${container_name}:"
-  link_args="\$(docker-utils container-links-for -w ${dependencies})"
-
-  echo "starting container: \${container_name} (from ${image_repo}:${image_tag})..."
-
-  if [ -n "${publishing_all_ports}" ]; then
-    published_port_args=""
-    published_ports="\$(docker inspect --format='{{.Config.ExposedPorts}}' "${image_repo}:${image_tag}" | sed -e 's/[^0-9]/ /g')"
-    for port in \${published_ports}; do
-      published_port_args="\${published_port_args} --publish=\"\${port}:\${port}\""
-    done
-  fi
-
-  running_container_id=\$(docker run -d \
-    --name="\${container_name}" \
-    --volumes-from="${data_container_name}" \
-    -e "BEXNG_TARGET_SYSTEM=\${DOMAIN}" \
-    \${published_port_args} \
-    \${link_args} \
-    ${misc_args} \
-    "${image_repo}:${image_tag}" \
-    ${command_args[@]} \
-  )
-
-  exec docker attach --sig-proxy=true "\${running_container_id}"
-end script
-EOF
-
-echo "defined."