From 0d84f207fb5754dc379a8261fa5a27a725e29e6a Mon Sep 17 00:00:00 2001
From: Alejandro Colomar <colomar.6.4.3@gmail.com>
Date: Fri, 17 Apr 2020 10:21:58 +0200
Subject: Update Dockerfile and script for new interface

---
 Dockerfile                   |  4 ++--
 bin/laundry-symbol-reader-dk | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 05d378c..b873348 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,7 +47,7 @@ RUN	make	install-base install-cv		-C libalx	-j 8	&& \
 COPY	--from=build /tmp/laundry-symbol-reader ./laundry-symbol-reader
 RUN	make	install		-C laundry-symbol-reader	-j 8	&& \
 	rm -rf	laundry-symbol-reader
-CMD	["laundry-symbol-reader"]
+CMD	["bash"]
 
-# docker container run --tty --interactive --volume $PWD:$PWD --env IMG_FNAME=$PWD/2.jpeg laundrysymbolreader/reader   
+# docker container run --rm --tty --interactive --volume $PWD:$PWD laundrysymbolreader/reader laundry-symbol-reader $PWD/2.jpeg  
 
diff --git a/bin/laundry-symbol-reader-dk b/bin/laundry-symbol-reader-dk
index ec3f129..160299d 100755
--- a/bin/laundry-symbol-reader-dk
+++ b/bin/laundry-symbol-reader-dk
@@ -24,11 +24,13 @@ main()
 	fname=$(basename ${img})
 
 	vol="--volume ${dir}:/tmp/img"
-	env="--env IMG_FNAME=/tmp/img/${fname}"
-	opt="--tty --interactive --rm ${vol} ${env}"
+	opt="--tty --interactive --rm ${vol}"
+	dk_img="laundrysymbolreader/reader"
+	arg="/tmp/img/${fname}"
+	cmd="laundry-symbol-reader ${arg}"
 
-	export	cmd="docker container run ${opt} laundrysymbolreader/reader"
-	${cmd}
+	dk="docker container run ${opt} ${dk_img} ${cmd}"
+	${dk}
 }
 
 ################################################################################
-- 
cgit v1.2.3