From 69f0a02a52101ef9c6f44b395d706ccd852e9c68 Mon Sep 17 00:00:00 2001 From: Alan Malta Rodrigues Date: Mon, 23 Sep 2024 17:03:32 -0400 Subject: [PATCH] Update dmwm-base/wmagent-base and all WM tags to 20240923 (#1551) --- docker/pypi/dmwm-base/Dockerfile | 5 +++-- 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 +- 14 files changed, 16 insertions(+), 15 deletions(-) diff --git a/docker/pypi/dmwm-base/Dockerfile b/docker/pypi/dmwm-base/Dockerfile index 0ffd15f8e..7c1eb023e 100644 --- a/docker/pypi/dmwm-base/Dockerfile +++ b/docker/pypi/dmwm-base/Dockerfile @@ -2,8 +2,9 @@ FROM registry.cern.ch/cmsweb/cmsweb-base as cmsweb-base FROM registry.cern.ch/cmsweb/exporters as exporters FROM python:3.8-bullseye MAINTAINER Valentin Kuznetsov vkuznet@gmail.com -RUN apt-get update -RUN apt-get install -y curl vim libcurl4 libcurl4-openssl-dev python3-pycurl pip apache2-utils sudo less +RUN apt-get update && \ + apt-get install -y curl vim libcurl4 libcurl4-openssl-dev python3-pycurl pip apache2-utils sudo less && \ + apt-get clean 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 diff --git a/docker/pypi/global-workqueue/Dockerfile b/docker/pypi/global-workqueue/Dockerfile index b05a555df..20349c655 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-20240912-stable +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240923-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 eed567d4c..36e57ed90 100644 --- a/docker/pypi/reqmgr2/Dockerfile +++ b/docker/pypi/reqmgr2/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240912-stable +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240923-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 cf908bec8..72a975b7f 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-20240912-stable +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240923-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 a7e81b866..8d7707047 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-20240912-stable +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240923-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 5ac757725..2a1e02633 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-20240912-stable +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240923-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 612b738c2..0fd179b62 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-20240912-stable +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240923-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 3f1d45dc5..2ad42a1d2 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-20240912-stable +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240923-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 26bb6f7f2..8656a9541 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-20240912-stable +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240923-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 489df367b..84bd7fda5 100644 --- a/docker/pypi/reqmgr2ms/Dockerfile +++ b/docker/pypi/reqmgr2ms/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240912-stable +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240923-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 304bdc6b3..3b6b6357d 100644 --- a/docker/pypi/reqmon/Dockerfile +++ b/docker/pypi/reqmon/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240912-stable +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240923-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 01033e6ae..db41bb92e 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-20240912-stable +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240923-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 7d4269bf4..67dd2218f 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-20240912-stable +FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240923-stable # Install basic OS package dependencies RUN apt-get update diff --git a/docker/pypi/wmagent/Dockerfile b/docker/pypi/wmagent/Dockerfile index afaab2dfd..f71f42169 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-stable +FROM registry.cern.ch/cmsweb/wmagent-base:pypi-20240923-stable MAINTAINER Valentin Kuznetsov vkuznet@gmail.com # TAG to be passed at build time through `--build-arg TAG=`. Default: None