1
0
mirror of https://github.com/Mailu/Mailu.git synced 2024-12-14 10:53:30 +02:00
Commit Graph

1276 Commits

Author SHA1 Message Date
mergify[bot]
2b1c94d965
Merge pull request #626 from ofthesun9/feature-smtpd_reject_unlisted_recipient
Add variable to choose whether to bounce or reject email when recipient is unknown. Fixes #583
2018-10-06 17:01:44 +00:00
kaiyou
f430f410f0
Merge branch 'master' into feature-smtpd_reject_unlisted_recipient 2018-10-06 18:56:36 +02:00
Tim Möhlmann
a405d4cc6f
Merge branch 'master' into feat-fuzzyhashes 2018-10-06 19:55:40 +03:00
kaiyou
fff802b5bf
Merge branch 'master' into feat-test-suite-v2 2018-10-06 18:55:40 +02:00
kaiyou
c135b37b07 Enable mergify 2018-10-06 18:53:49 +02:00
Tim Möhlmann
32224202d6
Merge branch 'master' into feat-test-suite-v2 2018-10-06 18:38:34 +03:00
kaiyou
e8c0f031ac
Merge pull request #608 from Mailu/feat-docs-docker
Docs as a Docker image
2018-10-06 17:23:48 +02:00
kaiyou
6a6b3af2d7
Merge branch 'master' into patch-2 2018-10-06 17:21:54 +02:00
kaiyou
9f861a4547
Merge pull request #620 from usrpro/feat-docs-docker
Documentation on running a local docs container
2018-10-06 17:16:13 +02:00
Tim Möhlmann
c09ac713a3
Project name can be ommitted in docker-compose build 2018-10-06 17:36:59 +03:00
Tim Möhlmann
940b88a641
Fix syntax error 2018-10-06 17:31:01 +03:00
Tim Möhlmann
f7d8f20c87
Move DOCKER_ORG default to travis.yml 2018-10-06 17:24:42 +03:00
Tim Möhlmann
a19e11d552
Clean terminal distortion from docker-compose in travis 2018-10-06 17:06:23 +03:00
Tim Möhlmann
7915f2631f
DOCKER_UN needs to be non-zero for deploy 2018-10-06 17:04:14 +03:00
Tim Möhlmann
bb6b984610
Exclude fetchmail for the time being. See Mailu/Mailu#412 2018-10-06 16:46:01 +03:00
Tim Möhlmann
bc85dff27e
Don't try deploy is DOCKER_UN is not set 2018-10-06 16:43:04 +03:00
Tim Möhlmann
39c159bae9
Make the code a bit more DRY. Put sleep back into main loop 2018-10-06 16:34:57 +03:00
Tim Möhlmann
508796eaab
Verbose sleep 2018-10-06 16:25:12 +03:00
Tim Möhlmann
59eb4a5a00
Minor script flow restructure 2018-10-06 16:12:05 +03:00
Tim Möhlmann
42f557ff38
Cleanup containers 2018-10-06 16:03:07 +03:00
Tim Möhlmann
4133bab280
Default to mailu for DOCKER_ORG 2018-10-06 15:52:39 +03:00
Ionut Filip
38db35f1d6 Make docker ps more verbose 2018-10-05 15:04:04 +03:00
Tim Möhlmann
9c266cc8e5
Merge pull request #6 from usrpro/feat-travis-deploy
Tavis-ci to upload images to the Docker hub, after succesfull tests.
2018-10-05 14:42:01 +03:00
Tim Möhlmann
0c73be7c6e
Deploy on all branches 2018-10-05 13:02:10 +03:00
Tim Möhlmann
3224a8ecad
Further introduction of the DOCKER_ORG variable 2018-10-05 12:52:19 +03:00
Tim Möhlmann
5987703631
Tavis-ci to upload images to the Docker hub, after succesfull tests.
For this to work, the following variables will need to be set at Docker hub:
 - DOCKER_ORG	first part of docker repo name (example: mailu)
 - DOCKER_UN	Docker-hub login username (private)
 - DOCKER_PW	Docker-hub login password (private)
Note that also Docker hub autobuilds will have to be disabled.
2018-10-05 12:18:29 +03:00
Ionut Filip
20f37607bb Added docker ps and logs 2018-10-05 11:55:01 +03:00
ofthesun9
58a83a93e6 Add REJECT_UNLISTED_RECIPIENT variable in .env file 2018-10-04 18:55:56 +00:00
ofthesun9
09d77bc2de Handle the case where the variable REJECT_UNLISTED_RECIPIENT is not set 2018-10-04 18:55:56 +00:00
ofthesun9
cc17962c86 fixes #583 2018-10-04 18:55:56 +00:00
Ionut Filip
71eed72e21 Changed exit condition 2018-10-04 17:58:34 +03:00
Ionut Filip
027b8f36df Added a check for container status 2018-10-04 17:58:34 +03:00
Ionut Filip
bc70be35c2 Added function to check docker containers 2018-10-04 17:58:34 +03:00
Ionut Filip
645a7f3c96 Removed BIND_ADDRESS6 2018-10-04 17:58:34 +03:00
Ionut Filip
28ebcd5007 Fixed paths to files 2018-10-04 17:58:34 +03:00
Ionut Filip
ebe90fc447 Added run script for travis 2018-10-04 17:58:34 +03:00
Ionut Filip
0067d97f26 Copied docs/compose/.env to tests/compose/core.env 2018-10-04 17:58:34 +03:00
Ionut Filip
5cc5b7c40a Copied docs/compose/docker-compose.yml to tests/compose/run.yml
Edit for test environment
2018-10-04 17:58:34 +03:00
kaiyou
23c8dea27b
Merge pull request #623 from usrpro/revert-docs-build
Revert docs build
2018-10-02 18:34:01 +02:00
Hypriot Pirate
12882cfacf Merge branch 'master' into feat-fuzzyhashes 2018-10-01 16:31:45 +00:00
Tim Möhlmann
6479f5177b
Revert "Add a Dockerfile for buliding the docs"
This reverts commit f97d0d9e43.
2018-10-01 12:07:49 +03:00
Tim Möhlmann
07af9978e2
Revert "Build the docs during tests"
This reverts commit b287a85124.
2018-10-01 12:06:56 +03:00
Tim Möhlmann
6490a43492
Revert "Attempt to fix the docs build context"
This reverts commit 11bcae4c57.
2018-10-01 12:06:18 +03:00
Tim Möhlmann
73add1b428
Documentation on running a local docs container 2018-10-01 01:47:40 +03:00
Thomas Sänger
76923d80d8
implement support for ARC 2018-09-29 13:03:33 +02:00
kaiyou
4d70a8737e Expose the data volume for admin container 2018-09-28 17:42:10 +02:00
kaiyou
2cba045013 Explicitely declare required volumes, fixes #568 2018-09-28 17:28:46 +02:00
Tim Möhlmann
11bcae4c57 Attempt to fix the docs build context 2018-09-28 17:28:46 +02:00
kaiyou
b287a85124 Build the docs during tests 2018-09-28 17:28:46 +02:00
kaiyou
f97d0d9e43 Add a Dockerfile for buliding the docs 2018-09-28 17:28:46 +02:00