Skip to content

Commit cf4608b

Browse files
committed
SYS-656 fix dovecot build-promotion hook
1 parent 12fb065 commit cf4608b

2 files changed

Lines changed: 24 additions & 22 deletions

File tree

images/dovecot/README.md

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -64,30 +64,32 @@ Need more configurability? Edit the ConfigMap defined in the helm chart.
6464
| ldap-ro-passwd | password for looking up LDAP users |
6565
| *key.pem | keyfile specified for ssl_dh certificate |
6666

67-
### Contributing
68-
69-
If you want to make improvements to this image, see [CONTRIBUTING](https://github.com/instantlinux/docker-tools/blob/main/CONTRIBUTING.md).
70-
71-
[![](https://img.shields.io/badge/license-Apache--2.0-red.svg)](https://choosealicense.com/licenses/apache-2.0/ "License badge") [![](https://img.shields.io/badge/code-dovecot%2Fcore-blue.svg)](https://github.com/dovecot/core "Code repo")
72-
7367
### Upgrade Notes
7468

7569
* When upgrading to 2.3.14+, replace any references to `hash:` with `lmdb:` in your config files.
7670

7771
* When upgrading to 2.4+, there are a lot of gratuitous [config-directive changes](https://doc.dovecot.org/main/installation/upgrade/2.3-to-2.4.html). The Docker image doesn't contain configs but the helm chart provided here has a configmap template that contains the following changes:
7872

79-
|Helm var|2.3|2.4|Notes|
80-
|uris|hosts | ldap_uris | <host> becomes ldap://<host>:389 |
81-
| |ldap_version| (unchanged)| |
82-
|base|base| ldap_base| |
83-
|bind|auth_bind| ldap_bind | |
84-
|bind_userdn|auth_bind_userdn|ldap_bind_userdn | |
85-
|tls|tls|ldap_starttls | |
86-
| | |dovecot_config_version|new|
87-
| | |dovecot_storage_version|new|
88-
|filter| |ldap_filter|now required|
89-
| |args|(removed)|directives moved to passdb config|
90-
| |address|listen| |
91-
| |ssl_cert|ssl_server_cert_file|angle bracket removed|
92-
| |ssl_dh|ssl_server_dh_file|angle bracket removed|
93-
| |ssl_key|ssl_server_key_file|angle bracket removed|
73+
| Helm var | 2.3 | 2.4 | Notes |
74+
| -------- | --- | --- | ----- |
75+
| uris | hosts | ldap_uris | <host> becomes ldap://<host>:389 |
76+
| | ldap_version | (unchanged) | |
77+
| base | base | ldap_base | |
78+
| bind | auth_bind | ldap_bind | |
79+
| bind_userdn | auth_bind_userdn | ldap_bind_userdn | |
80+
| tls | tls | ldap_starttls | |
81+
| | | dovecot_config_version | new |
82+
| | | dovecot_storage_version | new |
83+
| filter | | ldap_filter | now required |
84+
| | args | (removed) | directives moved to passdb config |
85+
| | address | listen | |
86+
| | ssl_cert | ssl_server_cert_file | angle bracket removed |
87+
| | ssl_dh | ssl_server_dh_file | angle bracket removed |
88+
| | ssl_key | ssl_server_key_file | angle bracket removed |
89+
90+
### Contributing
91+
92+
If you want to make improvements to this image, see [CONTRIBUTING](https://github.com/instantlinux/docker-tools/blob/main/CONTRIBUTING.md).
93+
94+
[![](https://img.shields.io/badge/license-Apache--2.0-red.svg)](https://choosealicense.com/licenses/apache-2.0/ "License badge") [![](https://img.shields.io/badge/code-dovecot%2Fcore-blue.svg)](https://github.com/dovecot/core "Code repo")
95+

images/dovecot/hooks/add_tags

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/sh
2-
TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2)
2+
TAG=$(grep -m 1 "ARG .*_VERSION" Dockerfile | cut -d= -f 2)
33
echo "--tag $DOCKER_REPO:$TAG"

0 commit comments

Comments
 (0)