Add tshark decoder to adml-http image

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e35da4b..293ef7f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ enable_language(C CXX)
 # Project version
 set(VERSION_MAJOR 1)
 set(VERSION_MINOR 0)
-set(VERSION_PATCH 0)
+set(VERSION_PATCH 1)
 
 # Dynamic libraries not linked to build tree:
 set(CMAKE_SKIP_RPATH TRUE)

diff --git a/docker-images/anna-adml-http/Dockerfile b/docker-images/anna-adml-http/Dockerfile
index b27fecd..21d330b 100644 (file)
--- a/docker-images/anna-adml-http/Dockerfile
+++ b/docker-images/anna-adml-http/Dockerfile
@@ -4,7 +4,8 @@ COPY opt/adml/ /opt/adml
 
 RUN apt-get update && apt-get install -y \
    procps \
-   net-tools
+   net-tools \
+   tshark
 
 COPY starter.sh /var/starter.sh
 

diff --git a/tools/build-anna-adml-http b/tools/build-anna-adml-http
index d5b11c9..7a42e1c 100755 (executable)
--- a/tools/build-anna-adml-http
+++ b/tools/build-anna-adml-http
@@ -30,6 +30,10 @@ source ${REPO_DIR}/tools/docker.src
 rm -rf ${AD}
 echo ${AD} | ${REPO_DIR}/example/diameter/launcher/deploy-adml-http.sh ${VARIANT} || exit 1
 
+# Add interesting stuff:
+cp -r ${REPO_DIR}/example/diameter/launcher/resources/rest_api/helpers/diameterJsonHelper ${AD}
+cp ${REPO_DIR}/example/diameter/pcapDecoder/tsharkDecoder.sh ${AD}
+
 echo
 echo "Generate docker image ..."
 [ "${VARIANT}" = "Debug" ] && TAG=${TAG}-debug