Skip to content

Commit baaaa86

Browse files
committed
revert sn09 docker image cleanup
1 parent 038e5b4 commit baaaa86

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

group_vars/sn09/sn09.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,19 @@ firewall_htcondor_shared_port_service: >
5757
<port protocol="tcp" port="9628"/>
5858
</service>
5959
60+
fsm_maintenance_dir: '/data/dnb01/maintenance'
61+
fsm_cron_tasks:
62+
docker:
63+
enable: true
64+
name: 'Docker clean up'
65+
minute: 30
66+
hour: 2
67+
dom: '*'
68+
month: '*'
69+
dow: '*'
70+
job: '. {{ galaxy_root }}/.bashrc && docker system prune -f > /dev/null'
71+
user: '{{ fsm_galaxy_user.username }}'
72+
6073
# Telegraf
6174
telegraf_agent_hostname: '{{ hostname }}'
6275
telegraf_agent_version: 1.17.2

sn09.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,6 @@
154154
- 'telegraf'
155155
- 'stats' # special account to retrieve statistics from the server in read-only mode
156156

157-
- name: Set temporary cron for cleaning docker images
158-
ansible.builtin.cron:
159-
name: 'Temporary docker cleanup – needs upstream fix see issue #584'
160-
minute: '0'
161-
hour: '*/3'
162-
job: '/bin/docker system prune --all -f > /dev/null'
163-
164157
# Note (ToDo): We should ensure that the Gunicorn sockets are created with the correct SELinux
165158
# context to avoid adding or allowing unconfined contexts. This will further tighten
166159
# the security of the Galaxy instance. (Check the systemd role that is creating the sockets and
@@ -353,6 +346,7 @@
353346
- usegalaxy_eu.galaxy_systemd # Manage the Galaxy processes with SystemD
354347
- usegalaxy-eu.update-hosts # Update hosts list
355348
- usegalaxy_eu.gie_proxy # Setup the NodeJS proxy for GxIT
349+
- usegalaxy_eu.fs_maintenance # Filesystems maintenance
356350
- usegalaxy-eu.logrotate # Rotate logs
357351
- usegalaxy-eu.error-pages # Copy the NGINX error pages
358352
- usegalaxy-eu.fix-stuck-handlers # Restart handlers to prevent several classes of issues

0 commit comments

Comments
 (0)