From d9cdde8967aaceb06f6a16255a5b6dc6e9da8573 Mon Sep 17 00:00:00 2001 From: Mars Lan Date: Wed, 11 Oct 2023 04:22:30 -0700 Subject: [PATCH 1/2] Pin oscrypto to specific hash to fix compatiblity issue with OpenSSL --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 5b6ebbd2..5389a0ad 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "metaphor-connectors" -version = "0.13.2" +version = "0.13.3" license = "Apache-2.0" description = "A collection of Python-based 'connectors' that extract metadata from various sources to ingest into the Metaphor app." authors = ["Metaphor "] @@ -31,6 +31,7 @@ lkml = { version = "^1.3.1", optional = true } looker-sdk = { version = "^23.6.0", optional = true } metaphor-models = "0.27.0" msal = { version = "^1.20.0", optional = true } +oscrypto = { git = "https://github.com/wbond/oscrypto.git", rev = "1547f53" } # Until oscrypto 1.3.1 is release: https://github.com/wbond/oscrypto/issues/78 pycarlo = { version = "^0.8.1", optional = true } pydantic = "^1.10.0" pymssql = { version = "2.2.7", optional = true } # pymssql 2.2.8 is currently broken From bdbdf5ddc046b2e97b110cc2552d235b9e9627b2 Mon Sep 17 00:00:00 2001 From: Mars Lan Date: Wed, 11 Oct 2023 04:39:10 -0700 Subject: [PATCH 2/2] Install git before running pip install --- Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7ffd2884..2d8ef5dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,14 @@ + FROM python:3.8-slim +RUN apt-get clean +RUN apt-get update +RUN apt-get install -y git + COPY . /src RUN pip install '/src[all]' RUN rm -rf /src -RUN apt-get clean -RUN apt-get update -RUN apt-get install -y git - CMD ["sh", "-c", "metaphor ${CONNECTOR} ${CONFIG_FILE}"]