Merge Dev to Main (Alpine 1.18 and Debian 12(Bookworm) update) #2

Merged
brammp merged 17 commits from dev into main 2023-11-18 16:20:35 +01:00
Showing only changes of commit 4625ae9fa9 - Show all commits

View File

@@ -1334,7 +1334,7 @@ packages:
- curl
- iputils-ping
- lsof
- netcat
- netcat-openbsd
- psmisc
- sudo
- unzip
@@ -1343,6 +1343,8 @@ packages:
- libcap2-bin
- dns-root-data
- libcap2
- jq
- procps
- lighttpd
- php-common
- php-cli
@@ -1569,7 +1571,7 @@ packages:
#collabora CODE repo
- name: collabora.list
url: |-
deb [signed-by=/usr/share/keyrings/collaboraonline-release-keyring.gpg arch=amd64] https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-debian11 ./
deb [signed-by=/usr/share/keyrings/collaboraonline-release-keyring.gpg arch=amd64] https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-deb ./
variants:
- collabora