eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-19 22:16:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #2631 from nextcloud/enh/1581/add-profiles-and-networks

Browse source 
add profiles and networks to container-schema.json
This commit is contained in:
Simon L 2023-06-06 10:31:38 +02:00 • committed by GitHub
commit ac5a59c5b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 76 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
manual-install/update-yaml.sh
View file

@ -112,15 +112,8 @@ do
if [ "$name" != "nextcloud-aio-apache" ]; then if [ "$name" != "nextcloud-aio-apache" ]; then
OUTPUT="$(echo "$OUTPUT" | sed "/ $name:/i\ ")" OUTPUT="$(echo "$OUTPUT" | sed "/ $name:/i\ ")"
fi fi
if ! echo "$name" | grep "apache$" && ! echo "$name" | grep "database$" && ! echo "$name" | grep "nextcloud$" && ! echo "$name" | grep "redis$"; then
sed -i '/container_name/d' containers.yml
SLIM_NAME="${name##nextcloud-aio-}"
OUTPUT="$(echo "$OUTPUT" | sed "/container_name: $name$/a\ \ \ \ profiles:\ \[\"$SLIM_NAME\"\]")"
fi
done done
OUTPUT="$(echo "$OUTPUT" | sed "/restart: /a\ \ \ \ networks:\n\ \ \ \ \ \ - nextcloud-aio")"
echo "$OUTPUT" > containers.yml echo "$OUTPUT" > containers.yml
sed -i '/container_name/d' containers.yml sed -i '/container_name/d' containers.yml

17
php/containers-schema.json
View file

@ -117,8 +117,21 @@
"type": "array", "type": "array",
"items": { "items": {
"type": "string", "type": "string",
"pattern": "^(php /var/www/html/occ .*|echo .*)$", "pattern": "^(php /var/www/html/occ .*|echo .*)$"
"minlength": 1 }
},
"profiles": {
"type": "array",
"items": {
"type": "string",
"pattern": "^[a-z-]+$"
}
},
"networks": {
"type": "array",
"items": {
"type": "string",
"pattern": "^nextcloud-aio$"
} }
}, },
"volumes": { "volumes": {

67
php/containers.json
View file

@ -46,6 +46,9 @@
"backup_volumes": [ "backup_volumes": [
"nextcloud_aio_nextcloud", "nextcloud_aio_nextcloud",
"nextcloud_aio_apache" "nextcloud_aio_apache"
],
"networks": [
"nextcloud-aio"
] ]
}, },
{ {
@ -84,6 +87,9 @@
"backup_volumes": [ "backup_volumes": [
"nextcloud_aio_database", "nextcloud_aio_database",
"nextcloud_aio_database_dump" "nextcloud_aio_database_dump"
],
"networks": [
"nextcloud-aio"
] ]
}, },
{ {
@ -182,6 +188,9 @@
], ],
"backup_volumes": [ "backup_volumes": [
"nextcloud_aio_nextcloud" "nextcloud_aio_nextcloud"
],
"networks": [
"nextcloud-aio"
] ]
}, },
{ {
@ -207,7 +216,10 @@
"REDIS_PASSWORD", "REDIS_PASSWORD",
"ONLYOFFICE_SECRET" "ONLYOFFICE_SECRET"
], ],
"restart": "unless-stopped" "restart": "unless-stopped",
"networks": [
"nextcloud-aio"
]
}, },
{ {
"container_name": "nextcloud-aio-collabora", "container_name": "nextcloud-aio-collabora",
@ -229,6 +241,12 @@
"nextcloud_exec_commands": [ "nextcloud_exec_commands": [
"echo 'Activating collabora config...'", "echo 'Activating collabora config...'",
"php /var/www/html/occ richdocuments:activate-config" "php /var/www/html/occ richdocuments:activate-config"
],
"profiles": [
"collabora"
],
"networks": [
"nextcloud-aio"
] ]
}, },
{ {
@ -264,7 +282,14 @@
"SIGNALING_SECRET", "SIGNALING_SECRET",
"TALK_INTERNAL_SECRET" "TALK_INTERNAL_SECRET"
], ],
"restart": "unless-stopped" "restart": "unless-stopped",
"profiles": [
"talk",
"talk-recording"
],
"networks": [
"nextcloud-aio"
]
}, },
{ {
"container_name": "nextcloud-aio-talk-recording", "container_name": "nextcloud-aio-talk-recording",
@ -285,7 +310,13 @@
"RECORDING_SECRET", "RECORDING_SECRET",
"TALK_INTERNAL_SECRET" "TALK_INTERNAL_SECRET"
], ],
"restart": "unless-stopped" "restart": "unless-stopped",
"profiles": [
"talk-recording"
],
"networks": [
"nextcloud-aio"
]
}, },
{ {
"container_name": "nextcloud-aio-borgbackup", "container_name": "nextcloud-aio-borgbackup",
@ -395,7 +426,13 @@
"writeable": true "writeable": true
} }
], ],
"restart": "unless-stopped" "restart": "unless-stopped",
"profiles": [
"clamav"
],
"networks": [
"nextcloud-aio"
]
}, },
{ {
"container_name": "nextcloud-aio-onlyoffice", "container_name": "nextcloud-aio-onlyoffice",
@ -421,7 +458,13 @@
"secrets": [ "secrets": [
"ONLYOFFICE_SECRET" "ONLYOFFICE_SECRET"
], ],
"restart": "unless-stopped" "restart": "unless-stopped",
"profiles": [
"onlyoffice"
],
"networks": [
"nextcloud-aio"
]
}, },
{ {
"container_name": "nextcloud-aio-imaginary", "container_name": "nextcloud-aio-imaginary",
@ -437,6 +480,12 @@
"restart": "unless-stopped", "restart": "unless-stopped",
"cap_add": [ "cap_add": [
"SYS_NICE" "SYS_NICE"
],
"profiles": [
"imaginary"
],
"networks": [
"nextcloud-aio"
] ]
}, },
{ {
@ -460,7 +509,13 @@
"writeable": true "writeable": true
} }
], ],
"restart": "unless-stopped" "restart": "unless-stopped",
"profiles": [
"fulltextsearch"
],
"networks": [
"nextcloud-aio"
]
} }
] ]
} }