Skip to content

Commit

Permalink
Update dmwm-base and wmagent-base images tag to 20240912; adopt it ac…
Browse files Browse the repository at this point in the history
…ross WM images (#1547)

* Stop depending on /etc/vomses from cmsweb-base image

* Use dmwm-base and wmagent-base tag 20240912 across WM images

* Adopt dmwm-base/wmagent-base image tag pypi-20240912-stable
  • Loading branch information
amaltaro authored Sep 12, 2024
1 parent 2d67aea commit e07f9ff
Show file tree
Hide file tree
Showing 14 changed files with 13 additions and 18 deletions.
1 change: 0 additions & 1 deletion docker/pypi/dmwm-base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/pypi/global-workqueue/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230525
FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240912-stable
MAINTAINER Valentin Kuznetsov [email protected]
# TAG to be passed at build time through `--build-arg TAG=<PYPI_TAG>`. Default: None
ARG TAG=None
Expand Down
2 changes: 1 addition & 1 deletion docker/pypi/reqmgr2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230525
FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240912-stable
MAINTAINER Valentin Kuznetsov [email protected]
# TAG to be passed at build time through `--build-arg TAG=<PYPI_TAG>`. Default: None
ARG TAG=None
Expand Down
2 changes: 1 addition & 1 deletion docker/pypi/reqmgr2ms-monitor/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230525
FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240912-stable
MAINTAINER Valentin Kuznetsov [email protected]
# TAG to be passed at build time through `--build-arg TAG=<PYPI_TAG>`. Default: None
ARG TAG=None
Expand Down
2 changes: 1 addition & 1 deletion docker/pypi/reqmgr2ms-output/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230525
FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240912-stable
MAINTAINER Valentin Kuznetsov [email protected]
# TAG to be passed at build time through `--build-arg TAG=<PYPI_TAG>`. Default: None
ARG TAG=None
Expand Down
2 changes: 1 addition & 1 deletion docker/pypi/reqmgr2ms-pileup/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230525
FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240912-stable
MAINTAINER Valentin Kuznetsov [email protected]
# TAG to be passed at build time through `--build-arg TAG=<PYPI_TAG>`. Default: None
ARG TAG=None
Expand Down
2 changes: 1 addition & 1 deletion docker/pypi/reqmgr2ms-rulecleaner/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230525
FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240912-stable
MAINTAINER Valentin Kuznetsov [email protected]
# TAG to be passed at build time through `--build-arg TAG=<PYPI_TAG>`. Default: None
ARG TAG=None
Expand Down
2 changes: 1 addition & 1 deletion docker/pypi/reqmgr2ms-transferor/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230525
FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240912-stable
MAINTAINER Valentin Kuznetsov [email protected]
# TAG to be passed at build time through `--build-arg TAG=<PYPI_TAG>`. Default: None
ARG TAG=None
Expand Down
2 changes: 1 addition & 1 deletion docker/pypi/reqmgr2ms-unmerged/Dockerfile
Original file line number Diff line number Diff line change
@@ -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-20240912-stable
MAINTAINER Valentin Kuznetsov [email protected]
COPY --from=gfal /data/miniconda /data/miniconda
ENV WDIR=/data
Expand Down
2 changes: 1 addition & 1 deletion docker/pypi/reqmgr2ms/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230525
FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240912-stable
MAINTAINER Valentin Kuznetsov [email protected]
RUN pip install reqmgr2ms-output
ENV WDIR=/data
Expand Down
2 changes: 1 addition & 1 deletion docker/pypi/reqmon/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230525
FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240912-stable
MAINTAINER Valentin Kuznetsov [email protected]
# TAG to be passed at build time through `--build-arg TAG=<PYPI_TAG>`. Default: None
ARG TAG=None
Expand Down
2 changes: 1 addition & 1 deletion docker/pypi/t0_reqmon/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20230525
FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20240912-stable
MAINTAINER Valentin Kuznetsov [email protected]
# TAG to be passed at build time through `--build-arg TAG=<PYPI_TAG>`. Default: None
ARG TAG=None
Expand Down
2 changes: 1 addition & 1 deletion docker/pypi/wmagent-base/Dockerfile
Original file line number Diff line number Diff line change
@@ -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-20240912-stable

# Install basic OS package dependencies
RUN apt-get update
Expand Down
6 changes: 1 addition & 5 deletions docker/pypi/wmagent/Dockerfile
Original file line number Diff line number Diff line change
@@ -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-stable
MAINTAINER Valentin Kuznetsov [email protected]

# TAG to be passed at build time through `--build-arg TAG=<WMA_TAG>`. Default: None
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit e07f9ff

Please sign in to comment.