Merge pull request #26 from alejandro-colomar/master

Improve docker command

2 files changed, 12 insertions, 23 deletions

diff --git a/README.rst b/README.rst
index a6e2fb7..6c328c4 100644
--- a/README.rst
+++ b/README.rst
@@ -113,18 +113,18 @@ There are two options:  you can run the docker command directly, or you can
 run a script included in this repository (you need to download the script (or
 the full repository) for the second option).
 
-Both variants require that the image used is in a subdirectory contained by the
-`$PWD`.  The reason is that docker will mount the `$PWD` inside the container
-to have access to the image.  It can be modified by modifying the line that
-runs docker.
-
 docker:
 .......
 
 .. code-block:: sh
 
-	$ docker container run --tty --interactive --volume $PWD:$PWD	\
-		--env IMG_FNAME=$PWD/path/to/image laundrysymbolreader/reader
+	$ path=path/to/image
+	$ dir=$(realpath $(dirname ${path}))
+	$ fname=$(basename ${path})
+	$ docker container run --tty --interactive			\
+		--volume ${dir}:${dir}					\
+		--env IMG_FNAME=${dir}/${fname}				\
+		laundrysymbolreader/reader
 
 script:
 .......
diff --git a/laundry-symbol-reader-dk b/laundry-symbol-reader-dk
index 37b6da7..1cc1649 100755
--- a/laundry-symbol-reader-dk
+++ b/laundry-symbol-reader-dk
@@ -12,30 +12,19 @@
 ################################################################################
 #	functions							       #
 ################################################################################
-wrap_env()
-{
-	env="--env IMG_FNAME=${PWD}/$1"
-}
 
-wrap_vol()
-{
-	vol="--volume ${PWD}:${PWD}"
-}
-
-wrap_options()
-{
-	opt="--tty --interactive $1 $2"
-}
 
 ################################################################################
 #	main								       #
 ################################################################################
 main()
 {
+	dir=$(realpath $(dirname "$1"))
+	fname=$(basename "$1")
 
-	wrap_vol
-	wrap_env	"$1"
-	wrap_options	"${vol}" "${env}"
+	vol="--volume ${dir}:${dir}"
+	env="--env IMG_FNAME=${dir}/${fname}"
+	opt="--tty --interactive ${vol} ${env}"
 
 	cmd="docker container run	${opt}	laundrysymbolreader/reader"
 	${cmd}