Merge branch 'master' into xsoar-tools-update-sdk-version

demisto · Dec 25, 2024 · 8c75e57 · 8c75e57
2 parents 57d9bb4 + ad3d3c6
commit 8c75e57
Show file tree

Hide file tree

Showing 45 changed files with 5,131 additions and 3,825 deletions.
diff --git a/docker/argus-toolbelt/Pipfile.lock b/docker/argus-toolbelt/Pipfile.lock
diff --git a/docker/auth-utils/poetry.lock b/docker/auth-utils/poetry.lock
diff --git a/docker/axonius/Pipfile.lock b/docker/axonius/Pipfile.lock
diff --git a/docker/boto3py3/Pipfile.lock b/docker/boto3py3/Pipfile.lock
diff --git a/docker/commvault/Pipfile.lock b/docker/commvault/Pipfile.lock
diff --git a/docker/datadog-api-client/Pipfile.lock b/docker/datadog-api-client/Pipfile.lock
diff --git a/docker/dxl/Pipfile.lock b/docker/dxl/Pipfile.lock
diff --git a/docker/flask-nginx/Pipfile.lock b/docker/flask-nginx/Pipfile.lock
diff --git a/docker/genericsql/Dockerfile b/docker/genericsql/Dockerfile
@@ -29,7 +29,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   libc-dev \
   libssl-dev \
   unixodbc-dev \
-&& wget ftp://ftp.freetds.org/pub/freetds/stable/freetds-1.1.39.tar.gz \
+# && wget ftp://ftp.freetds.org/pub/freetds/stable/freetds-1.1.39.tar.gz \
+&& wget --no-check-certificate https://www.freetds.org/files/stable/freetds-1.1.39.tar.gz \
 && tar -xzf freetds-1.1.39.tar.gz \
 && cd freetds-1.1.39 \
 && ./configure --with-openssl --with-unixodbc=/usr --enable-msdblib \

diff --git a/docker/genericsql/Pipfile b/docker/genericsql/Pipfile
@@ -14,6 +14,7 @@ psycopg2-binary = "*"
 pyodbc = "*"
 cx-oracle = "*"
 expiringdict = "*"
+cryptography = "*"
 
 [requires]
 python_version = "3.11"