From 8972880b77de642708551d24cf13e18898e4e39f Mon Sep 17 00:00:00 2001
From: Bharath Vignesh J K <52282402+RazCrimson@users.noreply.github.com>
Date: Sun, 7 May 2023 19:44:00 +0530
Subject: [PATCH] chg: Dockerfile - fix alpine ARM build failures for
 cryptography

Issue: #2368
---
 docker-files/alpine.Dockerfile | 13 ++++++++++---
 optional-requirements.txt      |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/docker-files/alpine.Dockerfile b/docker-files/alpine.Dockerfile
index 2b71b2ca80..0c47083928 100644
--- a/docker-files/alpine.Dockerfile
+++ b/docker-files/alpine.Dockerfile
@@ -29,8 +29,10 @@ RUN apk add --no-cache \
   smartmontools \
   iputils \
   tzdata \
-  # Required for 'cryptography' dependency
-  gcc libffi-dev openssl-dev cargo pkgconfig
+  # Required for 'cryptography' dependency of optional requirement 'cassandra-driver' \
+  # Refer: https://cryptography.io/en/latest/installation/#alpine \
+  # `git` required to clone cargo crates (dependencies)
+  gcc libffi-dev openssl-dev cargo pkgconfig git
 
 ##############################################################################
 # Install the dependencies beforehand to make them cacheable
@@ -58,9 +60,14 @@ RUN pip3 install --no-cache-dir --user glances
 FROM build as buildOptionalRequirements
 ARG PYTHON_VERSION
 
+# Required for optional dependency cassandra-driver
+ENV CASS_DRIVER_NO_CYTHON=1
+# See issue 2368
+ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
+
 COPY requirements.txt .
 COPY optional-requirements.txt .
-RUN CASS_DRIVER_NO_CYTHON=1 pip3 install --no-cache-dir --user -r optional-requirements.txt
+RUN pip3 install --no-cache-dir --user -r optional-requirements.txt
 
 ##############################################################################
 # full image
diff --git a/optional-requirements.txt b/optional-requirements.txt
index a331b53e4f..138f3ceb3b 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -4,7 +4,7 @@
 batinfo
 bernhard
 bottle
-#cassandra-driver   # cassandra-driver breaks Glances CI (Alpine Docker). See detail in issue #2368
+cassandra-driver
 chevron
 couchdb
 docker==6.0.1