Merge pull request #1586 from ManOki/main

manual-install: add docker profiles for optional services

manual-install/latest-arm64.yml

@@ -115,6 +115,7 @@ services:
 
   nextcloud-aio-collabora:
     container_name: nextcloud-aio-collabora
+    profiles: ["collabora"]
     image: nextcloud/aio-collabora:latest-arm64
     environment:
       - aliasgroup1=https://${NC_DOMAIN}:443
@@ -128,6 +129,7 @@ services:
 
   nextcloud-aio-talk:
     container_name: nextcloud-aio-talk
+    profiles: ["talk"]
     image: nextcloud/aio-talk:latest-arm64
     ports:
       - ${TALK_PORT}:${TALK_PORT}/tcp
@@ -146,6 +148,7 @@ services:
 
   nextcloud-aio-onlyoffice:
     container_name: nextcloud-aio-onlyoffice
+    profiles: ["onlyoffice"]
     image: nextcloud/aio-onlyoffice:latest-arm64
     environment:
       - TZ=${TIMEZONE}
@@ -161,6 +164,7 @@ services:
 
   nextcloud-aio-imaginary:
     container_name: nextcloud-aio-imaginary
+    profiles: ["imaginary"]
     image: nextcloud/aio-imaginary:latest-arm64
     environment:
       - TZ=${TIMEZONE}
@@ -171,6 +175,7 @@ services:
 
   nextcloud-aio-fulltextsearch:
     container_name: nextcloud-aio-fulltextsearch
+    profiles: ["fulltextsearch"]
     image: nextcloud/aio-fulltextsearch:latest-arm64
     environment:
       - TZ=${TIMEZONE}

manual-install/latest.yml

@@ -118,6 +118,7 @@ services:
 
   nextcloud-aio-collabora:
     container_name: nextcloud-aio-collabora
+    profiles: ["collabora"]
     image: nextcloud/aio-collabora:latest
     environment:
       - aliasgroup1=https://${NC_DOMAIN}:443
@@ -131,6 +132,7 @@ services:
 
   nextcloud-aio-talk:
     container_name: nextcloud-aio-talk
+    profiles: ["talk"]
     image: nextcloud/aio-talk:latest
     ports:
       - ${TALK_PORT}:${TALK_PORT}/tcp
@@ -149,6 +151,7 @@ services:
 
   nextcloud-aio-clamav:
     container_name: nextcloud-aio-clamav
+    profiles: ["clamav"]
     image: nextcloud/aio-clamav:latest
     environment:
       - TZ=${TIMEZONE}
@@ -161,6 +164,7 @@ services:
 
   nextcloud-aio-onlyoffice:
     container_name: nextcloud-aio-onlyoffice
+    profiles: ["onlyoffice"]
     image: nextcloud/aio-onlyoffice:latest
     environment:
       - TZ=${TIMEZONE}
@@ -176,6 +180,7 @@ services:
 
   nextcloud-aio-imaginary:
     container_name: nextcloud-aio-imaginary
+    profiles: ["imaginary"]
     image: nextcloud/aio-imaginary:latest
     environment:
       - TZ=${TIMEZONE}
@@ -186,6 +191,7 @@ services:
 
   nextcloud-aio-fulltextsearch:
     container_name: nextcloud-aio-fulltextsearch
+    profiles: ["fulltextsearch"]
     image: nextcloud/aio-fulltextsearch:latest
     environment:
       - TZ=${TIMEZONE}

manual-install/readme.md

@@ -27,6 +27,11 @@ Now copy the provided yaml file to a docker-compose file by running on x64 `cp l
 
 Now you should be ready to go with `sudo docker-compose --env-file my.conf up`.
 
+## Docker profiles
+The default profile of `latest.yml` only provide the minimum necessary services: nextcloud, database, redis and apache. To get optional services collabora, onlyoffice, talk, clamav, imaginary or fulltextsearch use additional arguments for each of them, for example `--profile collabora`.
+
+For a complete all-in-one with collabora use `sudo docker-compose --env-file my.conf --profile collabora --profile talk --profile clamav --profile imaginary --profile fulltextsearch up`.
+
 ## How to update?
 Since the AIO containers may change in the future, it is highly recommended to strictly follow the following procedure whenever you want to upgrade your containers.
 1. Run `sudo docker-compose --env-file my.conf down` to stop all running containers

manual-install/update-yaml.sh

@@ -92,6 +92,11 @@ do
     if [ "$name" != "nextcloud-aio-apache" ]; then
         OUTPUT="$(echo "$OUTPUT" | sed "/  $name:/i\ ")"
     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
 
 OUTPUT="$(echo "$OUTPUT" | sed "/restart: /a\ \ \ \ networks:\n\ \ \ \ \ \ - nextcloud-aio")"
@@ -102,6 +107,7 @@ echo "" >> containers.yml
 echo "$OUTPUT" >> containers.yml
 
 sed -i '/container_name/d' containers.yml
+sed -i 's|^ $||' containers.yml
 
 VOLUMES="$(grep -oP 'nextcloud_aio_[a-z_]+' containers.yml | sort -u)"
 mapfile -t VOLUMES <<< "$VOLUMES"
@@ -126,7 +132,7 @@ sed -i '/image:/s/$/:latest/' latest.yml
 
 cat containers.yml > latest-arm64.yml
 sed -i '/image:/s/$/:latest-arm64/' latest-arm64.yml
-sed -i '/  nextcloud-aio-clamav:/,/^ $/d' latest-arm64.yml
+sed -i '/  nextcloud-aio-clamav:/,/^$/d' latest-arm64.yml
 sed -i '/nextcloud[-_]aio[-_]clamav/d' latest-arm64.yml
 sed -i '/CLAMAV_ENABLED/d' latest-arm64.yml