From 5e7f714e2dceff5c2d44ca377fedac0d7284fc98 Mon Sep 17 00:00:00 2001
From: seihtam <mathies@outlook.dk>
Date: Thu, 6 May 2021 14:10:43 +0200
Subject: [PATCH] Fix various docker issues

---
 README.md              | 11 +++--------
 src/Dockerfile         |  2 +-
 util/Dockerfile.kaitai |  7 ++++---
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 500335e2d..22d34b4f7 100644
--- a/README.md
+++ b/README.md
@@ -58,18 +58,13 @@ It is assumed that BANG is run on little endian hardware (such as x86 or x86-64)
 ## Docker container
 
 ```
+cd util
+make docker-kaitai
+cd ../src
 docker image build -t bang .
 docker container run --rm -it bang
 ```
 
-or from the `src` directory, type
-
-```
-make dockerbuild
-```
-
-
-
 ## Supported file types
 
 The following files can be unpacked, or verified, including carving from a
diff --git a/src/Dockerfile b/src/Dockerfile
index cf0c7953d..90e41f1c3 100644
--- a/src/Dockerfile
+++ b/src/Dockerfile
@@ -44,4 +44,4 @@ WORKDIR /kaitai_struct/runtime/python
 RUN python3 setup.py install
 
 
-CMD ["python3","bangshell"]
+CMD ["python3","/usr/src/bang/src/bangshell"]
diff --git a/util/Dockerfile.kaitai b/util/Dockerfile.kaitai
index 59eb11ec2..593547588 100644
--- a/util/Dockerfile.kaitai
+++ b/util/Dockerfile.kaitai
@@ -7,13 +7,14 @@ RUN git checkout 0b611f58947f1e74e6f5ea58dc8cd99a7a81313c .
 WORKDIR /kaitai_struct/compiler
 RUN sbt compilerJVM/universal:packageBin
 
-RUN unzip -d / jvm/target/universal/kaitai-struct-compiler-0.9-SNAPSHOT.zip
+RUN unzip -d / jvm/target/universal/kaitai-struct-compiler-*.zip
 
 FROM openjdk:jre-slim
 
-COPY --from=builder /kaitai-struct-compiler-0.9-SNAPSHOT /kaitai-struct-compiler
+COPY --from=builder /kaitai-struct-compiler-* /kaitai-struct-compiler
 COPY --from=builder /kaitai_struct /kaitai_struct
 
+ENV PATH "$PATH:/kaitai-struct-compiler/bin"
+
 ENTRYPOINT ["/kaitai-struct-compiler/bin/kaitai-struct-compiler"]
 CMD ["--help"]
-