Fix busted container (#409)

* Fix busted container We were trying really hard to build with python 3.11 and getting a busted result. Force build with python 3.10 and everything is easy -- and the result works. * Revert "drop support for python36 (#400)" This reverts commit 70e4667. We need to defer this until after the 3.3.1 bugfix is released. * version bump Co-authored-by: Scott Bailey <[email protected]>
godaddy · Nov 23, 2022 · 81115e0 · 81115e0
1 parent 70e4667
commit 81115e0
Show file tree

Hide file tree

Showing 6 changed files with 132 additions and 73 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: [3.7, 3.8, 3.9, "3.10"]
+        python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
         include:
           - os: ubuntu-latest
             path: ~/.cache/pypoetry
@@ -39,6 +39,7 @@ jobs:
       name: Checkout the repo
     - uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353
       name: Cache Poetry & Tox deps
+      if: ${{ !(matrix.os == 'windows-latest' && matrix.python-version == '3.6') }}
       with:
         path: |
           {{ matrix.path }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
+v3.3.1 - 23 Nov 2022
+--------------------
+
+Bug fixes:
+* [#408](https://github.com/godaddy/tartufo/issues/408) - 3.3.0 container broken
+  * Rebuild container using python 3.10 base instead of python 3.11
+  * Eliminates reference to missing library present in 3.3.0 container
+  * Eliminates requirement for build-it-yerself libraries in container
+
 v3.3.0 - 22 Nov 2022
-----------------------
+--------------------
 Features:
 * [#401](https://github.com/godaddy/tartufo/pull/401) - Add report output format
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3-slim as base
+FROM python:3.10-slim as base
 
 WORKDIR /app
 
@@ -9,14 +9,6 @@ ENV PIP_DEFAULT_TIMEOUT=100 \
     PIP_NO_CACHE_DIR=1 \
     POETRY_VERSION=1.1.12
 
-RUN apt-get update && apt-get upgrade -y && apt-get install make cmake gcc libssl-dev wget -y
-RUN wget https://github.com/libgit2/libgit2/archive/refs/tags/v1.4.0.tar.gz -O libgit2-1.4.0.tar.gz \
-    && tar xzf libgit2-1.4.0.tar.gz \
-    && cd libgit2-1.4.0/ \
-    && cmake . \
-    && make \
-    && make install
-RUN apt-get install libffi-dev -y
 RUN pip --no-cache-dir install "poetry==$POETRY_VERSION"
 RUN python -m venv /venv