From abe2a37195a6f12ba4287c402268d3032fd56a02 Mon Sep 17 00:00:00 2001
From: Vivek Kumar Dutta <vivek.dutta@iopsys.eu>
Date: Fri, 25 Aug 2023 16:33:57 +0530
Subject: [PATCH] Updated base image to 22.04 to support OpenSSL-v3
---
docker/code-analysis/Dockerfile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/docker/code-analysis/Dockerfile b/docker/code-analysis/Dockerfile
index 17fbe2d..80c8b98 100644
--- a/docker/code-analysis/Dockerfile
+++ b/docker/code-analysis/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
LABEL maintainer="suru.dissanaike@iopsys.eu"
LABEL build="docker build -t code-analysis ."
@@ -81,7 +81,7 @@ RUN \
cd cppcheck && \
mkdir build && \
cd build && \
- cmake -j$(nproc) -DHAVE_RULES=ON -DUSE_MATCHCOMPILER=ON .. && \
+ cmake -DHAVE_RULES=ON -DUSE_MATCHCOMPILER=ON .. && \
cmake --build . && \
cmake --install . && \
cd ../.. && \
@@ -175,7 +175,7 @@ RUN \
make install
# json-cpp
-ARG JSON_CPP_VERSION=be61ad147000be4802173d0d118fd1b8109b4668
+ARG JSON_CPP_VERSION=v3.11.2
RUN \
cd /opt/dev && \
git clone https://github.com/nlohmann/json.git && \
--
GitLab