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

94 Commits

Author SHA1 Message Date
Dimitri Huisman
dd3f1a3376 Switch to mode=min for GHA cache for docker buildx to prevent ratelimiting in GHA workflow 2022-08-20 07:49:36 +00:00
bors[bot]
53de7b7d60
Merge #2403
2403: Feature: switch CI/CD from build to buildx r=mergify[bot] a=Diman0

## What type of PR?

Feature and enhancement

## What does this PR do?

Switch from docker build to buildx for CI/CD.
    - The main workflow file has been optimised and simplified.
    - Images are built in parallel when building locally resulting in much faster build times.
    - The github action workflow is about 50% faster.
    - Arm images are built as well. These images are not tested due to restrictions of github actions (no arm runners). The tags of the images have -arm appended to it. The arm images are built on merge on master and release branch (x.y). They do not influence the normal CI/CD workflow used for bors (for PR) and real releases (merge on master and branch x.y for x86_64). 
    - Arm images (and normal x86_64 images) can also be built locally.
    - Reusable workflow is introduced for building, testing and deploying the images. This allows the workflow to be reused for other purposes in the future.
    - Workflow can be manually triggered. This allows forked Mailu projects to also use the workflow for building images.

The main workflow makes use of github actions cache to store the cache layer. This layer is used to quickly rebuilt the images in the testing step and deploy step.

Unfortunately the building the arm images fails sometimes due to timeouts. Sometimes the connection to github actions cache is very slow. Restarting the workflow from the last failed step resolves this. I have not observed this with the normal build.

