Added required packages

Some scripts requires jar for
updatinfg aap's jar on container restart.
As aai-common image is based on jre, not sdk
it doesn't have jar. Added fastjar as a replacement.

Change-Id: Id3bda6430097f79ed2850b5c7fa6e0b64a77c903
Issue-ID: INT-1024
Signed-off-by: Dmitry Puzikov <dmitry.puzikov@tieto.com>

diff --git a/Dockerfiles/aai-common/Dockerfile.alpine b/Dockerfiles/aai-common/Dockerfile.alpine
index 0ca3a6f..915c511 100644 (file)
--- a/Dockerfiles/aai-common/Dockerfile.alpine
+++ b/Dockerfiles/aai-common/Dockerfile.alpine
@@ -19,6 +19,7 @@ RUN \
     DEPS="ca-certificates \
             curl \
             dpkg \
+            fastjar \
             jq \
             loksh \
             bash \
@@ -28,6 +29,8 @@ RUN \
             util-linux \
             wget" \
         && apk add --no-cache ${DEPS} \
+        # need fastjar for some projects to update app's jar on container restart
+        && ln -snf /usr/bin/fastjar $JAVA_HOME/bin/jar \
         # Get the dpkg to properly download and install that version compatible to install GOSU on the image
         && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \
         # Downloads the gosu command based on the dpkg version and gosu version supplied

diff --git a/Dockerfiles/aai-common/Dockerfile.ubuntu b/Dockerfiles/aai-common/Dockerfile.ubuntu
index df9c247..d81579d 100644 (file)
--- a/Dockerfiles/aai-common/Dockerfile.ubuntu
+++ b/Dockerfiles/aai-common/Dockerfile.ubuntu
@@ -18,7 +18,7 @@ RUN \
     # Creates the group and user with the name aaiadmin for aai
     #groupadd -r aaiadmin && useradd -r -g aaiadmin aaiadmin && \
     # Put all the dependencies into this variable to easily install everything
-    DEPS="ca-certificates curl git jq ksh libcurl3 netcat openjdk-8-jre-headless vim uuid-runtime wget" &&  \
+    DEPS="ca-certificates curl git fastjar jq ksh libcurl3 netcat openjdk-8-jre-headless vim uuid-runtime wget" &&  \
     # Run the update before for the package manager to properly fetch install packages
     apt-get update && \
     # Install the recommended dependencies