Skip to content

Commit

Permalink
dbs3-client - distribute via dmwm/wmcore/requirements.txt only (#1550)
Browse files Browse the repository at this point in the history
  • Loading branch information
mapellidario authored Sep 23, 2024
1 parent c713734 commit 255d88c
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 3 deletions.
1 change: 0 additions & 1 deletion docker/pypi/dmwm-base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/pypi/reqmgr2ms-unmerged/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion docker/pypi/reqmgr2ms-unmerged/Dockerfile.dist
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 255d88c

Please sign in to comment.