integration

DIRACGrid · Jun 7, 2024 · 5c2cb31 · 5c2cb31
1 parent 3308d5d
commit 5c2cb31
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/extensions.yml b/.github/workflows/extensions.yml
@@ -131,7 +131,8 @@ jobs:
           tags: gubbins/services:dev
           outputs: type=docker,dest=/tmp/gubbins_services_image.tar
           build-args: |
-            EXTRA_PACKAGES_TO_INSTALL=git+https://github.com/DIRACGrid/DIRAC.git@integration,/bindmount/gubbins*.whl
+            EXTRA_PACKAGES_TO_INSTALL=git+https://github.com/DIRACGrid/DIRAC.git@integration"
+            EXTENSION_CUSTOM_SOURCES_TO_INSTALL="/bindmount/gubbins*.whl"
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4

diff --git a/extensions/containers/services/Dockerfile b/extensions/containers/services/Dockerfile
@@ -4,13 +4,13 @@ FROM ghcr.io/diracgrid/diracx/services:dev
 ENV DIRACX_EXTENSIONS "gubbins,diracx"
 
 ARG EXTRA_PACKAGES_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 -ec "pip install --no-deps ${EXTRA_PACKAGES_TO_INSTALL} && echo 'Running pip check' && pip check"
+RUN --mount=type=bind,source=.,target=/bindmount DIRACX_CUSTOM_SOURCE_PREFIXES=/bindmount /entrypoint.sh bash -exc "pip install --no-deps ${EXTRA_PACKAGES_TO_INSTALL} ${EXTENSION_CUSTOM_SOURCES_TO_INSTALL} && echo 'Running pip check' && pip check"