From f0ab0015fcd1a30a81bbc1440c7fc341f7d0a50c Mon Sep 17 00:00:00 2001 From: lll <2844835+flll@users.noreply.github.com> Date: Tue, 8 Oct 2024 11:09:54 +0900 Subject: [PATCH 1/9] =?UTF-8?q?=F0=9F=94=A7=20Refactor=20manual-install=20?= =?UTF-8?q?Compose.yml:=20Simplify=20Environment=20Variables?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Removed explicit values for environment variables in `docker-compose.yml`. - Utilized default values for better flexibility and maintainability. - Updated network configuration to use the default bridge driver. Note: Using `network: default` is sufficient within Docker Compose; there's no need to create a separate `nextcloud-network` for all hosts. 🚀 Signed-off-by: lll <2844835+flll@users.noreply.github.com> --- manual-install/latest.yml | 100 ++++++++++++++------------------------ 1 file changed, 37 insertions(+), 63 deletions(-) diff --git a/manual-install/latest.yml b/manual-install/latest.yml index e5d876ca12d..78a8997d306 100644 --- a/manual-install/latest.yml +++ b/manual-install/latest.yml @@ -25,15 +25,15 @@ services: - ${APACHE_IP_BINDING}:${APACHE_PORT}:${APACHE_PORT}/tcp - ${APACHE_IP_BINDING}:${APACHE_PORT}:${APACHE_PORT}/udp environment: - - NC_DOMAIN=${NC_DOMAIN} + - NC_DOMAIN - NEXTCLOUD_HOST=nextcloud-aio-nextcloud - APACHE_HOST=nextcloud-aio-apache - COLLABORA_HOST=nextcloud-aio-collabora - TALK_HOST=nextcloud-aio-talk - - APACHE_PORT=${APACHE_PORT} + - APACHE_PORT - ONLYOFFICE_HOST=nextcloud-aio-onlyoffice - TZ=${TIMEZONE} - - APACHE_MAX_SIZE=${APACHE_MAX_SIZE} + - APACHE_MAX_SIZE - APACHE_MAX_TIME=${NEXTCLOUD_MAX_TIME} - NOTIFY_PUSH_HOST=nextcloud-aio-notify-push - WHITEBOARD_HOST=nextcloud-aio-whiteboard @@ -41,8 +41,6 @@ services: - nextcloud_aio_nextcloud:/var/www/html:ro - nextcloud_aio_apache:/mnt/data:rw restart: unless-stopped - networks: - - nextcloud-aio read_only: true tmpfs: - /var/log/supervisord @@ -70,8 +68,6 @@ services: stop_grace_period: 1800s restart: unless-stopped shm_size: 268435456 - networks: - - nextcloud-aio read_only: true tmpfs: - /var/run/postgresql @@ -116,52 +112,50 @@ services: - POSTGRES_USER=nextcloud - REDIS_HOST=nextcloud-aio-redis - REDIS_HOST_PASSWORD=${REDIS_PASSWORD} - - NC_DOMAIN=${NC_DOMAIN} + - NC_DOMAIN - ADMIN_USER=admin - ADMIN_PASSWORD=${NEXTCLOUD_PASSWORD} - NEXTCLOUD_DATA_DIR=/mnt/ncdata - OVERWRITEHOST=${NC_DOMAIN} - OVERWRITEPROTOCOL=https - - TURN_SECRET=${TURN_SECRET} - - SIGNALING_SECRET=${SIGNALING_SECRET} - - ONLYOFFICE_SECRET=${ONLYOFFICE_SECRET} - - NEXTCLOUD_MOUNT=${NEXTCLOUD_MOUNT} - - CLAMAV_ENABLED=${CLAMAV_ENABLED} + - TURN_SECRET + - SIGNALING_SECRET + - ONLYOFFICE_SECRET + - NEXTCLOUD_MOUNT + - CLAMAV_ENABLED - CLAMAV_HOST=nextcloud-aio-clamav - - ONLYOFFICE_ENABLED=${ONLYOFFICE_ENABLED} - - COLLABORA_ENABLED=${COLLABORA_ENABLED} + - ONLYOFFICE_ENABLED + - COLLABORA_ENABLED - COLLABORA_HOST=nextcloud-aio-collabora - - TALK_ENABLED=${TALK_ENABLED} + - TALK_ENABLED - ONLYOFFICE_HOST=nextcloud-aio-onlyoffice - - UPDATE_NEXTCLOUD_APPS=${UPDATE_NEXTCLOUD_APPS} + - UPDATE_NEXTCLOUD_APPS - TZ=${TIMEZONE} - - TALK_PORT=${TALK_PORT} - - IMAGINARY_ENABLED=${IMAGINARY_ENABLED} + - TALK_PORT + - IMAGINARY_ENABLED - IMAGINARY_HOST=nextcloud-aio-imaginary - CLAMAV_MAX_SIZE=${APACHE_MAX_SIZE} - PHP_UPLOAD_LIMIT=${NEXTCLOUD_UPLOAD_LIMIT} - PHP_MEMORY_LIMIT=${NEXTCLOUD_MEMORY_LIMIT} - - FULLTEXTSEARCH_ENABLED=${FULLTEXTSEARCH_ENABLED} + - FULLTEXTSEARCH_ENABLED - FULLTEXTSEARCH_HOST=nextcloud-aio-fulltextsearch - PHP_MAX_TIME=${NEXTCLOUD_MAX_TIME} - TRUSTED_CACERTS_DIR=${NEXTCLOUD_TRUSTED_CACERTS_DIR} - STARTUP_APPS=${NEXTCLOUD_STARTUP_APPS} - ADDITIONAL_APKS=${NEXTCLOUD_ADDITIONAL_APKS} - ADDITIONAL_PHP_EXTENSIONS=${NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS} - - INSTALL_LATEST_MAJOR=${INSTALL_LATEST_MAJOR} - - TALK_RECORDING_ENABLED=${TALK_RECORDING_ENABLED} - - RECORDING_SECRET=${RECORDING_SECRET} + - INSTALL_LATEST_MAJOR + - TALK_RECORDING_ENABLED + - RECORDING_SECRET - TALK_RECORDING_HOST=nextcloud-aio-talk-recording - - FULLTEXTSEARCH_PASSWORD=${FULLTEXTSEARCH_PASSWORD} - - REMOVE_DISABLED_APPS=${REMOVE_DISABLED_APPS} - - APACHE_PORT=${APACHE_PORT} - - IMAGINARY_SECRET=${IMAGINARY_SECRET} - - WHITEBOARD_SECRET=${WHITEBOARD_SECRET} - - WHITEBOARD_ENABLED=${WHITEBOARD_ENABLED} + - FULLTEXTSEARCH_PASSWORD + - REMOVE_DISABLED_APPS + - APACHE_PORT + - IMAGINARY_SECRET + - WHITEBOARD_SECRET + - WHITEBOARD_ENABLED stop_grace_period: 600s restart: unless-stopped - networks: - - nextcloud-aio cap_drop: - NET_RAW @@ -173,18 +167,16 @@ services: volumes: - nextcloud_aio_nextcloud:/nextcloud:ro environment: - - NC_DOMAIN=${NC_DOMAIN} + - NC_DOMAIN - NEXTCLOUD_HOST=nextcloud-aio-nextcloud - REDIS_HOST=nextcloud-aio-redis - - REDIS_HOST_PASSWORD=${REDIS_PASSWORD} + - REDIS_HOST_PASSWORD - POSTGRES_HOST=nextcloud-aio-database - POSTGRES_PORT=5432 - POSTGRES_PASSWORD=${DATABASE_PASSWORD} - POSTGRES_DB=nextcloud_database - POSTGRES_USER=nextcloud restart: unless-stopped - networks: - - nextcloud-aio read_only: true cap_drop: - NET_RAW @@ -200,8 +192,6 @@ services: volumes: - nextcloud_aio_redis:/data:rw restart: unless-stopped - networks: - - nextcloud-aio read_only: true cap_drop: - NET_RAW @@ -221,8 +211,6 @@ services: restart: unless-stopped profiles: - collabora - networks: - - nextcloud-aio cap_add: - MKNOD - SYS_ADMIN @@ -238,19 +226,17 @@ services: expose: - "8081" environment: - - NC_DOMAIN=${NC_DOMAIN} + - NC_DOMAIN - TALK_HOST=nextcloud-aio-talk - - TURN_SECRET=${TURN_SECRET} - - SIGNALING_SECRET=${SIGNALING_SECRET} + - TURN_SECRET + - SIGNALING_SECRET - TZ=${TIMEZONE} - - TALK_PORT=${TALK_PORT} + - TALK_PORT - INTERNAL_SECRET=${TALK_INTERNAL_SECRET} restart: unless-stopped profiles: - talk - talk-recording - networks: - - nextcloud-aio read_only: true tmpfs: - /var/log/supervisord @@ -267,7 +253,7 @@ services: expose: - "1234" environment: - - NC_DOMAIN=${NC_DOMAIN} + - NC_DOMAIN - TZ=${TIMEZONE} - RECORDING_SECRET=${RECORDING_SECRET} - INTERNAL_SECRET=${TALK_INTERNAL_SECRET} @@ -275,8 +261,6 @@ services: restart: unless-stopped profiles: - talk-recording - networks: - - nextcloud-aio read_only: true tmpfs: - /tmp @@ -298,8 +282,6 @@ services: restart: unless-stopped profiles: - clamav - networks: - - nextcloud-aio read_only: true tmpfs: - /var/lock @@ -323,8 +305,6 @@ services: restart: unless-stopped profiles: - onlyoffice - networks: - - nextcloud-aio cap_drop: - NET_RAW @@ -335,7 +315,7 @@ services: - "9000" environment: - TZ=${TIMEZONE} - - IMAGINARY_SECRET=${IMAGINARY_SECRET} + - IMAGINARY_SECRET restart: unless-stopped cap_add: - SYS_NICE @@ -343,8 +323,6 @@ services: - NET_RAW profiles: - imaginary - networks: - - nextcloud-aio read_only: true tmpfs: - /tmp @@ -364,14 +342,12 @@ services: - http.port=9200 - xpack.license.self_generated.type=basic - xpack.security.enabled=false - - FULLTEXTSEARCH_PASSWORD=${FULLTEXTSEARCH_PASSWORD} + - FULLTEXTSEARCH_PASSWORD volumes: - nextcloud_aio_elasticsearch:/usr/share/elasticsearch/data:rw restart: unless-stopped profiles: - fulltextsearch - networks: - - nextcloud-aio cap_drop: - NET_RAW @@ -386,13 +362,11 @@ services: - JWT_SECRET_KEY=${WHITEBOARD_SECRET} - STORAGE_STRATEGY=redis - REDIS_HOST=nextcloud-aio-redis - - REDIS_HOST_PASSWORD=${REDIS_PASSWORD} + - REDIS_HOST_PASSWORD restart: unless-stopped profiles: - whiteboard read_only: true - networks: - - nextcloud-aio cap_drop: - NET_RAW @@ -417,5 +391,5 @@ volumes: name: nextcloud_aio_nextcloud_data networks: - nextcloud-aio: - name: nextcloud-aio + default: + driver: bridge From 98177e604a8fdc57ac9738483e2df04fc786c38c Mon Sep 17 00:00:00 2001 From: lll <2844835+flll@users.noreply.github.com> Date: Sun, 13 Oct 2024 10:54:07 +0900 Subject: [PATCH 2/9] Update manual-install/latest.yml Co-authored-by: Jean-Yves <7360784+docjyJ@users.noreply.github.com> Signed-off-by: lll <2844835+flll@users.noreply.github.com> --- manual-install/latest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manual-install/latest.yml b/manual-install/latest.yml index 78a8997d306..de3fcad5b99 100644 --- a/manual-install/latest.yml +++ b/manual-install/latest.yml @@ -170,7 +170,7 @@ services: - NC_DOMAIN - NEXTCLOUD_HOST=nextcloud-aio-nextcloud - REDIS_HOST=nextcloud-aio-redis - - REDIS_HOST_PASSWORD + - REDIS_HOST_PASSWORD=${REDIS_PASSWORD} - POSTGRES_HOST=nextcloud-aio-database - POSTGRES_PORT=5432 - POSTGRES_PASSWORD=${DATABASE_PASSWORD} From d857e6a2bf1e0e2cb931ce6485183adfdcb20816 Mon Sep 17 00:00:00 2001 From: lll <2844835+flll@users.noreply.github.com> Date: Sun, 13 Oct 2024 10:54:20 +0900 Subject: [PATCH 3/9] Update manual-install/latest.yml Co-authored-by: Jean-Yves <7360784+docjyJ@users.noreply.github.com> Signed-off-by: lll <2844835+flll@users.noreply.github.com> --- manual-install/latest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manual-install/latest.yml b/manual-install/latest.yml index de3fcad5b99..e503a35dd1c 100644 --- a/manual-install/latest.yml +++ b/manual-install/latest.yml @@ -362,7 +362,7 @@ services: - JWT_SECRET_KEY=${WHITEBOARD_SECRET} - STORAGE_STRATEGY=redis - REDIS_HOST=nextcloud-aio-redis - - REDIS_HOST_PASSWORD + - REDIS_HOST_PASSWORD=${REDIS_PASSWORD} restart: unless-stopped profiles: - whiteboard From 0343eab85ba7a488a128cb195d7b03af408df9dc Mon Sep 17 00:00:00 2001 From: lll <2844835+flll@users.noreply.github.com> Date: Sun, 13 Oct 2024 17:55:45 +0900 Subject: [PATCH 4/9] =?UTF-8?q?update-yaml.sh=20=E3=81=AE=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3:=20=E3=83=8D=E3=83=83=E3=83=88=E3=83=AF=E3=83=BC?= =?UTF-8?q?=E3=82=AF=E5=89=8A=E9=99=A4=E3=81=A8=E5=A4=89=E6=95=B0=E7=B0=A1?= =?UTF-8?q?=E7=95=A5=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `update-yaml.sh`の処理の追加を - .services[].networks の削除 - =%%を削除する特殊な処理 これにより、 すべてのサービスをdefaultのネットワークに接続させることができ、 変数の簡略化が見込めます Signed-off-by: lll <2844835+flll@users.noreply.github.com> --- manual-install/update-yaml.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/manual-install/update-yaml.sh b/manual-install/update-yaml.sh index d8bb0cc21af..0e19c498436 100644 --- a/manual-install/update-yaml.sh +++ b/manual-install/update-yaml.sh @@ -1,6 +1,6 @@ -#!/bin/bash +#!/bin/bash -ex -set -ex +type {jq,sudo} || { echo "Commands not found. Please install them"; exit 127; } jq -c . ./php/containers.json > /tmp/containers.json sed -i 's|aio_services_v1|services|g' /tmp/containers.json @@ -18,6 +18,7 @@ OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[].devices)')" OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[].backup_volumes)')" OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[].nextcloud_exec_commands)')" OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[].image_tag)')" +OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[].networks)')" OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[] | select(.container_name == "nextcloud-aio-watchtower"))')" OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[] | select(.container_name == "nextcloud-aio-domaincheck"))')" OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[] | select(.container_name == "nextcloud-aio-borgbackup"))')" @@ -41,6 +42,7 @@ sed -i '/AIO_TOKEN/d' containers.yml sed -i '/AIO_URL/d' containers.yml sed -i '/DOCKER_SOCKET_PROXY_ENABLED/d' containers.yml sed -i '/ADDITIONAL_TRUSTED_PROXY/d' containers.yml +sed -i 's/\(^[[:space:]]*- \([^=]*\)\)=%\2%/\1/' containers.yml TCP="$(grep -oP '[%A-Z0-9_]+/tcp' containers.yml | sort -u)" mapfile -t TCP <<< "$TCP" @@ -139,8 +141,8 @@ done cat << NETWORK >> containers.yml networks: - nextcloud-aio: - name: nextcloud-aio + default: + driver: bridge NETWORK cat containers.yml > latest.yml From 5f377247bc0b0480a4f640bc5517433cfbc2acb8 Mon Sep 17 00:00:00 2001 From: lll <2844835+flll@users.noreply.github.com> Date: Sun, 13 Oct 2024 19:43:18 +0900 Subject: [PATCH 5/9] Update manual-install/update-yaml.sh Signed-off-by: lll <2844835+flll@users.noreply.github.com> Co-Authored-By: Jean-Yves <7360784+docjyJ@users.noreply.github.com> --- manual-install/update-yaml.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manual-install/update-yaml.sh b/manual-install/update-yaml.sh index 0e19c498436..13177d6ed46 100644 --- a/manual-install/update-yaml.sh +++ b/manual-install/update-yaml.sh @@ -42,7 +42,7 @@ sed -i '/AIO_TOKEN/d' containers.yml sed -i '/AIO_URL/d' containers.yml sed -i '/DOCKER_SOCKET_PROXY_ENABLED/d' containers.yml sed -i '/ADDITIONAL_TRUSTED_PROXY/d' containers.yml -sed -i 's/\(^[[:space:]]*- \([^=]*\)\)=%\2%/\1/' containers.yml +sed -ie 's/\( *- \(\w*\)\)=\${\2\}/\1/' containers.yml TCP="$(grep -oP '[%A-Z0-9_]+/tcp' containers.yml | sort -u)" mapfile -t TCP <<< "$TCP" From 947b6128753907e70c8776ea7247d30a1ebeebac Mon Sep 17 00:00:00 2001 From: "Simon L." Date: Tue, 22 Oct 2024 10:48:30 +0200 Subject: [PATCH 6/9] WIP --- .../templates/nextcloud-aio-nextcloud-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml index 9d4721e8cf1..c67d051b080 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml @@ -173,7 +173,7 @@ spec: value: "{{ .Values.WHITEBOARD_ENABLED }}" - name: WHITEBOARD_SECRET value: "{{ .Values.WHITEBOARD_SECRET }}" - image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-nextcloud:20240925_080419" + image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-nextcloud:20240925_08041" name: nextcloud-aio-nextcloud ports: - containerPort: 9000 From 57d03d81506bda4ab0a3d6660c8313dfa8c4e806 Mon Sep 17 00:00:00 2001 From: "Simon L." Date: Tue, 22 Oct 2024 12:18:18 +0200 Subject: [PATCH 7/9] WIP --- .../templates/nextcloud-aio-nextcloud-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml index cbfc8b157fc..f4585826d22 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml @@ -173,7 +173,7 @@ spec: value: "{{ .Values.WHITEBOARD_ENABLED }}" - name: WHITEBOARD_SECRET value: "{{ .Values.WHITEBOARD_SECRET }}" - image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-nextcloud:20241017_085101" + image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-nextcloud:20241017_08510" name: nextcloud-aio-nextcloud ports: - containerPort: 9000 From 9774fcd1db3c5cc7801d2fb814aa5bed71002de4 Mon Sep 17 00:00:00 2001 From: flll <2844835+flll@users.noreply.github.com> Date: Wed, 23 Oct 2024 12:47:57 +0900 Subject: [PATCH 8/9] [update-(helm|yaml).sh] update - [update-yaml.sh] Change sed command option from -e to -E - [update-helm.sh] Add check for docker image tag as first argument, exit 2 if missing - [update-helm.sh] Modify snap command to run with sudo - [update-helm.sh] Add new sed commands: - [sed] Convert `- AB_CD_EFG` to `- AB_CD_EFG=${AB_CD_EFG}` - [sed] Apply conversion only to uppercase variables - [sed] Exclude NET_RAW, SYS_NICE, NET_ADMIN, and MKNOD capabilities from conversion --- manual-install/latest.yml | 2 +- manual-install/update-yaml.sh | 8 +++----- nextcloud-aio-helm-chart/update-helm.sh | 11 +++++++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/manual-install/latest.yml b/manual-install/latest.yml index e503a35dd1c..03132847cf9 100644 --- a/manual-install/latest.yml +++ b/manual-install/latest.yml @@ -255,7 +255,7 @@ services: environment: - NC_DOMAIN - TZ=${TIMEZONE} - - RECORDING_SECRET=${RECORDING_SECRET} + - RECORDING_SECRET - INTERNAL_SECRET=${TALK_INTERNAL_SECRET} shm_size: 2147483648 restart: unless-stopped diff --git a/manual-install/update-yaml.sh b/manual-install/update-yaml.sh index 13177d6ed46..e712304c6d9 100644 --- a/manual-install/update-yaml.sh +++ b/manual-install/update-yaml.sh @@ -26,7 +26,7 @@ OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[] | select(.container_name == "next OUTPUT="$(echo "$OUTPUT" | jq '.services[] |= if has("depends_on") then .depends_on |= if contains(["nextcloud-aio-docker-socket-proxy"]) then del(.[index("nextcloud-aio-docker-socket-proxy")]) else . end else . end')" OUTPUT="$(echo "$OUTPUT" | jq '.services[] |= if has("depends_on") then .depends_on |= map({ (.): { "condition": "service_started", "required": false } }) else . end' | jq '.services[] |= if has("depends_on") then .depends_on |= reduce .[] as $item ({}; . + $item) else . end')" -snap install yq +sudo snap install yq mkdir -p ./manual-install echo "$OUTPUT" | yq -P > ./manual-install/containers.yml @@ -42,7 +42,6 @@ sed -i '/AIO_TOKEN/d' containers.yml sed -i '/AIO_URL/d' containers.yml sed -i '/DOCKER_SOCKET_PROXY_ENABLED/d' containers.yml sed -i '/ADDITIONAL_TRUSTED_PROXY/d' containers.yml -sed -ie 's/\( *- \(\w*\)\)=\${\2\}/\1/' containers.yml TCP="$(grep -oP '[%A-Z0-9_]+/tcp' containers.yml | sort -u)" mapfile -t TCP <<< "$TCP" @@ -145,9 +144,8 @@ networks: driver: bridge NETWORK -cat containers.yml > latest.yml +mv containers.yml latest.yml sed -i "/image:/s/$/:latest/" latest.yml - -rm containers.yml +sed -i 's/\( *- \(\w*\)\)=\${\2\}/\1/' latest.yml set +ex diff --git a/nextcloud-aio-helm-chart/update-helm.sh b/nextcloud-aio-helm-chart/update-helm.sh index 9267ab07a19..9200cc3a335 100755 --- a/nextcloud-aio-helm-chart/update-helm.sh +++ b/nextcloud-aio-helm-chart/update-helm.sh @@ -1,9 +1,11 @@ #!/bin/bash +[ -z "$1" ] && { echo "Error: Docker tag is not specified. Usage: ./nextcloud-aio-helm-chart/update-helm.sh "; exit 2; } + DOCKER_TAG="$1" # The logic needs the files in ./helm-chart -mv ./nextcloud-aio-helm-chart ./helm-chart +cp -r ./nextcloud-aio-helm-chart ./helm-chart # Clean rm -f ./helm-chart/values.yaml @@ -15,13 +17,15 @@ chmod +x kompose sudo mv ./kompose /usr/local/bin/kompose # Install yq -snap install yq +sudo snap install yq set -ex # Conversion of docker-compose cd manual-install cp latest.yml latest.yml.backup + +sed -i -E '/^( *- )(NET_RAW|SYS_NICE|MKNOD|SYS_ADMIN)$/!s/( *- )([A-Z_]+)$/\1\2=${\2}/' latest.yml cp sample.conf /tmp/ sed -i 's|^|export |' /tmp/sample.conf # shellcheck disable=SC1091 @@ -41,8 +45,7 @@ sed -i "/NEXTCLOUD_DATADIR/d" latest.yml sed -i "/\${NEXTCLOUD_MOUNT}/d" latest.yml sed -i "/^volumes:/a\ \ nextcloud_aio_nextcloud_trusted_cacerts:\n \ \ \ \ name: nextcloud_aio_nextcloud_trusted_cacerts" latest.yml sed -i "s|\${NEXTCLOUD_TRUSTED_CACERTS_DIR}:|nextcloud_aio_nextcloud_trusted_cacerts:|g#" latest.yml -sed -i 's|\${|{{ .Values.|g' latest.yml -sed -i 's|}| }}|g' latest.yml +sed -i 's/\${/{{ .Values./g; s/}/ }}/g' latest.yml yq -i 'del(.services.[].profiles)' latest.yml # Delete read_only and tmpfs setting while https://github.com/kubernetes/kubernetes/issues/48912 is not fixed yq -i 'del(.services.[].read_only)' latest.yml From d8d0cec1e8022d5b07ef31c7c04609dc36ad30b6 Mon Sep 17 00:00:00 2001 From: "Simon L." Date: Thu, 24 Oct 2024 12:01:32 +0200 Subject: [PATCH 9/9] Revert "WIP" This reverts commit 57d03d81506bda4ab0a3d6660c8313dfa8c4e806. --- .../templates/nextcloud-aio-nextcloud-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml index f4585826d22..cbfc8b157fc 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml @@ -173,7 +173,7 @@ spec: value: "{{ .Values.WHITEBOARD_ENABLED }}" - name: WHITEBOARD_SECRET value: "{{ .Values.WHITEBOARD_SECRET }}" - image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-nextcloud:20241017_08510" + image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-nextcloud:20241017_085101" name: nextcloud-aio-nextcloud ports: - containerPort: 9000