summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlejandro Colomar <colomar.6.4.3@gmail.com>2020-04-17 10:21:58 +0200
committerAlejandro Colomar <colomar.6.4.3@gmail.com>2020-04-17 10:21:58 +0200
commit0d84f207fb5754dc379a8261fa5a27a725e29e6a (patch)
treee2de9b04e2738eecc5549ee6809df8922a537525
parenta86cfb7dd4a4fa761fe0fddcaa2d0c4ea8923a2e (diff)
Update Dockerfile and script for new interface
-rw-r--r--Dockerfile4
-rwxr-xr-xbin/laundry-symbol-reader-dk10
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}
}
################################################################################