From d924245e3e81d856bc356df656af5a3cfbbb041b Mon Sep 17 00:00:00 2001
From: Felix Bartels <felix@host-consultants.de>
Date: Sat, 24 Aug 2019 13:14:45 +0200
Subject: [PATCH] implement goss_file option from
 https://github.com/aelsabbahy/goss/pull/454

Signed-off-by: Felix Bartels <felix@host-consultants.de>
---
 extras/dcgoss/README.md | 7 +++++++
 extras/dcgoss/dcgoss    | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/extras/dcgoss/README.md b/extras/dcgoss/README.md
index 986c0b561..8d7cbf30c 100644
--- a/extras/dcgoss/README.md
+++ b/extras/dcgoss/README.md
@@ -64,6 +64,13 @@ Location of the goss yaml files. (Default: `.`)
 
 `GOSS_FILES_PATH=db dcgoss edit db`
 
+##### GOSS_FILE
+Allows to specify a differing name for `goss.yaml`. Useful when the same image is started for different configurations.
+
+**Example:**
+
+`GOSS_FILE=goss_config1.yaml dcgoss run db`
+
 ##### GOSS_VARS
 The name of the variables file relative to `GOSS_FILES_PATH` to copy into the
 docker container and use for valiation (i.e. `dcgoss run`) and copy out of the
diff --git a/extras/dcgoss/dcgoss b/extras/dcgoss/dcgoss
index 64c2badae..f62ff99ea 100755
--- a/extras/dcgoss/dcgoss
+++ b/extras/dcgoss/dcgoss
@@ -32,7 +32,7 @@ run(){
     # Copy in goss
     cp "${GOSS_PATH}" "$tmp_dir/goss"
     chmod 755 "$tmp_dir/goss"
-    [[ -e "${GOSS_FILES_PATH}/goss.yaml" ]] && install -m ugo+rw "${GOSS_FILES_PATH}/goss.yaml" "$tmp_dir"
+    [[ -e "${GOSS_FILES_PATH}/${GOSS_FILE:-goss.yaml}" ]] && install -m ugo+rw "${GOSS_FILES_PATH}/${GOSS_FILE:-goss.yaml}" "$tmp_dir/goss.yaml"
     [[ -e "${GOSS_FILES_PATH}/goss_wait.yaml" ]] && install -m ugo+rw "${GOSS_FILES_PATH}/goss_wait.yaml" "$tmp_dir"
     [[ -n "${GOSS_VARS}" ]] && [[ -e "${GOSS_FILES_PATH}/${GOSS_VARS}" ]] && install -m ugo+rw "${GOSS_FILES_PATH}/${GOSS_VARS}" "$tmp_dir"