Skip to content

Commit 7196c98

Browse files
committed
Merge pull request #28 from cfortier2/fix/docker-cleanup
Convert docker-cleanup to a script for easier maintainability
2 parents 1b610cd + a4374dd commit 7196c98

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

v1/fleet_units/docker-cleanup.service

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,7 @@ User=core
1010
Restart=on-failure
1111
RestartSec=20
1212
TimeoutStartSec=0
13-
ExecStart=/usr/bin/sh -c ' \
14-
if [[ $(/usr/bin/docker ps -a | grep Exited | awk \'{print $1 "\\t" $7 "\\t" $10}\' | grep week | wc -l) -ne 0 ]]; \
15-
then \
16-
echo "Starting docker cleanup with a max of: $MAX_DOCKER"; \
17-
/usr/bin/docker ps -a | grep Exited | awk \'{print $1 "\\t" $7 "\\t" $10}\' | grep week | awk \'{print $1}\' | head -n $MAX_DOCKER | xargs /usr/bin/docker rm -v ; \
18-
/usr/bin/docker images -a | grep none | awk \'{print $3}\' | xargs /usr/bin/docker rmi ; \
19-
echo "cleanup complete"; \
20-
else \
21-
echo "nothing to cleanup"; \
22-
fi
23-
sudo free -h'
13+
ExecStart=/usr/bin/bash -c '/usr/bin/wget -O /home/core/docker-cleanup.sh https://raw.githubusercontent.com/behance/mesos-systemd/fix/docker-cleanup/v1/fleet_units/docker-cleanup.sh && /usr/bin/bash /home/core/docker-cleanup.sh'
2414

2515
[X-Fleet]
2616
Global=true

v1/fleet_units/docker-cleanup.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/bash
2+
3+
# this exists because trying to escape bash commands in a sytemd unit is super sadtimes
4+
5+
if [[ $(/usr/bin/docker ps -a | grep Exited | awk '{print $1 "\\t" $7 "\\t" $10}' | grep week | wc -l) -ne 0 ]]
6+
then
7+
echo "Starting docker cleanup with a max of: $MAX_DOCKER"
8+
/usr/bin/docker ps -a | grep Exited | awk '{print $1 "\\t" $7 "\\t" $10}' | grep week | awk '{print $1}' | head -n $MAX_DOCKER | xargs /usr/bin/docker rm -v
9+
/usr/bin/docker images -a | grep none | awk '{print $3}' | xargs /usr/bin/docker rmi
10+
echo "cleanup complete"
11+
else
12+
echo "nothing to cleanup"
13+
fi
14+
sudo free -h

0 commit comments

Comments
 (0)