From d60e21e0ea2d15a0ba2878cb14ee69be711cf13c Mon Sep 17 00:00:00 2001
From: cwlacewe <chaunte.w.lacewell@intel.com>
Date: Thu, 10 Oct 2024 13:24:57 -0700
Subject: [PATCH] Update dockerfiles based on Hadolint results; Update
 requirements.txt

---
 .github/requirements.txt           | 14 +++++++-------
 .github/scripts/Dockerfile.checkin |  6 +++---
 docker/base/Dockerfile             |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/requirements.txt b/.github/requirements.txt
index 123e5765..531eef2c 100644
--- a/.github/requirements.txt
+++ b/.github/requirements.txt
@@ -1,22 +1,22 @@
 blinker==1.8.2
-cffi==1.16.0
+cffi==1.17.1
 click==8.1.7
 colorlog==6.8.2
-coverage==7.6.0
+coverage==7.6.2
 cryptography==43.0.1
 Flask==3.0.3
-gcovr==7.2
+gcovr==8.0
 imutils==0.5.4
 itsdangerous==2.2.0
 Jinja2==3.1.4
-lxml==5.2.2
-MarkupSafe==2.1.5
+lxml==5.3.0
+MarkupSafe==3.0.1
 numpy==1.26.4
 opencv-python-headless==4.9.0.80
 protobuf==4.24.2
 pycparser==2.22
 Pygments==2.18.0
 pyzmq==26.0.3
-scipy==1.14.0
+scipy==1.14.1
 sk-video==1.1.10
-Werkzeug==3.0.3
+Werkzeug==3.0.4
diff --git a/.github/scripts/Dockerfile.checkin b/.github/scripts/Dockerfile.checkin
index 58e02bd3..6240755c 100644
--- a/.github/scripts/Dockerfile.checkin
+++ b/.github/scripts/Dockerfile.checkin
@@ -54,9 +54,9 @@ RUN apt-get update -y && apt-get upgrade -y && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /usr/src
-# hadolint ignore=DL3003,SC2086
-RUN apt update -y && \
-    apt install -y libffi-dev libgdbm-dev libnss3-dev libreadline-dev libsqlite3-dev zlib1g-dev && \
+# hadolint ignore=DL3003,DL3008,SC2086
+RUN apt-get update -y && \
+    apt-get install -y --no-install-recommends libffi-dev libgdbm-dev libnss3-dev libreadline-dev libsqlite3-dev zlib1g-dev && \
     curl -O https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz && \
     tar -xzf Python-${PYTHON_VERSION}.tgz && cd Python-${PYTHON_VERSION} && \
     ./configure --enable-optimizations && make ${BUILD_THREADS} && make altinstall && \
diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index f20f3b1a..e2df67d0 100644
--- a/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@ -54,9 +54,9 @@ RUN apt-get update -y && apt-get upgrade -y && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /usr/src
-# hadolint ignore=DL3003,SC2086
-RUN apt update -y && \
-    apt install -y libffi-dev libgdbm-dev libnss3-dev libreadline-dev libsqlite3-dev zlib1g-dev && \
+# hadolint ignore=DL3003,DL3008,SC2086
+RUN apt-get update -y && \
+    apt-get install -y --no-install-recommends libffi-dev libgdbm-dev libnss3-dev libreadline-dev libsqlite3-dev zlib1g-dev && \
     curl -O https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz && \
     tar -xzf Python-${PYTHON_VERSION}.tgz && cd Python-${PYTHON_VERSION} && \
     ./configure --enable-optimizations && make ${BUILD_THREADS} && make altinstall && \
@@ -166,7 +166,7 @@ RUN curl -L -O https://github.com/gpakosz/peg/releases/download/${PEG_VERSION}/p
 # CLEANUP
 RUN rm -rf /dependencies /usr/local/share/doc /usr/local/share/man && \
     mkdir -p /opt/dist/usr/include/x86_64-linux-gnu && \
-        cp -rp /usr/include/x86_64-linux-gnu /opt/dist/usr/include/x86_64-linux-gnu
+    cp -rp /usr/include/x86_64-linux-gnu /opt/dist/usr/include/x86_64-linux-gnu
 
 
 ############################################################