paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #94 from andryyy/master 

Merge master to dev
master
André Peters 2017-03-05 14:09:03 +01:00 committed by GitHub
parent be8031d8ff 6d7b6a92ee
commit aa81bf2959
2 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker-compose.yml
View File

@ -58,7 +58,11 @@ services:
rspamd-mailcow:
image: andryyy/mailcow-dockerized:rspamd
build: ./data/Dockerfiles/rspamd
command: "sleep 25; /usr/bin/rspamd -f -u _rspamd -g _rspamd"
command: >
/bin/bash -c "
sleep 5;
/usr/bin/rspamd -f -u _rspamd -g _rspamd
"
depends_on:
nginx-mailcow:
condition: service_healthy

34
docs/install.md
View File

@ -24,7 +24,7 @@ nano mailcow.conf
```
If you plan to use a reverse proxy, you can, for example, bind HTTPS to 127.0.0.1 on port 8443 and HTTP to 127.0.0.1 on port 8080.
5\. Run the composer file.
5\. Run the composer file. It will pull images and build containers.
```
docker-compose up -d
```
@ -33,40 +33,26 @@ Done!
You can now access **https://${MAILCOW_HOSTNAME}** with the default credentials `admin` + password `moohoo`.
It may take a while for MySQL to warm up, so please wait half a minute.
The database will be initialized right after a connection to MySQL can be established.
# Update mailcow
There is no update routine.
You need to refresh your pulled repository clone by running `git pull` - this will likely fail due to changes to your local configuration. But that's why we use git! :-)
Whatever file has local changes, add and commit it to your repository clone. For example:
There is no update routine. You need to refresh your pulled repository clone and apply your local changes (if any). Actually there are many ways to merge local changes. Here is one to
stash all local changes, pull changes from the remote master branch and apply your stash on top of it:
```
git add data/conf/postfix/main.cf data/conf/dovecot/dovecot.conf
git commit -m "My changes to main.cf and dovecot.conf
# Stash local changes
git stash
# Re-pull master
git pull
# Apply stash and remove it
git stash pop
```
Try running `git pull` again and resolve conflicts, if any.
Now update all images, apply changes to containers and restart all services:
Pull new images (if any) and recreate changed containers:
```
docker-compose pull
docker-compose up -d --remove-orphans
docker-compose restart
```
## Development branch (not recommended)
When you checkout the "dev" git branch, you will most likely end up using the "master" images with code base of "dev".
If there were critical changes to the images in dev, mailcow will not work.
But you can still build the images by yourself:
```
docker-compose up -d --build
```