From 22050fcf9591a6a8e8cd81b25782795b344c3ac9 Mon Sep 17 00:00:00 2001 From: Luke Childs Date: Wed, 14 Sep 2022 18:01:45 +0700 Subject: [PATCH] Fix accessing Nextcloud on internal IP (#147) --- nextcloud/docker-compose.yml | 6 +++--- nextcloud/exports.sh | 5 ++++- nextcloud/umbrel-app.yml | 4 +++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index 83e94f7..7f7b7e4 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -34,7 +34,7 @@ services: ipv4_address: $APP_NEXTCLOUD_REDIS_IP web: - image: nextcloud:22.1.1-apache@sha256:99d94124b2024c9f7f38dc12144a92bc0d68d110bcfd374169ebb7e8df0adf8e + image: nextcloud:22.2.10-apache@sha256:71c4fb75d7c035ea2c840ebc1adf0da144b0c69e39ce925f4a2ea84b7c06db18 # Currently needs to be run as root, if we run as uid 1000 this fails # https://github.com/nextcloud/docker/blob/05026b029d37fc5cd488d4a4a2a79480e39841ba/21.0/apache/entrypoint.sh#L53-L77 # user: "1000:1000" @@ -49,7 +49,7 @@ services: - MYSQL_USER=nextcloud - NEXTCLOUD_ADMIN_USER=umbrel - NEXTCLOUD_ADMIN_PASSWORD=${APP_PASSWORD} - - NEXTCLOUD_TRUSTED_DOMAINS=${APP_DOMAIN}:${APP_NEXTCLOUD_PORT} ${APP_HIDDEN_SERVICE} ${DEVICE_HOSTNAME}:${APP_NEXTCLOUD_PORT} + - NEXTCLOUD_TRUSTED_DOMAINS=${APP_DOMAIN}:${APP_NEXTCLOUD_PORT} ${APP_HIDDEN_SERVICE} ${DEVICE_HOSTNAME}:${APP_NEXTCLOUD_PORT} ${APP_NEXTCLOUD_LOCAL_IPS} depends_on: - db - redis @@ -58,7 +58,7 @@ services: ipv4_address: $APP_NEXTCLOUD_IP cron: - image: nextcloud:22.0.0-apache@sha256:55de721417c16ff110720217406778e16f1b63154d2e8d42fc7913c37dbe6d50 + image: nextcloud:22.2.10-apache@sha256:71c4fb75d7c035ea2c840ebc1adf0da144b0c69e39ce925f4a2ea84b7c06db18 # Currently needs to be run as root, if we run as uid 1000 this fails # https://github.com/nextcloud/docker/blob/05026b029d37fc5cd488d4a4a2a79480e39841ba/21.0/apache/entrypoint.sh#L53-L77 # user: "1000:1000" diff --git a/nextcloud/exports.sh b/nextcloud/exports.sh index 374a61f..797828a 100644 --- a/nextcloud/exports.sh +++ b/nextcloud/exports.sh @@ -2,4 +2,7 @@ export APP_NEXTCLOUD_PORT="8081" export APP_NEXTCLOUD_IP="10.21.21.32" export APP_NEXTCLOUD_DB_IP="10.21.21.33" export APP_NEXTCLOUD_REDIS_IP="10.21.21.34" -export APP_NEXTCLOUD_CRON_IP="10.21.21.35" \ No newline at end of file +export APP_NEXTCLOUD_CRON_IP="10.21.21.35" + +local_ips=$(hostname --all-ip-addresses 2> /dev/null) || local_ips="" +export APP_NEXTCLOUD_LOCAL_IPS="${local_ips}" \ No newline at end of file diff --git a/nextcloud/umbrel-app.yml b/nextcloud/umbrel-app.yml index 2c11378..d5ac913 100644 --- a/nextcloud/umbrel-app.yml +++ b/nextcloud/umbrel-app.yml @@ -2,7 +2,7 @@ manifestVersion: 1 id: nextcloud category: Files name: Nextcloud -version: "22.1.1" +version: "22.2.10" tagline: Productivity platform that keeps you in control description: >- Nextcloud puts your data at your fingertips, under your control. @@ -24,6 +24,8 @@ description: >- Note: After logging in to Nextcloud please change the password to something secure before sharing the address with anyone. +releaseNotes: >- + - This release fixes a bug where your Nextcloud instance is inaccessible via your Umbrel's IP address. developer: Nextcloud GmbH website: https://nextcloud.com dependencies: []