From da1b28a8784fe2409e5d559ba842e4e7f9747284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Budiseli=C4=87?= Date: Fri, 22 Nov 2024 11:12:46 -0500 Subject: [PATCH] Install auth modules dependencies (#526) Co-authored-by: imilinovic --- Dockerfile.no_ML | 2 ++ Dockerfile.release | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile.no_ML b/Dockerfile.no_ML index 5d2eefda6..3d256189e 100644 --- a/Dockerfile.no_ML +++ b/Dockerfile.no_ML @@ -57,6 +57,7 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- -y \ && export PATH="/root/.cargo/bin:${PATH}" \ && python3 -m pip install -r /mage/python/tests/requirements.txt \ && python3 -m pip install -r /mage/python/requirements_no_ml.txt \ + && python3 -m pip install --no-cache-dir -r /usr/lib/memgraph/auth_module/requirements.txt \ && python3 /mage/setup build -p /usr/lib/memgraph/query_modules/ --no-ml --cpp-build-flags CMAKE_BUILD_TYPE=${BUILD_TYPE} \ && chown -R memgraph: /mage/e2e @@ -76,6 +77,7 @@ ENV PY_VERSION ${PY_VERSION_DEFAULT} #copy modules COPY --from=dev /usr/lib/memgraph/query_modules/ /usr/lib/memgraph/query_modules/ +COPY --from=dev /usr/lib/memgraph/auth_module/ /usr/lib/memgraph/auth_module/ #copy python build COPY --from=dev /usr/local/lib/python${PY_VERSION}/ /usr/local/lib/python${PY_VERSION}/ diff --git a/Dockerfile.release b/Dockerfile.release index d8f4f18ce..71dcaffc9 100644 --- a/Dockerfile.release +++ b/Dockerfile.release @@ -59,6 +59,7 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- -y \ && export PATH="/root/.cargo/bin:${PATH}" \ && python3 -m pip install -r /mage/python/requirements.txt \ && python3 -m pip install -r /mage/python/tests/requirements.txt \ + && python3 -m pip install --no-cache-dir -r /usr/lib/memgraph/auth_module/requirements.txt \ && python3 -m pip install torch-sparse torch-cluster torch-spline-conv torch-geometric torch-scatter -f https://data.pyg.org/whl/torch-1.12.0+cu102.html \ && python3 /mage/setup build -p /usr/lib/memgraph/query_modules/ --cpp-build-flags CMAKE_BUILD_TYPE=${BUILD_TYPE} \ && chown -R memgraph: /mage/e2e @@ -83,6 +84,7 @@ ENV PY_VERSION ${PY_VERSION_DEFAULT} #copy modules COPY --from=dev /usr/lib/memgraph/query_modules/ /usr/lib/memgraph/query_modules/ +COPY --from=dev /usr/lib/memgraph/auth_module/ /usr/lib/memgraph/auth_module/ #copy python build COPY --from=dev /usr/local/lib/python${PY_VERSION}/ /usr/local/lib/python${PY_VERSION}/ @@ -98,7 +100,6 @@ RUN mv /mage/e2e /e2e/ \ && apt-get -y --purge autoremove clang git curl python3-pip python3-dev cmake build-essential \ && apt-get clean - USER memgraph ENTRYPOINT ["/usr/lib/memgraph/memgraph"] CMD [""]