From 9b78e917c1093bfdf1467d2dafd92006ea0c21ff Mon Sep 17 00:00:00 2001 From: Christophe Haen Date: Tue, 1 Oct 2024 12:16:53 +0200 Subject: [PATCH] img --- .gitignore | 1 + extensions/containers/services/Dockerfile | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fafc5d10..32cded81 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ parts bin develop-eggs .installed.cfg +*.whl # Translations *.mo diff --git a/extensions/containers/services/Dockerfile b/extensions/containers/services/Dockerfile index f0ab501a..14d5fe4d 100644 --- a/extensions/containers/services/Dockerfile +++ b/extensions/containers/services/Dockerfile @@ -2,15 +2,18 @@ FROM ghcr.io/diracgrid/diracx/services:dev #Extension ENV DIRACX_EXTENSIONS="gubbins,diracx" +ENV GUBBINS_IMAGE_PACKAGES=core,db,routers,client ARG EXTRA_PACKAGES_TO_INSTALL -ARG EXTENSION_CUSTOM_SOURCES_TO_INSTALL + +# ARG EXTENSION_CUSTOM_SOURCES_TO_INSTALL + # RUN --mount=type=bind,source=.,target=/bindmount DIRACX_CUSTOM_SOURCE_PREFIXES=/bindmount /entrypoint.sh bash -ec "ls /bindmount/* " # RUN /entrypoint.sh bash -ec "IFS=',' read -r -a extra_pkg_array <<< "${EXTRA_PACKAGES_TO_INSTALL}" && echo ${extra_pkg_array} && echo ${EXTRA_PACKAGES_TO_INSTALL} && echo PROUT " -RUN --mount=type=bind,source=.,target=/bindmount DIRACX_CUSTOM_SOURCE_PREFIXES=/bindmount /entrypoint.sh bash -exc "ls /bindmount && pip install --no-deps ${EXTRA_PACKAGES_TO_INSTALL} ${EXTENSION_CUSTOM_SOURCES_TO_INSTALL} && echo 'Running pip check' && pip check" +RUN --mount=type=bind,source=.,target=/bindmount GUBBINS_CUSTOM_SOURCE_PREFIXES=/bindmount /entrypoint.sh bash -exc "ls /bindmount && echo 'Running pip check' && pip check"