From c6ed084fbe4a4e6e127b81d4230dba69f63468ea Mon Sep 17 00:00:00 2001 From: Dario Mapelli Date: Thu, 19 Sep 2024 17:40:16 +0200 Subject: [PATCH] dbs3-client - distribute via dmwm/wmcore/requirements.txt only --- docker/pypi/dmwm-base/Dockerfile | 1 - docker/pypi/reqmgr2ms-unmerged/Dockerfile | 2 +- docker/pypi/reqmgr2ms-unmerged/Dockerfile.dist | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/docker/pypi/dmwm-base/Dockerfile b/docker/pypi/dmwm-base/Dockerfile index cb36adb9a..0ffd15f8e 100644 --- a/docker/pypi/dmwm-base/Dockerfile +++ b/docker/pypi/dmwm-base/Dockerfile @@ -11,7 +11,6 @@ COPY --from=cmsweb-base /etc/grid-security/vomsdir /etc/grid-security/vomsdir COPY --from=exporters /data/cmsweb-ping /usr/bin/cmsweb-ping COPY --from=exporters /data/process_exporter /usr/bin/process_exporter COPY --from=exporters /data/cpy_exporter /usr/bin/cpy_exporter -RUN pip install dbs3-client ADD run.sh /data/run.sh ADD monitor.sh /data/monitor.sh ADD manage /data/manage diff --git a/docker/pypi/reqmgr2ms-unmerged/Dockerfile b/docker/pypi/reqmgr2ms-unmerged/Dockerfile index 0ce46fa1f..26bb6f7f2 100644 --- a/docker/pypi/reqmgr2ms-unmerged/Dockerfile +++ b/docker/pypi/reqmgr2ms-unmerged/Dockerfile @@ -14,7 +14,7 @@ ADD run.sh $WDIR/run.sh RUN curl -ksLO https://raw.githubusercontent.com/dmwm/WMCore/$TAG/requirements.txt RUN cat requirements.txt | grep -v gfal2 > req.txt RUN pip install -r req.txt -RUN pip install --no-deps reqmgr2ms-unmerged==$TAG dbs3-client +RUN pip install --no-deps reqmgr2ms-unmerged==$TAG RUN sed -i -e "s,-config.py,-config-unmerged.py,g" /data/run.sh RUN sed -i -e "s,config.py,config-unmerged.py,g" /data/manage ENV WDIR=/data diff --git a/docker/pypi/reqmgr2ms-unmerged/Dockerfile.dist b/docker/pypi/reqmgr2ms-unmerged/Dockerfile.dist index 98ce18e75..46219feaa 100644 --- a/docker/pypi/reqmgr2ms-unmerged/Dockerfile.dist +++ b/docker/pypi/reqmgr2ms-unmerged/Dockerfile.dist @@ -15,7 +15,6 @@ WORKDIR reqmgr2ms-unmerged-$TAG # add requirements.txt file which should exclude gfal2 package RUN cat requirements.txt | grep -v gfal2 > req.txt RUN pip install -r req.txt -RUN pip install dbs3-client RUN python3 setup.py develop --no-deps RUN sed -i -e "s,-config.py,-config-unmerged.py,g" /data/run.sh ENV WDIR=/data