Merge pull request #7 from michaelshobbs/mh-use-opsworks-info

extract opsworks stack name and prepend it to hostname

README.md

@@ -24,8 +24,8 @@ dokku plugin:install https://github.com/michaelshobbs/dokku-hostname.git dokku-h
 
 ## hooks
 
-This plugin provides hooks:
+This plugin provides the following triggers:
 
-* `docker-args-build`: adds the `--hostname` env var to the host's `hostname`
-* `docker-args-deploy`: adds the `--hostname` env var to the host's `hostname`
-* `docker-args-run`: adds the `--hostname` env var to the host's `hostname`
+* `docker-args-build`: adds the `--hostname` env var to the host's `hostname` or (if available) the AWS OpsWorks stack name + - + `hostname`
+* `docker-args-deploy`: adds the `--hostname` env var to the host's `hostname` or (if available) the AWS OpsWorks stack name + - + `hostname`
+* `docker-args-run`: adds the `--hostname` env var to the host's `hostname` or (if available) the AWS OpsWorks stack name + - + `hostname`

docker-args

@@ -7,6 +7,11 @@ if [[ "$IMAGE_SOURCE_TYPE" == "dockerfile" ]] && [[ "$0" == *build ]]; then
   echo -n "$STDIN"
 else
   STDIN=$(cat)
-  HOSTNAME=$(hostname)
+  OPSWORKS_STACK_NAME=$(grep "OpsWorks Stack:" /etc/motd 2>/dev/null || true)
+  if [[ -n "$OPSWORKS_STACK_NAME" ]]; then
+    HOSTNAME=$(echo "$OPSWORKS_STACK_NAME" "$(hostname)" | awk -F: '{ print $2 }' | xargs | tr '[:upper:]' '[:lower:]' | sed -e 's: :-:g')
+  else
+    HOSTNAME=$(hostname)
+  fi
   echo -n "$STDIN --hostname=${HOSTNAME}"
 fi

plugin.toml

@@ -1,6 +1,6 @@
 [plugin]
 name = "dokku-hostname"
 description = "Sets the docker hostname option for dokku"
-version = "0.1.0"
+version = "0.2.0"
 website_url = "https://github.com/michaelshobbs/dokku-hostname"
 [plugin.config]