Add 0.6.1 and bring versioning in line with other projects

[jefferai]

No description provided.

[tianon]

warning: insecure protocol git:// detected: git://github.com/hashicorp/docker-vault
diff --git a/vault_latest/Dockerfile b/vault_0.6.0/Dockerfile
similarity index 100%
copy from vault_latest/Dockerfile
copy to vault_0.6.0/Dockerfile
diff --git a/vault_latest/docker-entrypoint.sh b/vault_0.6.0/docker-entrypoint.sh
similarity index 95%
copy from vault_latest/docker-entrypoint.sh
copy to vault_0.6.0/docker-entrypoint.sh
index 6766ebf..7f1a5f0 100755
--- a/vault_latest/docker-entrypoint.sh
+++ b/vault_0.6.0/docker-entrypoint.sh
@@ -34,7 +34,7 @@ if [ "$1" = 'server' ]; then
     set -- vault server \
         -config="$VAULT_CONFIG_DIR" \
         -dev-root-token-id="$VAULT_DEV_ROOT_TOKEN_ID" \
-        -dev-listen-address="$VAULT_DEV_LISTEN_ADDRESS" \
+        -dev-listen-address="${VAULT_DEV_LISTEN_ADDRESS:-"0.0.0.0:8200"}" \
         "$@"
 elif [ "$1" = 'version' ]; then
     # This needs a special case because there's no help output.
diff --git a/vault_latest/Dockerfile b/vault_latest/Dockerfile
index 8a24b60..473b33e 100644
--- a/vault_latest/Dockerfile
+++ b/vault_latest/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.4
 MAINTAINER Jeff Mitchell <jeff@hashicorp.com> (@jefferai)

 # This is the release of Vault to pull in.
-ENV VAULT_VERSION=0.6.0
+ENV VAULT_VERSION=0.6.1

 # This is the release of https://github.com/hashicorp/docker-base to pull in order
 # to provide HashiCorp-built versions of basic utilities like dumb-init and gosu.
diff --git a/vault_latest/docker-entrypoint.sh b/vault_latest/docker-entrypoint.sh
index 6766ebf..afd8d1a 100755
--- a/vault_latest/docker-entrypoint.sh
+++ b/vault_latest/docker-entrypoint.sh
@@ -13,14 +13,9 @@ VAULT_CONFIG_DIR=/vault/config

 # You can also set the VAULT_LOCAL_CONFIG environment variable to pass some
 # Vault configuration JSON without having to bind any volumes.
-#
-# NOTE: The 'if' directive is commented due to a bug in Vault that causes a
-# panic on a totally empty config directory, so we always write a local file,
-# even if empty. This will be fixed in 0.6.1, at which point we can re-enable
-# the 'if' here.
-#if [ -n "$VAULT_LOCAL_CONFIG" ]; then
+if [ -n "$VAULT_LOCAL_CONFIG" ]; then
    echo "$VAULT_LOCAL_CONFIG" > "$VAULT_CONFIG_DIR/local.json"
-#fi
+fi

 # If the user is trying to run Vault directly with some arguments, then
 # pass them to Vault.
@@ -34,7 +29,7 @@ if [ "$1" = 'server' ]; then
     set -- vault server \
         -config="$VAULT_CONFIG_DIR" \
         -dev-root-token-id="$VAULT_DEV_ROOT_TOKEN_ID" \
-        -dev-listen-address="$VAULT_DEV_LISTEN_ADDRESS" \
+        -dev-listen-address="${VAULT_DEV_LISTEN_ADDRESS:-"0.0.0.0:8200"}" \
         "$@"
 elif [ "$1" = 'version' ]; then
     # This needs a special case because there's no help output.

[tianon]

LGTM

Build test of #2078; 3610dd2 (vault):

$ bashbrew build vault:0.6.0
warning: insecure protocol git:// detected: git://github.com/hashicorp/docker-vault
Building bashbrew/cache:851dbb0982d7f4d05303ce4ef0eeee743f4b84f251052b4f77005feb19cd95ff (vault:0.6.0)
Tagging vault:0.6.0

$ test/run.sh vault:0.6.0
testing vault:0.6.0
    'utc' [1/4]...passed
    'cve-2014--shellshock' [2/4]...passed
    'no-hard-coded-passwords' [3/4]...passed
    'override-cmd' [4/4]...passed


$ bashbrew build vault:0.6
Building bashbrew/cache:45732406c2c1c4a7d5c720f03552f09c8af6530984a92e928fac4d27d40e669a (vault:0.6)
Tagging vault:0.6
Tagging vault:0.6.1
Tagging vault:latest

$ test/run.sh vault:0.6
testing vault:0.6
    'utc' [1/4]...passed
    'cve-2014--shellshock' [2/4]...passed
    'no-hard-coded-passwords' [3/4]...passed
    'override-cmd' [4/4]...passed

cc @yosifkit

[yosifkit]

LGTM