Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Drop NET_RAW from all containers in manual #4116

Merged
merged 2 commits into from
Mar 1, 2024
Merged

Drop NET_RAW from all containers in manual #4116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e26613
Drop NET_RAW from all containers in manual
jhesketh Jan 26, 2024
20c3fbc
add it to jscon schema
szaimen Mar 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions manual-install/latest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ services:
- /usr/local/apache2/logs
- /tmp
- /home/www-data
cap_drop:
- NET_RAW

nextcloud-aio-database:
image: nextcloud/aio-postgresql:latest
Expand All @@ -68,6 +70,8 @@ services:
read_only: true
tmpfs:
- /var/run/postgresql
cap_drop:
- NET_RAW

nextcloud-aio-nextcloud:
depends_on:
Expand Down Expand Up @@ -149,6 +153,8 @@ services:
restart: unless-stopped
networks:
- nextcloud-aio
cap_drop:
- NET_RAW

nextcloud-aio-notify-push:
image: nextcloud/aio-notify-push:latest
Expand All @@ -170,6 +176,8 @@ services:
networks:
- nextcloud-aio
read_only: true
cap_drop:
- NET_RAW

nextcloud-aio-redis:
image: nextcloud/aio-redis:latest
Expand All @@ -185,6 +193,8 @@ services:
networks:
- nextcloud-aio
read_only: true
cap_drop:
- NET_RAW

nextcloud-aio-collabora:
image: nextcloud/aio-collabora:latest
Expand All @@ -205,6 +215,8 @@ services:
- nextcloud-aio
cap_add:
- MKNOD
cap_drop:
- NET_RAW

nextcloud-aio-talk:
image: nextcloud/aio-talk:latest
Expand Down Expand Up @@ -234,6 +246,8 @@ services:
- /opt/eturnal/run
- /conf
- /tmp
cap_drop:
- NET_RAW

nextcloud-aio-talk-recording:
image: nextcloud/aio-talk-recording:latest
Expand All @@ -255,6 +269,8 @@ services:
tmpfs:
- /tmp
- /conf
cap_drop:
- NET_RAW

nextcloud-aio-clamav:
image: nextcloud/aio-clamav:latest
Expand All @@ -276,6 +292,8 @@ services:
- /var/lock
- /var/log/clamav
- /tmp
cap_drop:
- NET_RAW

nextcloud-aio-onlyoffice:
image: nextcloud/aio-onlyoffice:latest
Expand All @@ -294,6 +312,8 @@ services:
- onlyoffice
networks:
- nextcloud-aio
cap_drop:
- NET_RAW

nextcloud-aio-imaginary:
image: nextcloud/aio-imaginary:latest
Expand All @@ -305,6 +325,8 @@ services:
restart: unless-stopped
cap_add:
- SYS_NICE
cap_drop:
- NET_RAW
profiles:
- imaginary
networks:
Expand Down Expand Up @@ -336,6 +358,8 @@ services:
- fulltextsearch
networks:
- nextcloud-aio
cap_drop:
- NET_RAW

volumes:
nextcloud_aio_apache:
Expand Down
7 changes: 7 additions & 0 deletions php/containers-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@
"pattern": "^[A-Z_]+$"
}
},
"cap_drop": {
"type": "array",
"items": {
"type": "string",
"pattern": "^[A-Z_]+$"
}
},
"depends_on": {
"type": "array",
"items": {
Expand Down
54 changes: 51 additions & 3 deletions php/containers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@
"/usr/local/apache2/logs",
"/tmp",
"/home/www-data"
],
"cap_drop": [
"NET_RAW"
]
},
{
Expand Down Expand Up @@ -112,6 +115,9 @@
"read_only": true,
"tmpfs": [
"/var/run/postgresql"
],
"cap_drop": [
"NET_RAW"
]
},
{
Expand Down Expand Up @@ -226,6 +232,9 @@
],
"networks": [
"nextcloud-aio"
],
"cap_drop": [
"NET_RAW"
]
},
{
Expand Down Expand Up @@ -263,7 +272,10 @@
"networks": [
"nextcloud-aio"
],
"read_only": true
"read_only": true,
"cap_drop": [
"NET_RAW"
]
},
{
"container_name": "nextcloud-aio-redis",
Expand Down Expand Up @@ -295,7 +307,10 @@
"networks": [
"nextcloud-aio"
],
"read_only": true
"read_only": true,
"cap_drop": [
"NET_RAW"
]
},
{
"container_name": "nextcloud-aio-collabora",
Expand Down Expand Up @@ -328,6 +343,9 @@
],
"cap_add": [
"MKNOD"
],
"cap_drop": [
"NET_RAW"
]
},
{
Expand Down Expand Up @@ -380,6 +398,9 @@
"/opt/eturnal/run",
"/conf",
"/tmp"
],
"cap_drop": [
"NET_RAW"
]
},
{
Expand Down Expand Up @@ -414,6 +435,9 @@
"tmpfs": [
"/tmp",
"/conf"
],
"cap_drop": [
"NET_RAW"
]
},
{
Expand Down Expand Up @@ -472,6 +496,9 @@
"cap_add": [
"SYS_ADMIN"
],
"cap_drop": [
"NET_RAW"
],
"apparmor_unconfined": true,
"read_only": true,
"tmpfs": [
Expand All @@ -494,7 +521,10 @@
"writeable": false
}
],
"read_only": true
"read_only": true,
"cap_drop": [
"NET_RAW"
]
},
{
"container_name": "nextcloud-aio-domaincheck",
Expand All @@ -521,6 +551,9 @@
"tmpfs": [
"/etc/lighttpd",
"/var/www/domaincheck"
],
"cap_drop": [
"NET_RAW"
]
},
{
Expand Down Expand Up @@ -556,6 +589,9 @@
"/var/lock",
"/var/log/clamav",
"/tmp"
],
"cap_drop": [
"NET_RAW"
]
},
{
Expand Down Expand Up @@ -594,6 +630,9 @@
],
"networks": [
"nextcloud-aio"
],
"cap_drop": [
"NET_RAW"
]
},
{
Expand All @@ -613,6 +652,9 @@
"cap_add": [
"SYS_NICE"
],
"cap_drop": [
"NET_RAW"
],
"profiles": [
"imaginary"
],
Expand Down Expand Up @@ -662,6 +704,9 @@
],
"secrets": [
"FULLTEXTSEARCH_PASSWORD"
],
"cap_drop": [
"NET_RAW"
]
},
{
Expand All @@ -685,6 +730,9 @@
"read_only": true,
"tmpfs": [
"/tmp"
],
"cap_drop": [
"NET_RAW"
]
}
]
Expand Down
Loading