Skip to content

Commit e7b4091

Browse files
committed
Add memory limits
1 parent ed85e60 commit e7b4091

File tree

4 files changed

+34
-4
lines changed

4 files changed

+34
-4
lines changed

d-sshd.service

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@ RestartSec=10
1010
ExecStartPre=/usr/bin/touch /mnt/data/%p/environment
1111
ExecStartPre=-/usr/bin/docker kill %p
1212
ExecStartPre=-/usr/bin/docker rm %p
13-
ExecStart=/usr/bin/docker run --rm --env-file=/mnt/data/%p/environment -v /mnt/data/%p/etc:/etc/ssh:rw -v /mnt/data/secrets/authorized_keys.%p:/root/.ssh/authorized_keys:ro -v /mnt/data:/mnt/data:rw -p ${SSH_PORT}:22 --name %p quay.io/macropin/sshd
13+
ExecStart=/usr/bin/docker run --rm \
14+
-m 128M --memory-swap 128M \
15+
--env-file=/mnt/data/%p/environment \
16+
-v /mnt/data/%p/etc:/etc/ssh:rw \
17+
-v /mnt/data/secrets/authorized_keys.%p:/root/.ssh/authorized_keys:ro \
18+
-v /mnt/data:/mnt/data:rw \
19+
-p ${SSH_PORT}:22 \
20+
--name %p quay.io/macropin/sshd
1421
ExecStop=/usr/bin/docker stop -t 2 %p
1522

1623
[Install]

mailserver.service

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,17 @@ ExecStartPre=/usr/bin/chown 0:12 /mnt/data/%p/var/spool/mail
1515
ExecStartPre=/usr/bin/chmod 775 /mnt/data/%p/var/spool/mail
1616
ExecStartPre=-/usr/bin/docker kill %p
1717
ExecStartPre=-/usr/bin/docker rm %p
18-
ExecStart=/usr/bin/docker run --rm --env-file=/mnt/data/%p/environment -p 25:25 -p 465:465 -p 587:587 -p 993:993 -p 995:995 --name %p --link mariadb:mariadb -v /mnt/data/%p/var/vmail:/var/vmail -v /mnt/data/%p/var/spool/mail:/var/spool/mail -v /mnt/data/secrets/rapidssl.crt:/etc/pki/tls/certs/ca.crt -v /mnt/data/secrets/${MAILNAME}.crt:/etc/pki/tls/certs/${MAILNAME}.crt -v /mnt/data/secrets/${MAILNAME}.key:/etc/pki/tls/private/${MAILNAME}.key panubo/mailserver
18+
ExecStart=/usr/bin/docker run --rm \
19+
-m 768M --memory-swap 768M \
20+
--env-file=/mnt/data/%p/environment \
21+
-p 25:25 -p 465:465 -p 587:587 -p 993:993 -p 995:995 \
22+
--name %p --link mariadb:mariadb \
23+
-v /mnt/data/%p/var/vmail:/var/vmail \
24+
-v /mnt/data/%p/var/spool/mail:/var/spool/mail \
25+
-v /mnt/data/secrets/rapidssl.crt:/etc/pki/tls/certs/ca.crt \
26+
-v /mnt/data/secrets/${MAILNAME}.crt:/etc/pki/tls/certs/${MAILNAME}.crt \
27+
-v /mnt/data/secrets/${MAILNAME}.key:/etc/pki/tls/private/${MAILNAME}.key \
28+
panubo/mailserver
1929
ExecStop=/usr/bin/docker stop -t 10 %p
2030

2131
[Install]

mariadb.service

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@ ExecStartPre=/usr/bin/touch /mnt/data/%p/environment
1111
ExecStartPre=/usr/bin/chown 999:999 /mnt/data/%p/mysql
1212
ExecStartPre=-/usr/bin/docker kill %p
1313
ExecStartPre=-/usr/bin/docker rm %p
14-
ExecStart=/usr/bin/docker run --rm --name %p --env-file=/mnt/data/%p/environment -v /mnt/data/%p/mysql:/var/lib/mysql mariadb:10.0
14+
ExecStart=/usr/bin/docker run --rm \
15+
-m 128M --memory-swap 128M \
16+
--name %p \
17+
--env-file=/mnt/data/%p/environment \
18+
-v /mnt/data/%p/mysql:/var/lib/mysql \
19+
mariadb:10.0
1520
ExecStop=/usr/bin/docker stop -t 2 %p
1621

1722
[Install]

roundcube.service

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,15 @@ Restart=on-failure
99
RestartSec=10
1010
ExecStartPre=-/usr/bin/docker kill %p
1111
ExecStartPre=-/usr/bin/docker rm %p
12-
ExecStart=/usr/bin/docker run --rm --env-file=/mnt/data/%p/environment -v /mnt/data/secrets/${SERVER_NAME}.key:/etc/ssl/private/${SERVER_NAME}.key:ro -v /mnt/data/secrets/${SERVER_NAME}.crt:/etc/ssl/certs/${SERVER_NAME}.crt:ro -v /mnt/data/secrets/ca.crt:/etc/ssl/certs/ca.crt:ro -p 80:80 -p 443:443 --name %p --link mariadb --link mailserver macropin/roundcube
12+
ExecStart=/usr/bin/docker run --rm \
13+
-m 128M --memory-swap 128M \
14+
--env-file=/mnt/data/%p/environment \
15+
-v /mnt/data/secrets/${SERVER_NAME}.key:/etc/ssl/private/${SERVER_NAME}.key:ro \
16+
-v /mnt/data/secrets/${SERVER_NAME}.crt:/etc/ssl/certs/${SERVER_NAME}.crt:ro \
17+
-v /mnt/data/secrets/ca.crt:/etc/ssl/certs/ca.crt:ro \
18+
-p 80:80 -p 443:443 \
19+
--name %p --link mariadb --link mailserver \
20+
macropin/roundcube
1321
ExecStop=/usr/bin/docker stop -t 2 %p
1422

1523
[Install]

0 commit comments

Comments
 (0)