From 7787e42058c2a28851530fc6afa810308de9c2ae Mon Sep 17 00:00:00 2001
From: Ron Lynn <dad@lynntribe.net>
Date: Fri, 23 Jul 2021 14:31:08 -0700
Subject: [PATCH] #35 cleaned up packages with security vulns

---
 CHANGELOG.md     |  7 +++++++
 Dockerfile       | 26 +++++++++++++++++---------
 requirements.txt |  2 +-
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44e9e6f..4b9083e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 [markdownlint](https://dlaa.me/markdownlint/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.2.4] - 2021-07-23
+
+### Added to 1.2.4
+
+- Updated to newer version of fio
+- Removed duplicate apt package installs
+
 ## [1.2.3] - 2021-07-15
 
 ### Added to 1.2.3
diff --git a/Dockerfile b/Dockerfile
index 9869c5f..8c9654a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,11 @@
 ARG BASE_IMAGE=senzing/senzing-base:1.6.1
 FROM ${BASE_IMAGE}
 
-ENV REFRESHED_AT=2021-07-15
+ENV REFRESHED_AT=2021-07-23
 
 LABEL Name="senzing/sshd" \
       Maintainer="support@senzing.com" \
-      Version="1.2.3"
+      Version="1.2.4"
 
 HEALTHCHECK CMD ["/app/healthcheck.sh"]
 
@@ -18,7 +18,6 @@ USER root
 RUN apt-get update \
  && apt-get -y install \
     elfutils \
-    fio \
     htop \
     iotop \
     ipython3 \
@@ -26,20 +25,15 @@ RUN apt-get update \
     less \
     libpq-dev \
     net-tools \
-    odbc-postgresql \
     openssh-server \
     procps \
     pstack \
-    python-dev \
-    python-pyodbc \
-    python-setuptools \
+    python3-setuptools \
     strace \
     telnet \
     tree \
-    unixodbc \
     unixodbc-dev \
     unzip \
-    vim \
     zip \
  && rm -rf /var/lib/apt/lists/*
 
@@ -49,6 +43,20 @@ COPY requirements.txt ./
 RUN pip3 install --upgrade pip \
  && pip3 install -r requirements.txt
 
+# work around until Debian repos catch up to modern versions of fio --Dr. Ant
+
+RUN mkdir /tmp/fio \
+ && cd /tmp/fio \
+ && wget https://github.com/axboe/fio/archive/refs/tags/fio-3.27.zip \
+ && unzip fio-3.27.zip \
+ && cd fio-fio-3.27/ \
+ && ./configure \
+ && make \
+ && make install \
+ && fio --version \
+ && cd \
+ && rm -rf /tmp/fio
+
 ENV NOTVISIBLE "in users profile"
 
 ENV SENZING_SSHD_SHOW_PERFORMANCE_WARNING='true'
diff --git a/requirements.txt b/requirements.txt
index 2327760..4c437b5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ jinja2==2.11.3
 markupsafe==1.1.1
 pandas
 ptable
-pyodbc
+pyodbc==4.0.31
 pysnooper
 python-engineio==3.8.2.post1
 python-levenshtein