Just as previous time, you can use a forked project for testing the changes (https://github.com/Diman0/Mailu_Fork). You should still have owner access. I have created branch 1.11 for testing. You can see I already push 4 times to branch 1.11 (current version is 1.11.3).

### Related issue(s)
- Mention an issue like: #001
- closes #2383 
- closes #1830
- closes #1200

## Prerequisites
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [x] In case of feature or enhancement: documentation updated accordingly
- [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.


Co-authored-by: Dimitri Huisman <diman@huisman.xyz>
2022-08-19 13:19:13 +00:00
Will
72a5bbf53d Update roundcube to 1.5.3 and rcmcarddav plugin 2022-08-14 21:01:56 +00:00
Dimitri Huisman
f6de2b2938 Switch from docker build to buildx for CI/CD.
- The main workflow file has been optimised and simplified.
- Images are built in parallel when building locally resulting in faster build times.
- The github action workflow is about 50% faster.
- Arm images are built as well. These images are not tested due to restrictions of github actions (no arm runners). The tags of the images have -arm appended to it.
- Arm images can also be built locally.
- Reusable workflow is introduced for building, testing and deploying the images.
  This allows the workflow to be reused for other purposes in the future.
- Workflow can be manually triggered. This allows forked Mailu projects to also use the workflow for building images.
2022-08-03 09:36:53 +00:00
bors[bot]
e50f6c58c0
Merge #2360
2360: roundcube: disable apache2 access log r=mergify[bot] a=pommi

## What type of PR?

bug-fix

## What does this PR do?

It disables the access log of apache2 in the roundcube webmail container. Requests are already logged by the front container. The requests logged in the roundcube container contained contained the wrong client IP: the IP address of the front container.

----

Original PR:

~~Roundcube webmail is accessed through the nginx reverse proxy in the front container. Each access logline logged by apache2 in the roundcube container did not contain the actual client IP address, but the IP address of the front container, for example:~~

```
192.168.203.3 - - [28/May/2022:12:33:52 +0000] "POST /?_task=mail&_action=refresh HTTP/1.1" 200 677 "https://[REDACTED]/roundcube/?_task=mail&_mbox=INBOX" "Mozilla/5.0 (X11; Linux x86_64; rv:100.0) Gecko/20100101 Firefox/100.0"
^
IP address of the front container
```

~~By enabling the apache2 remoteip module and configuring it to get the actual client IP address from the X-Forwarded-For header, it logs the correct client IP address to the access log.~~

### Related issue(s)
- None

## Prerequisites
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

**No changelog or documentation necessary for this minor change.**


Co-authored-by: Pim van den Berg <pim@nethuis.nl>
2022-07-07 09:18:58 +00:00
Pim van den Berg
6f884c6c93 roundcube: disable access log
As per discussion in #2360: The front container (nginx reverse proxy) is
already logging all requests, disable the access logs for apache2 in the
roundcube container completely.
2022-06-16 14:26:27 +02:00
Eddy Vervest
baea3d4086
Update Dockerfile
missed this one
2022-05-30 19:18:35 +02:00
Eddy Vervest
c4c442d000
Update Dockerfile
apt is intended for interactive usage, for scripts use apt-get (https://manpages.debian.org/bullseye/apt/apt.8.en.html) to avoid warnings.
2022-05-30 18:38:32 +02:00
Pim van den Berg
e8b7d6afed roundcube: log actual client ip by using apache2 remoteip
Roundcube webmail is accessed through the nginx reverse proxy in the
front container. Each access logline logged by apache2 in the roundcube
container did not contain the actual client IP address, but the IP
address of the front container, for example:

> 192.168.203.3 - - [28/May/2022:12:33:52 +0000] "POST /?_task=mail&_action=refresh HTTP/1.1" 200 677 "https://[REDACTED]/roundcube/?_task=mail&_mbox=INBOX" "Mozilla/5.0 (X11; Linux x86_64; rv:100.0) Gecko/20100101 Firefox/100.0"
  ^
  IP address of the front container

By enabling the apache2 remoteip module and configuring it to get the
actual client IP address from the X-Forwarded-For header, it logs the
correct client IP address to the access log.
2022-05-28 15:02:47 +02:00
mnival
5695bbb0f6 Configuring pwstore_scheme in carddav plugin with des_key because Mailu is incompatible with encrypted 2022-01-28 22:03:18 +01:00
willofr
93a94d33ce
update roundcube to 1.5.2 (security fix)
New roundcube release (1.5.2) where a XSS is addressed: https://roundcube.net/news/2021/12/30/update-1.5.2-released
2022-01-05 11:17:31 +01:00
Dimitri Huisman
b248026933 Fix #2117. Gpg-agent package was missing for roundcube image. 2022-01-01 10:51:11 +00:00
Alexander Graf
1a41657f90
add documentation, allow overrides, clean plugins 2021-12-18 17:43:21 +01:00
Alexander Graf
e7e283663d
Merge remote-tracking branch 'upstream/master' into update_roundcube 2021-12-17 22:23:08 +01:00
Alexander Graf
547ad253e1
added plugin selection, derive key, clean env 2021-12-17 15:54:05 +01:00
Alexander Graf
7c2c2dc65a
updated to carddav 4.3.0 2021-11-30 17:18:59 +01:00
Alexander Graf
1ebdb26979
updated to rc 1.5.1 2021-11-29 14:21:26 +01:00
Dimitri Huisman
f7677543c6 Process code review remarks
- Moved run to bottom of Dockerfile to allow using unmodified / cached states.
- Simplified bash code in deploy.sh.
- Improved the large bash one-liner in CI.yml. It could not handle >9 for 1.x.
2021-11-18 17:21:56 +00:00
Dimitri Huisman
56dd70cf4a Implement versioning for CI/CD workflow (see #1182). 2021-11-17 20:00:04 +00:00
Alexander Graf
423b8a6b9b
Merge branch 'master' into update_roundcube 2021-11-07 21:35:53 +01:00
DjVinnii
a6beb234ff Set timezone in roundcube.ini 2021-11-04 16:17:11 +01:00
DjVinnii
225160610b Set default TZ in Dockerfiles 2021-11-04 14:22:12 +01:00
Alexander Graf
6003e11533 duh. add timezone (again) 2021-11-03 19:32:31 +01:00
Alexander Graf
920ac4cd21 updated to php8. fixed login. fixed max_filesize. 2021-11-03 15:18:00 +01:00
DjVinnii
a1f0c20583 Add tzdata to webmails 2021-11-02 15:32:27 +01:00
Alexander Graf
ee45475567 updated roundcube. added cleanup run at startup 2021-11-02 12:21:40 +01:00
Alexander Graf
ef9e1ac279 remove health check from log 2021-09-28 12:29:57 +02:00
Alexander Graf
7380b248cf direct logging of php errors to stderr 2021-09-28 11:16:40 +02:00
Alexander Graf
cd17aa0c43 repair failing health-check 2021-09-28 11:06:59 +02:00
Alexander Graf
16691e83ad re-enable mod_rewrite in roundcube
moved chown/mkdir/symlink from start.py to Dockerfile
2021-09-24 18:15:00 +02:00
Diman0
7083b3f7c6 Fix roundcube sso header issue
Removed apache rewrite module.
2021-09-24 12:10:21 +02:00
Alexander Graf
6c510e2e86 enabled caching via .htaccess 2021-09-06 13:48:13 +02:00
Florent Daigniere
defea3258d update arm builds too 2021-08-03 13:58:54 +02:00
Alexander Graf
14bdeb5e1e Update version of roundcube webmail and carddav plugin.
This is a security update.

- roundcube 1.4.11
- carddav 4.1.2
2021-06-30 12:36:11 +02:00
Florent Daigniere
dd3d03f06d Merge remote-tracking branch 'upstream/master' into webmail-sso 2021-03-10 14:41:12 +01:00
Florent Daigniere
2cdee8d18e Make roundcube use internal auth 2021-02-07 17:50:30 +01:00
lub
8dd5dac3ed update roundcube to php 7.4 2020-11-21 00:55:38 +01:00
Thomas Sänger
e8eaad6c88
update roundcube 2020-06-22 16:06:23 +02:00
bors[bot]
ddac2672fc
Merge #1338
1338: Add GPG to Roundcube r=mergify[bot] a=PhilRW

The web UI was complaining that it couldn't find the GPG binary. Turns out it wasn't installed.

## What type of PR?

bug fix

## What does this PR do?

Adds GPG binary to Roundcube

Co-authored-by: Philip Rosenberg-Watt <PhilRW@users.noreply.github.com>
Co-authored-by: Dario Ernst <github@kanojo.de>
2020-05-11 06:36:28 +00:00
bors[bot]
0469e96f8e
Merge #1298
1298: Added carddav-plugin for roundcube webmail r=ofthesun9 a=sholl

## Feature

This PR enables the carddav contacts plugin for integration remote contact-repositories based on CardDAV.

## What does this PR do?

This PR enables the carddav contacts plugin for integration remote contact-repositories based on CardDAV.

### Related issue(s)
- Related #1230, at least for CardDAV.


## Prerequistes
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [x] In case of feature or enhancement: documentation updated accordingly (not needed since the plugins of webmail is not mentioned in the docs.)
- [x] Changelog-entry added


Co-authored-by: Stephan Holl <stephan@holl-land.de>
2020-05-10 18:17:23 +00:00
Dario Ernst
4d475f4e69
Merge branch 'master' into patch-1 2020-03-13 13:19:45 +01:00
bors[bot]
e41b072938
Merge #1268
1268: Roundcube db r=Nebukadneza a=micw

## What type of PR?

feature

## What does this PR do?

- makes roundcube work with mysql
- runs db init/upgrade scripts on startup
- redirects roundcube logs to stdout

### Related issue(s)
- preparations to solve #1226
- closes #1157 (side effect ;-) )

## Prerequistes

- [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/guide.html#changelog) entry file.


Co-authored-by: Michael Wyraz <michael@wyraz.de>
Co-authored-by: micw <michael@wyraz.de>
2020-03-12 12:52:25 +00:00
Thomas Sänger
5e2d0b78b6
Update Roundcube to 1.4.3 2020-03-11 13:26:32 +01:00
micw
e08f4ab7a9
Fix wrong psql lib name 2020-03-07 19:38:12 +01:00
micw
b4d81f833d
Add pdo_pgsql to Dockerfile 2020-03-06 15:55:35 +01:00
Philip Rosenberg-Watt
7a552f02c3 Add gpg to Roundcube
The web UI was complaining that it couldn't find the GPG binary. Turns out it wasn't installed.
2020-02-10 12:22:46 -07:00
Michael Wyraz
06926561e2 Install php-mysql on roundcube container 2020-01-29 19:58:58 +01:00
hoellen
94bfd7770b Update Roundcube to 1.4.2 2020-01-07 20:36:58 +01:00
Stephan Holl
a22e8eb0c5 Added carddav-Plugin for roundcube. 2019-12-26 20:29:45 +01:00
bors[bot]
8fb3c688e7
Merge #1267
1267: Update roundcube to 1.4.0 and enable new elastic skin r=hoellen a=hoellen

## What type of PR?
enhancement

## What does this PR do?
This PR brings the new roundcube 1.4.0 release with the new elastic skin.
![grafik](https://user-images.githubusercontent.com/11299996/69373290-c86cd680-0ca3-11ea-8dd5-d76beafc65a6.png)
![grafik](https://user-images.githubusercontent.com/11299996/69373358-e6d2d200-0ca3-11ea-8b92-3b8a528eb6c0.png)


As an idea we could integrate the Mailu logo in a next step to customize the webmail client a bit.

## Prerequistes
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [x] In case of feature or enhancement: documentation updated accordingly
- [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/guide.html#changelog) entry file.


Co-authored-by: hoellen <dev@hoellen.eu>
2019-12-06 09:41:19 +00:00