From a6f6ac9d1c68cc9a1f361e267d315294f1f19cf5 Mon Sep 17 00:00:00 2001 From: Alan Malta Rodrigues Date: Thu, 12 Sep 2024 11:59:29 -0400 Subject: [PATCH 1/3] Stop depending on /etc/vomses from cmsweb-base image --- docker/pypi/dmwm-base/Dockerfile | 1 - docker/pypi/wmagent/Dockerfile | 4 ---- 2 files changed, 5 deletions(-) diff --git a/docker/pypi/dmwm-base/Dockerfile b/docker/pypi/dmwm-base/Dockerfile index e628c7eaa..cb36adb9a 100644 --- a/docker/pypi/dmwm-base/Dockerfile +++ b/docker/pypi/dmwm-base/Dockerfile @@ -8,7 +8,6 @@ RUN ln -s /usr/bin/python3 /usr/bin/python RUN mkdir /etc/grid-security COPY --from=cmsweb-base /etc/grid-security/certificates /etc/grid-security/certificates COPY --from=cmsweb-base /etc/grid-security/vomsdir /etc/grid-security/vomsdir -COPY --from=cmsweb-base /etc/vomses /etc/vomses 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 diff --git a/docker/pypi/wmagent/Dockerfile b/docker/pypi/wmagent/Dockerfile index ed6ba39d0..01a3cbf89 100644 --- a/docker/pypi/wmagent/Dockerfile +++ b/docker/pypi/wmagent/Dockerfile @@ -62,10 +62,6 @@ EOF # allow dynamic users to create homefolders and .bashrc RUN chmod 777 /home -# given that we have to mount up-to-date /etc/vomses and we have a different setup for CERN -# - being a directory - and FNAL being a file; just delete it from the image -RUN rm -rf /etc/vomses - # preserve the whole env for later use by the cron daemon RUN env > /etc/environment From 9c7dc5b89efd080e9ea9d6fbbaa5794d6102e2a9 Mon Sep 17 00:00:00 2001 From: Alan Malta Rodrigues Date: Thu, 12 Sep 2024 12:07:38 -0400 Subject: [PATCH 2/3] Use dmwm-base and wmagent-base tag 20240912 across WM images --- docker/pypi/global-workqueue/Dockerfile | 2 +- docker/pypi/reqmgr2/Dockerfile | 2 +- docker/pypi/reqmgr2ms-monitor/Dockerfile | 2 +- docker/pypi/reqmgr2ms-output/Dockerfile | 2 +- docker/pypi/reqmgr2ms-pileup/Dockerfile | 2 +- docker/pypi/reqmgr2ms-rulecleaner/Dockerfile | 2 +- docker/pypi/reqmgr2ms-transferor/Dockerfile | 2 +- docker/pypi/reqmgr2ms-unmerged/Dockerfile | 2 +- docker/pypi/reqmgr2ms/Dockerfile | 2 +- docker/pypi/reqmon/Dockerfile | 2 +- docker/pypi/t0_reqmon/Dockerfile | 2 +- docker/pypi/wmagent-base/Dockerfile | 2 +- docker/pypi/wmagent/Dockerfile | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docker/pypi/global-workqueue/Dockerfile b/docker/pypi/global-workqueue/Dockerfile index 553e6493e..c2df68242 100644 --- a/docker/pypi/global-workqueue/Dockerfile +++ b/docker/pypi/global-workqueue/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230525 +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230912 MAINTAINER Valentin Kuznetsov vkuznet@gmail.com # TAG to be passed at build time through `--build-arg TAG=`. Default: None ARG TAG=None diff --git a/docker/pypi/reqmgr2/Dockerfile b/docker/pypi/reqmgr2/Dockerfile index c70a7fadb..d71047262 100644 --- a/docker/pypi/reqmgr2/Dockerfile +++ b/docker/pypi/reqmgr2/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230525 +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230912 MAINTAINER Valentin Kuznetsov vkuznet@gmail.com # TAG to be passed at build time through `--build-arg TAG=`. Default: None ARG TAG=None diff --git a/docker/pypi/reqmgr2ms-monitor/Dockerfile b/docker/pypi/reqmgr2ms-monitor/Dockerfile index 1e9ffe547..82416d6a3 100644 --- a/docker/pypi/reqmgr2ms-monitor/Dockerfile +++ b/docker/pypi/reqmgr2ms-monitor/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230525 +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230912 MAINTAINER Valentin Kuznetsov vkuznet@gmail.com # TAG to be passed at build time through `--build-arg TAG=`. Default: None ARG TAG=None diff --git a/docker/pypi/reqmgr2ms-output/Dockerfile b/docker/pypi/reqmgr2ms-output/Dockerfile index 842fa09b5..da7cb18fc 100644 --- a/docker/pypi/reqmgr2ms-output/Dockerfile +++ b/docker/pypi/reqmgr2ms-output/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230525 +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230912 MAINTAINER Valentin Kuznetsov vkuznet@gmail.com # TAG to be passed at build time through `--build-arg TAG=`. Default: None ARG TAG=None diff --git a/docker/pypi/reqmgr2ms-pileup/Dockerfile b/docker/pypi/reqmgr2ms-pileup/Dockerfile index bf3926b34..ce4a66883 100644 --- a/docker/pypi/reqmgr2ms-pileup/Dockerfile +++ b/docker/pypi/reqmgr2ms-pileup/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230525 +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230912 MAINTAINER Valentin Kuznetsov vkuznet@gmail.com # TAG to be passed at build time through `--build-arg TAG=`. Default: None ARG TAG=None diff --git a/docker/pypi/reqmgr2ms-rulecleaner/Dockerfile b/docker/pypi/reqmgr2ms-rulecleaner/Dockerfile index 33e2bb662..fa017867e 100644 --- a/docker/pypi/reqmgr2ms-rulecleaner/Dockerfile +++ b/docker/pypi/reqmgr2ms-rulecleaner/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230525 +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230912 MAINTAINER Valentin Kuznetsov vkuznet@gmail.com # TAG to be passed at build time through `--build-arg TAG=`. Default: None ARG TAG=None diff --git a/docker/pypi/reqmgr2ms-transferor/Dockerfile b/docker/pypi/reqmgr2ms-transferor/Dockerfile index a90e79529..0e085de2a 100644 --- a/docker/pypi/reqmgr2ms-transferor/Dockerfile +++ b/docker/pypi/reqmgr2ms-transferor/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230525 +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230912 MAINTAINER Valentin Kuznetsov vkuznet@gmail.com # TAG to be passed at build time through `--build-arg TAG=`. Default: None ARG TAG=None diff --git a/docker/pypi/reqmgr2ms-unmerged/Dockerfile b/docker/pypi/reqmgr2ms-unmerged/Dockerfile index ba0c20e87..357b132a5 100644 --- a/docker/pypi/reqmgr2ms-unmerged/Dockerfile +++ b/docker/pypi/reqmgr2ms-unmerged/Dockerfile @@ -1,5 +1,5 @@ FROM registry.cern.ch/cmsweb/gfal:latest as gfal -FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230525 +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230912 MAINTAINER Valentin Kuznetsov vkuznet@gmail.com COPY --from=gfal /data/miniconda /data/miniconda ENV WDIR=/data diff --git a/docker/pypi/reqmgr2ms/Dockerfile b/docker/pypi/reqmgr2ms/Dockerfile index b8c65ba3a..cd2d309b7 100644 --- a/docker/pypi/reqmgr2ms/Dockerfile +++ b/docker/pypi/reqmgr2ms/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230525 +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230912 MAINTAINER Valentin Kuznetsov vkuznet@gmail.com RUN pip install reqmgr2ms-output ENV WDIR=/data diff --git a/docker/pypi/reqmon/Dockerfile b/docker/pypi/reqmon/Dockerfile index 5d19b723a..e26c0034c 100644 --- a/docker/pypi/reqmon/Dockerfile +++ b/docker/pypi/reqmon/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230525 +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230912 MAINTAINER Valentin Kuznetsov vkuznet@gmail.com # TAG to be passed at build time through `--build-arg TAG=`. Default: None ARG TAG=None diff --git a/docker/pypi/t0_reqmon/Dockerfile b/docker/pypi/t0_reqmon/Dockerfile index 242c3e962..dfcc1bc5e 100644 --- a/docker/pypi/t0_reqmon/Dockerfile +++ b/docker/pypi/t0_reqmon/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230525 +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230912 MAINTAINER Valentin Kuznetsov vkuznet@gmail.com # TAG to be passed at build time through `--build-arg TAG=`. Default: None ARG TAG=None diff --git a/docker/pypi/wmagent-base/Dockerfile b/docker/pypi/wmagent-base/Dockerfile index 73d9a4c6f..fd2247a75 100644 --- a/docker/pypi/wmagent-base/Dockerfile +++ b/docker/pypi/wmagent-base/Dockerfile @@ -1,5 +1,5 @@ FROM registry.cern.ch/cmsweb/oracle:21_5-stable as oracle -FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230525 +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230912 # Install basic OS package dependencies RUN apt-get update diff --git a/docker/pypi/wmagent/Dockerfile b/docker/pypi/wmagent/Dockerfile index 01a3cbf89..626b74754 100644 --- a/docker/pypi/wmagent/Dockerfile +++ b/docker/pypi/wmagent/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:master -FROM registry.cern.ch/cmsweb/wmagent-base:pypi-20240604 +FROM registry.cern.ch/cmsweb/wmagent-base:pypi-20240912 MAINTAINER Valentin Kuznetsov vkuznet@gmail.com # TAG to be passed at build time through `--build-arg TAG=`. Default: None From 6b7264c0defa8a34e95b34c333ef5515d2f72bc6 Mon Sep 17 00:00:00 2001 From: Alan Malta Rodrigues Date: Thu, 12 Sep 2024 12:48:38 -0400 Subject: [PATCH 3/3] Adopt dmwm-base/wmagent-base image tag pypi-20240912-stable --- docker/pypi/global-workqueue/Dockerfile | 2 +- docker/pypi/reqmgr2/Dockerfile | 2 +- docker/pypi/reqmgr2ms-monitor/Dockerfile | 2 +- docker/pypi/reqmgr2ms-output/Dockerfile | 2 +- docker/pypi/reqmgr2ms-pileup/Dockerfile | 2 +- docker/pypi/reqmgr2ms-rulecleaner/Dockerfile | 2 +- docker/pypi/reqmgr2ms-transferor/Dockerfile | 2 +- docker/pypi/reqmgr2ms-unmerged/Dockerfile | 2 +- docker/pypi/reqmgr2ms/Dockerfile | 2 +- docker/pypi/reqmon/Dockerfile | 2 +- docker/pypi/t0_reqmon/Dockerfile | 2 +- docker/pypi/wmagent-base/Dockerfile | 2 +- docker/pypi/wmagent/Dockerfile | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docker/pypi/global-workqueue/Dockerfile b/docker/pypi/global-workqueue/Dockerfile index c2df68242..b05a555df 100644 --- a/docker/pypi/global-workqueue/Dockerfile +++ b/docker/pypi/global-workqueue/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230912 +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240912-stable MAINTAINER Valentin Kuznetsov vkuznet@gmail.com # TAG to be passed at build time through `--build-arg TAG=`. Default: None ARG TAG=None diff --git a/docker/pypi/reqmgr2/Dockerfile b/docker/pypi/reqmgr2/Dockerfile index d71047262..eed567d4c 100644 --- a/docker/pypi/reqmgr2/Dockerfile +++ b/docker/pypi/reqmgr2/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230912 +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240912-stable MAINTAINER Valentin Kuznetsov vkuznet@gmail.com # TAG to be passed at build time through `--build-arg TAG=`. Default: None ARG TAG=None diff --git a/docker/pypi/reqmgr2ms-monitor/Dockerfile b/docker/pypi/reqmgr2ms-monitor/Dockerfile index 82416d6a3..cf908bec8 100644 --- a/docker/pypi/reqmgr2ms-monitor/Dockerfile +++ b/docker/pypi/reqmgr2ms-monitor/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230912 +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240912-stable MAINTAINER Valentin Kuznetsov vkuznet@gmail.com # TAG to be passed at build time through `--build-arg TAG=`. Default: None ARG TAG=None diff --git a/docker/pypi/reqmgr2ms-output/Dockerfile b/docker/pypi/reqmgr2ms-output/Dockerfile index da7cb18fc..a7e81b866 100644 --- a/docker/pypi/reqmgr2ms-output/Dockerfile +++ b/docker/pypi/reqmgr2ms-output/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230912 +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240912-stable MAINTAINER Valentin Kuznetsov vkuznet@gmail.com # TAG to be passed at build time through `--build-arg TAG=`. Default: None ARG TAG=None diff --git a/docker/pypi/reqmgr2ms-pileup/Dockerfile b/docker/pypi/reqmgr2ms-pileup/Dockerfile index ce4a66883..5ac757725 100644 --- a/docker/pypi/reqmgr2ms-pileup/Dockerfile +++ b/docker/pypi/reqmgr2ms-pileup/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230912 +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240912-stable MAINTAINER Valentin Kuznetsov vkuznet@gmail.com # TAG to be passed at build time through `--build-arg TAG=`. Default: None ARG TAG=None diff --git a/docker/pypi/reqmgr2ms-rulecleaner/Dockerfile b/docker/pypi/reqmgr2ms-rulecleaner/Dockerfile index fa017867e..612b738c2 100644 --- a/docker/pypi/reqmgr2ms-rulecleaner/Dockerfile +++ b/docker/pypi/reqmgr2ms-rulecleaner/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230912 +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240912-stable MAINTAINER Valentin Kuznetsov vkuznet@gmail.com # TAG to be passed at build time through `--build-arg TAG=`. Default: None ARG TAG=None diff --git a/docker/pypi/reqmgr2ms-transferor/Dockerfile b/docker/pypi/reqmgr2ms-transferor/Dockerfile index 0e085de2a..3f1d45dc5 100644 --- a/docker/pypi/reqmgr2ms-transferor/Dockerfile +++ b/docker/pypi/reqmgr2ms-transferor/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230912 +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240912-stable MAINTAINER Valentin Kuznetsov vkuznet@gmail.com # TAG to be passed at build time through `--build-arg TAG=`. Default: None ARG TAG=None diff --git a/docker/pypi/reqmgr2ms-unmerged/Dockerfile b/docker/pypi/reqmgr2ms-unmerged/Dockerfile index 357b132a5..0ce46fa1f 100644 --- a/docker/pypi/reqmgr2ms-unmerged/Dockerfile +++ b/docker/pypi/reqmgr2ms-unmerged/Dockerfile @@ -1,5 +1,5 @@ FROM registry.cern.ch/cmsweb/gfal:latest as gfal -FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230912 +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240912-stable MAINTAINER Valentin Kuznetsov vkuznet@gmail.com COPY --from=gfal /data/miniconda /data/miniconda ENV WDIR=/data diff --git a/docker/pypi/reqmgr2ms/Dockerfile b/docker/pypi/reqmgr2ms/Dockerfile index cd2d309b7..489df367b 100644 --- a/docker/pypi/reqmgr2ms/Dockerfile +++ b/docker/pypi/reqmgr2ms/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230912 +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240912-stable MAINTAINER Valentin Kuznetsov vkuznet@gmail.com RUN pip install reqmgr2ms-output ENV WDIR=/data diff --git a/docker/pypi/reqmon/Dockerfile b/docker/pypi/reqmon/Dockerfile index e26c0034c..304bdc6b3 100644 --- a/docker/pypi/reqmon/Dockerfile +++ b/docker/pypi/reqmon/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230912 +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240912-stable MAINTAINER Valentin Kuznetsov vkuznet@gmail.com # TAG to be passed at build time through `--build-arg TAG=`. Default: None ARG TAG=None diff --git a/docker/pypi/t0_reqmon/Dockerfile b/docker/pypi/t0_reqmon/Dockerfile index dfcc1bc5e..01033e6ae 100644 --- a/docker/pypi/t0_reqmon/Dockerfile +++ b/docker/pypi/t0_reqmon/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230912 +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240912-stable MAINTAINER Valentin Kuznetsov vkuznet@gmail.com # TAG to be passed at build time through `--build-arg TAG=`. Default: None ARG TAG=None diff --git a/docker/pypi/wmagent-base/Dockerfile b/docker/pypi/wmagent-base/Dockerfile index fd2247a75..7d4269bf4 100644 --- a/docker/pypi/wmagent-base/Dockerfile +++ b/docker/pypi/wmagent-base/Dockerfile @@ -1,5 +1,5 @@ FROM registry.cern.ch/cmsweb/oracle:21_5-stable as oracle -FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230912 +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240912-stable # Install basic OS package dependencies RUN apt-get update diff --git a/docker/pypi/wmagent/Dockerfile b/docker/pypi/wmagent/Dockerfile index 626b74754..afaab2dfd 100644 --- a/docker/pypi/wmagent/Dockerfile +++ b/docker/pypi/wmagent/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:master -FROM registry.cern.ch/cmsweb/wmagent-base:pypi-20240912 +FROM registry.cern.ch/cmsweb/wmagent-base:pypi-20240912-stable MAINTAINER Valentin Kuznetsov vkuznet@gmail.com # TAG to be passed at build time through `--build-arg TAG=`. Default: None