git.99rst.org / roundcube-roundcubemail-docker.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1d5efa 8f97d7f)
Merge pull request #18 from J0WI/gpg-race
authorThomas B <redacted>
Tue, 5 Jun 2018 11:33:37 +0000 (13:33 +0200)
committerGitHub <redacted>
Tue, 5 Jun 2018 11:33:37 +0000 (13:33 +0200)
Adjust gpg code to kill daemons, cutting down on race conditions

1  2 
php-apache/Dockerfile patch | diff1 | diff2 | blob | history
php-fpm/Dockerfile patch | diff1 | diff2 | blob | history

diff --cc php-apache/Dockerfile
Simple merge
diff --cc php-fpm/Dockerfile
Simple merge
git clone https://git.99rst.org/PROJECT