combined docker file

docker/code-analysis/Dockerfile

@@ -26,7 +26,15 @@ RUN \
       strace \
       supervisor \
       net-tools \
-      iputils-ping
+      iputils-ping \
+      # static code analysis
+      unzip \
+      python3 \
+      python3-setuptools \
+      default-jre \
+      cppcheck \
+      flawfinder
+
 
 
 # Install dependent libraries
@@ -40,12 +48,12 @@ RUN \
       libcmocka-dev \
       libcmocka0
 
-
-
 # Remove cached packages.
 RUN rm -rf /var/lib/apt/lists/*
 
 RUN mkdir /opt/dev
+RUN mkdir /etc/config
+
 
 # Install JSON-C
 RUN \
@@ -111,8 +119,12 @@ RUN \
       make && \
       make install
 
+#install cpd
+WORKDIR /home/user
+RUN \
+      wget https://github.com/pmd/pmd/releases/download/pmd_releases%2F6.19.0/pmd-bin-6.19.0.zip && \
+      unzip pmd-bin-6.19.0.zip
 
-RUN mkdir /etc/config
 
 WORKDIR /opt/work
 

docker/static-code-analysis/Dockerfile

-FROM ubuntu:18.04
-
-LABEL maintainer="suru.dissanaike@iopsys.eu"
-LABEL build="docker build -t iopsys-staticcodeanalysis ."
-LABEL run="docker run -it --entrypoint /bin/bash --rm -v ${PWD}:/opt/work iopsys-staticcodeanalysis"
-
-# docker build -t iopsys-staticcodeanalysis .
-# docker images
-# docker tag <image id> surudissanaikeiopsys/iopsys-staticcodeanalysis:0.5
-# docker push surudissanaikeiopsys/iopsys-staticcodeanalysis:0.5
-
-RUN \
-      apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-      # general tools
-      wget \
-      build-essential \
-      lcov \
-      apt-utils \
-      autoconf \
-      automake \
-      pkg-config \
-      libtool \
-      sudo \
-      # static code analysis
-      unzip \
-      python3 \
-      python3-setuptools \
-      default-jre \
-      cppcheck \
-      flawfinder
-
-#install cpd
-WORKDIR /home/user
-RUN \
-      wget https://github.com/pmd/pmd/releases/download/pmd_releases%2F6.19.0/pmd-bin-6.19.0.zip && \
-      unzip pmd-bin-6.19.0.zip
-
-WORKDIR /opt/work