Added infer and minor cleanup

docker/code-analysis/Dockerfile

@@ -18,7 +18,6 @@ RUN \
         autoconf \
         automake \
         build-essential \
-        clang-format \
         cmake \
         curl \
         gcovr \
@@ -51,7 +50,6 @@ RUN \
         libnl-route-3-dev \
         libpcre3-dev \
         libssl-dev \
-        libssl-dev \
         libtool \
         libtrace-dev \
         libuv1-dev \
@@ -66,27 +64,19 @@ RUN \
         # Dependencies for ieee1905
         libpcap-dev \
         clang \
-        shellcheck
+        clang-format \
+        clang-tidy \
+        shellcheck \
+        jq \
+        python3-pip \
+        cppcheck \
+        bear
 
 RUN mkdir /opt/dev && \
     mkdir /etc/config
 
 RUN git config --global advice.detachedHead false
 
-# install cppcheck
-ARG CPPCHECK_VERSION=2.7
-RUN \
-    cd /opt/dev && \
-    git clone -b ${CPPCHECK_VERSION} --depth=1 https://github.com/danmar/cppcheck.git && \
-    cd cppcheck && \
-    mkdir build && \
-    cd build && \
-    cmake -DHAVE_RULES=ON -DUSE_MATCHCOMPILER=ON .. && \
-    cmake --build . && \
-    cmake --install . && \
-    cd ../.. && \
-    rm -rf cppcheck
-
 # install node
 ARG NODEJS_VERSION_MAJOR=16
 RUN curl -fsSL "https://deb.nodesource.com/setup_${NODEJS_VERSION_MAJOR}.x" | bash - && \
@@ -124,7 +114,7 @@ RUN \
     git clone https://git.openwrt.org/project/libubox.git && \
     cd libubox && mkdir build && cd build && \
     git checkout ${LIBUBOX_VERSION} && \
-    cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE:String="Release" .. && \
+    cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_LUA=OFF -DCMAKE_BUILD_TYPE:String="Release" .. && \
     make -j2 && \
     make install
 
@@ -161,17 +151,6 @@ RUN \
     make -j2 && \
     make install
 
-# json-editor
-ARG JSON_EDITOR_VERSION=44b32937a062ec4ffc9f7355841dc94ab6efa50f
-RUN \
-    cd /opt/dev && \
-    git clone https://dev.iopsys.eu/iopsys/json-editor.git && \
-    cd json-editor && \
-    git checkout ${JSON_EDITOR_VERSION} && \
-    cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE:String="Release" . && \
-    make && \
-    make install
-
 # json-cpp
 ARG JSON_CPP_VERSION=v3.11.2
 RUN \
@@ -256,17 +235,37 @@ RUN \
     ln -sf /usr/lib/libmicroxml.so.1.0 /lib/libmicroxml.so && \
     ln -sf /usr/lib/libmicroxml.so.1.0 /lib/libmicroxml.so.1
 
+# Download the Infer release
+RUN INFER_VERSION=v1.2.0; \
+    cd /opt && \
+    curl -sL \
+      https://github.com/facebook/infer/releases/download/${INFER_VERSION}/infer-linux-x86_64-${INFER_VERSION}.tar.xz | \
+    tar xJ && \
+    rm -f /infer && \
+    ln -s ${PWD}/infer-linux-x86_64-$INFER_VERSION /infer
+
+# Install infer
+ENV PATH /infer/bin:${PATH}
+
+# Install python ubus module and valgrind-ci
+RUN pip3 install ubus ValgrindCI
+
 WORKDIR /builds/iopsys/
 
 # Prepare supervisor
 RUN mkdir -p /var/log/supervisor && \
     mkdir -p /etc/supervisor/conf.d/
+
 COPY supervisord.conf /etc/supervisor/
 
 # Prepare JSON Schemas
 RUN mkdir -p /usr/share/rpcd/schemas && \
     mkdir -p /usr/share/rpcd/definitions
 
+
+# Copy more_test script
+COPY more_test.sh /usr/local/bin/more_test.sh
+
 # Start entrypoint
 COPY entrypoint.sh /usr/local/bin/entrypoint.sh
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]