mirror/docker-mailserver.docker-mailserver
1
0
Fork 0
mirror of https://github.com/docker-mailserver/docker-mailserver.git synced 2025-08-21 18:18:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

chore: apt - Migrate format from .list to .sources (DEB822) (#4556)
Some checks failed
Lint / lint (push) Waiting to run
Details
Build, Test & Deploy / Build AMD64 Image (push) Has been cancelled
Details
Build, Test & Deploy / Test AMD64 Image (push) Has been cancelled
Details
Build, Test & Deploy / Publish AMD64 and ARM64 Image (push) Has been cancelled
Details

Browse source 
* chore: switch to `.sources` layout from `.list`

Signed-off-by: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com>

* chore: update CHANGELOG

Signed-off-by: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com>

* Apply suggestions from code review

---------

Signed-off-by: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com>
Co-authored-by: Brennan Kinney <5098581+polarathene@users.noreply.github.com>
This commit is contained in:
Georg Lauterbach 2025-08-18 02:45:20 +02:00 • committed by GitHub
parent 9e4749e718
commit c1da4265d3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CHANGELOG.md
View file

@ -13,11 +13,13 @@ All notable changes to this project will be documented in this file. The format
### Updated
- **Externally installed software**
- bumped `jaq` from `2.1.0` to [`2.3.0`](https://github.com/01mf02/jaq/releases/tag/v2.3.0) ([#4557](https://github.com/docker-mailserver/docker-mailserver/pull/4557))
- bumped `step` CLI from `0.28.2` to [`0.28.7`](https://github.com/smallstep/cli/releases/tag/v0.28.7)) ([#4557](https://github.com/docker-mailserver/docker-mailserver/pull/4557))
- **Internal:**
- Aligning with the change in upstream Debian, APT package repositories added by DMS have migrated the format from `.list` to `.sources` ([DEB822](https://repolib.readthedocs.io/en/latest/deb822-format.html)) ([#4556](https://github.com/docker-mailserver/docker-mailserver/pull/4556))
- Third-party sourced CLI tools updated ([#4557](https://github.com/docker-mailserver/docker-mailserver/pull/4557)):
- `jaq` from `2.1.0` to [`2.3.0`](https://github.com/01mf02/jaq/releases/tag/v2.3.0)
- `step` CLI from `0.28.2` to [`0.28.7`](https://github.com/smallstep/cli/releases/tag/v0.28.7))
- **Dovecot**
- Bumped Xapian version from `1.9` to [`1.9.1`](https://github.com/grosjo/fts-xapian/releases/tag/1.9.1) ([#4557](https://github.com/docker-mailserver/docker-mailserver/pull/4557)), which includes Dovecot 2.4 compatibility
- Updated the FTS plugin Xapian from `1.9` to [`1.9.1`](https://github.com/grosjo/fts-xapian/releases/tag/1.9.1) which adds Dovecot 2.4 compatibility ([#4557](https://github.com/docker-mailserver/docker-mailserver/pull/4557))
## [v15.1.0](https://github.com/docker-mailserver/docker-mailserver/compare/v15.1.0...HEAD)

26
target/scripts/build/packages.sh
View file

@ -161,10 +161,15 @@ function _install_dovecot() {
# - 2.3.21: https://salsa.debian.org/debian/dovecot/-/tree/stable/bookworm-backports
_log 'trace' 'Adding third-party package repository (Dovecot)'
curl -fsSL https://repo.dovecot.org/DOVECOT-REPO-GPG-2.4 | gpg --dearmor > /usr/share/keyrings/upstream-dovecot.gpg
echo \
"deb [signed-by=/usr/share/keyrings/upstream-dovecot.gpg] https://repo.dovecot.org/ce-2.4-latest/debian/${VERSION_CODENAME} ${VERSION_CODENAME} main" \
> /etc/apt/sources.list.d/upstream-dovecot.list
curl -fsSL https://repo.dovecot.org/DOVECOT-REPO-GPG-2.4 \
| gpg --dearmor >/usr/share/keyrings/upstream-dovecot.gpg
cat >/etc/apt/sources.list.d/upstream-dovecot.sources <<EOF
Types: deb
URIs: https://repo.dovecot.org/ce-2.4-latest/debian/${VERSION_CODENAME}
Suites: ${VERSION_CODENAME}
Components: main
Signed-By: /usr/share/keyrings/upstream-dovecot.gpg
EOF
# Refresh package index:
apt-get "${QUIET}" update
@ -188,10 +193,15 @@ function _install_rspamd() {
# NOTE: Debian 12 provides Rspamd 3.4 (too old) and Rspamd discourages it's use
_log 'trace' 'Adding third-party package repository (Rspamd)'
curl -fsSL https://rspamd.com/apt-stable/gpg.key | gpg --dearmor > /usr/share/keyrings/upstream-rspamd.gpg
echo \
"deb [signed-by=/usr/share/keyrings/upstream-rspamd.gpg] https://rspamd.com/apt-stable/ ${VERSION_CODENAME} main" \
> /etc/apt/sources.list.d/upstream-rspamd.list
curl -fsSL https://rspamd.com/apt-stable/gpg.key \
| gpg --dearmor >/usr/share/keyrings/upstream-rspamd.gpg
cat >/etc/apt/sources.list.d/upstream-rspamd.sources <<EOF
Types: deb
URIs: https://rspamd.com/apt-stable/
Suites: ${VERSION_CODENAME}
Components: main
Signed-By: /usr/share/keyrings/upstream-rspamd.gpg
EOF
# Refresh package index:
apt-get "${QUIET}" update