Merge pull request #702 from ericvaandering/33_3_cms1

Update Docker files for patches included in 33
dmwm · Jan 24, 2024 · 78879ac · 78879ac
2 parents ca186fe + 710be08
commit 78879ac
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 15 deletions.
diff --git a/docker/rucio-daemons/Dockerfile b/docker/rucio-daemons/Dockerfile
@@ -37,9 +37,9 @@ ADD docker/rucio-daemons/cms-entrypoint.sh /
 # ADD https://raw.githubusercontent.com/ericvaandering/containers/add_preparer/daemons/rucio.cfg.j2 /tmp/rucio.cfg.j2
 
 # Cannot make patch directory unless there are patches
-RUN mkdir -p /patch
+#RUN mkdir -p /patch
 
 # Patch for auto approve plugin rucio/pull/6215
-ADD https://github.com/rucio/rucio/pull/6215.patch /patch/6215.patch
+#ADD https://github.com/rucio/rucio/pull/6215.patch /patch/6215.patch
 
 ENTRYPOINT ["/cms-entrypoint.sh"]
diff --git a/docker/rucio-probes/Dockerfile b/docker/rucio-probes/Dockerfile
@@ -40,15 +40,7 @@ ADD https://raw.githubusercontent.com/ericvaandering/probes/update_check_expecte
 # Supplanted in PR115 ADD https://raw.githubusercontent.com/ericvaandering/probes/cms_check_expired_rules/common/check_expired_rules /probes/common
 ADD https://raw.githubusercontent.com/ericvaandering/probes/cms_check_expired_locked/common/check_expired_locked_rules /probes/common
 
-# PR 115
-
-ADD https://raw.githubusercontent.com/ericvaandering/probes/test_new_pusher/cms/check_expected_total_number_of_files_per_rse /probes/cms/
-ADD https://raw.githubusercontent.com/ericvaandering/probes/test_new_pusher/cms/check_expiring_rules_per_rse /probes/cms/
-ADD https://raw.githubusercontent.com/ericvaandering/probes/test_new_pusher/cms/check_report_used_space /probes/cms/
-ADD https://raw.githubusercontent.com/ericvaandering/probes/test_new_pusher/common/check_expired_rules /probes/common/
-ADD https://raw.githubusercontent.com/ericvaandering/probes/test_new_pusher/common/utils/common.py /probes/common/utils/
-
-# PR 122
+# PR 122 - Should be in 33.4
 
 ADD https://raw.githubusercontent.com/ericvaandering/probes/675-dev-merge-and-update-rse-based-probes/cms/check_rse_files_rules /probes/cms/
 

diff --git a/docker/rucio-server/Dockerfile b/docker/rucio-server/Dockerfile
@@ -24,9 +24,9 @@ ADD docker/rucio-server/install_mail_templates.sh /tmp/
 RUN /tmp/install_mail_templates.sh
 
 # Cannot make patch directory unless there are patches
-RUN mkdir -p /patch
+#RUN mkdir -p /patch
 
 # Patch for auto approve plugin rucio/pull/6215
-ADD https://github.com/rucio/rucio/pull/6215.patch /patch/6215.patch
+#ADD https://github.com/rucio/rucio/pull/6215.patch /patch/6215.patch
 
 ENTRYPOINT ["/cms-entrypoint.sh"]
diff --git a/docker/rucio-ui/Dockerfile b/docker/rucio-ui/Dockerfile
@@ -22,10 +22,10 @@ RUN rm -f /etc/httpd/conf.d/welcome.conf /etc/httpd/conf.d/userdir.conf /etc/htt
 ENV RUCIO_CA_PATH="/cvmfs/grid.cern.ch/etc/grid-security/certificates"
 
 # Cannot make patch directory unless there are patches
-RUN mkdir -p /patch
+#RUN mkdir -p /patch
 
 # Patch for auto approve plugin rucio/pull/6215
-ADD https://github.com/rucio/rucio/pull/6215.patch /patch/6215.patch
+#ADD https://github.com/rucio/rucio/pull/6215.patch /patch/6215.patch
 
 ADD docker/rucio-ui/cms-entrypoint.sh /
 ENTRYPOINT ["/cms-entrypoint.sh"]