From a3585314603efb419caa906678fed7ba2913e033 Mon Sep 17 00:00:00 2001
From: Vincent Batts <vbatts@hashbangbash.com>
Date: Thu, 26 Sep 2019 13:03:12 -0400
Subject: [PATCH] Dockerfile: no default output directory

Just let the user provide this if wanted

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
---
 Dockerfile                  | 4 ----
 test/01-from_rpms.bats      | 2 +-
 test/02-from_image_ref.bats | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a50044c..0714352 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,8 +4,4 @@ RUN dnf install -y jq skopeo findutils file 'dnf-command(download)'
 
 COPY ./BuildSourceImage.sh /usr/local/bin/BuildSourceImage.sh
 
-RUN mkdir -p /output
-ENV OUTPUT_DIR=/output
-VOLUME /output
-
 ENTRYPOINT ["/usr/local/bin/BuildSourceImage.sh", "-b", "/tmp/"]
diff --git a/test/01-from_rpms.bats b/test/01-from_rpms.bats
index 07aa5d3..df9660e 100644
--- a/test/01-from_rpms.bats
+++ b/test/01-from_rpms.bats
@@ -7,7 +7,7 @@ load helpers
 	d=$(mktemp -d)
 	echo "temporary directory: ${d}"
 
-	run_ctr -v $(pwd)/.testprep/srpms/:/src:ro --mount type=bind,source=${d},destination=/output $CTR_IMAGE -s /src
+	run_ctr -v $(pwd)/.testprep/srpms/:/src:ro --mount type=bind,source=${d},destination=/output $CTR_IMAGE -s /src -o /output
 	[ "$status" -eq 0 ]
 	[[ ${lines[0]} =~ "[SrcImg][INFO] calling source collection drivers" ]]
 	# get the number of the last line
diff --git a/test/02-from_image_ref.bats b/test/02-from_image_ref.bats
index 38ce66c..74595d2 100644
--- a/test/02-from_image_ref.bats
+++ b/test/02-from_image_ref.bats
@@ -8,7 +8,7 @@ load helpers
     echo "temporary directory: ${d}"
 
     ref="registry.fedoraproject.org/fedora-minimal"
-	run_ctr --mount type=bind,source=${d},destination=/output $CTR_IMAGE -i "${ref}"
+	run_ctr --mount type=bind,source=${d},destination=/output $CTR_IMAGE -i "${ref}" -o /output
 	[ "$status" -eq 0 ]
 	#echo ${lines[@]}
 	[[ ${lines[0]} =~ "Getting image source signatures" ]]