public nobgit read

NobMail

Based on mailcow: dockerized

Languages

Repository composition by tracked source files.

PHP

PHP 49% JavaScript 35% HTML 9% CSS 4% Shell 2% Python 1% Lua 0% Perl 0% Ruby 0% SCSS 0%

Create file Wiki Documentation

Clone

https://nobgit.com/orgs/nobgit/nobmail.git

ssh://[email protected]:2222/orgs/nobgit/nobmail.git

Commit

[Rspamd] Use tini

6b6470fe

André <[email protected]> 9 years ago

data/Dockerfiles/rspamd/Dockerfile           |   3 ++-
 data/Dockerfiles/rspamd/docker-entrypoint.sh |   2 +-
 data/Dockerfiles/rspamd/tini                 | Bin 0 -> 19968 bytes
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100755 data/Dockerfiles/rspamd/tini

Diff

diff --git a/data/Dockerfiles/rspamd/Dockerfile b/data/Dockerfiles/rspamd/Dockerfile
index 2913cefb..eb9238e1 100644
--- a/data/Dockerfiles/rspamd/Dockerfile
+++ b/data/Dockerfiles/rspamd/Dockerfile
@@ -22,7 +22,8 @@ COPY settings.conf /etc/rspamd/modules.d/settings.conf
 #COPY ratelimit.lua /usr/share/rspamd/lua/ratelimit.lua
 #COPY lua_util.lua /usr/share/rspamd/lib/lua_util.lua
 COPY docker-entrypoint.sh /docker-entrypoint.sh
+COPY tini /sbin/tini
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
 
-CMD /usr/bin/rspamd -f -u _rspamd -g _rspamd
+CMD ["/usr/bin/rspamd", "-f", "-u", "_rspamd", "-g", "_rspamd"]
diff --git a/data/Dockerfiles/rspamd/docker-entrypoint.sh b/data/Dockerfiles/rspamd/docker-entrypoint.sh
index c6903311..ae216570 100755
--- a/data/Dockerfiles/rspamd/docker-entrypoint.sh
+++ b/data/Dockerfiles/rspamd/docker-entrypoint.sh
@@ -2,4 +2,4 @@
 
 chown -R _rspamd:_rspamd /var/lib/rspamd
 
-exec "$@"
+exec /sbin/tini -- "$@"
diff --git a/data/Dockerfiles/rspamd/tini b/data/Dockerfiles/rspamd/tini
new file mode 100755
index 00000000..6556c966
Binary files /dev/null and b/data/Dockerfiles/rspamd/tini differ