From b33a976706a7ffae3cfeb0bb2a5224aac7e673b9 Mon Sep 17 00:00:00 2001 From: jld3103 Date: Wed, 1 Mar 2023 15:51:47 +0100 Subject: [PATCH 1/2] tool: Add the version of apps to the dockerfile to rebuild on updates --- tool/Dockerfile.dev | 4 ++-- tool/update.sh | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tool/Dockerfile.dev b/tool/Dockerfile.dev index bc8ee761..5a85cae7 100644 --- a/tool/Dockerfile.dev +++ b/tool/Dockerfile.dev @@ -11,8 +11,8 @@ RUN ./occ app:disable password_policy RUN OC_PASS="user1" ./occ user:add --password-from-env --display-name "User One" user1 RUN OC_PASS="user2" ./occ user:add --password-from-env --display-name "User Two" user2 -RUN ./occ app:install news -RUN ./occ app:install notes +RUN ./occ app:install news # 20.0.0 +RUN ./occ app:install notes # 4.6.0 RUN ./occ app:enable password_policy # TODO: This stopped working randomly with apache not being able to bind to the port during build. Must be some docker changes? diff --git a/tool/update.sh b/tool/update.sh index 10c93121..eca0e8f7 100755 --- a/tool/update.sh +++ b/tool/update.sh @@ -24,10 +24,12 @@ elif [ -d "external/nextcloud-$1" ]; then git reset --hard "$latest_tag" git submodule update + # shellcheck disable=SC2001 + latest_version=$(echo "$latest_tag" | sed "s/^v//") if [[ "$1" == "server" ]]; then - # shellcheck disable=SC2001 - image_version=$(echo "$latest_tag" | sed "s/^v//") - sed -i "s/FROM nextcloud:.*/FROM nextcloud:$image_version/" ../../tool/Dockerfile.dev + sed -i "s/FROM nextcloud:.*/FROM nextcloud:$latest_version/" ../../tool/Dockerfile.dev + else + sed -i "s/RUN \.\/occ app:install $1 .*/RUN .\/occ app:install $1 # $latest_version/" ../../tool/Dockerfile.dev fi ) else From 4e4d6d70b631c118416c1f1dba169dd8c4750509 Mon Sep 17 00:00:00 2001 From: jld3103 Date: Wed, 1 Mar 2023 15:57:00 +0100 Subject: [PATCH 2/2] Update nextcloud news to 21.0.0 --- external/nextcloud-news | 2 +- packages/neon/lib/src/apps/news/widgets/feed_icon.dart | 4 ++-- packages/nextcloud/lib/src/nextcloud.openapi.dart | 4 ++-- packages/nextcloud/lib/src/nextcloud.openapi.g.dart | 2 +- packages/nextcloud/lib/src/nextcloud.openapi.json | 1 - specs/news.json | 3 +-- specs/templates/news.json | 2 +- tool/Dockerfile.dev | 2 +- 8 files changed, 9 insertions(+), 11 deletions(-) diff --git a/external/nextcloud-news b/external/nextcloud-news index c60d9b1f..adc143e2 160000 --- a/external/nextcloud-news +++ b/external/nextcloud-news @@ -1 +1 @@ -Subproject commit c60d9b1f15d566e48a148adcb3fd1e4493a1c1c0 +Subproject commit adc143e2a561289665d16089770b2a8cecbb1099 diff --git a/packages/neon/lib/src/apps/news/widgets/feed_icon.dart b/packages/neon/lib/src/apps/news/widgets/feed_icon.dart index ec5c083f..88abb055 100644 --- a/packages/neon/lib/src/apps/news/widgets/feed_icon.dart +++ b/packages/neon/lib/src/apps/news/widgets/feed_icon.dart @@ -18,9 +18,9 @@ class NewsFeedIcon extends StatelessWidget { width: size, height: size, borderRadius: borderRadius, - child: feed.faviconLink != '' + child: feed.faviconLink != null ? CachedURLImage( - url: feed.faviconLink, + url: feed.faviconLink!, height: size, width: size, iconColor: Theme.of(context).colorScheme.primary, diff --git a/packages/nextcloud/lib/src/nextcloud.openapi.dart b/packages/nextcloud/lib/src/nextcloud.openapi.dart index f5d7bc3a..8a392ccf 100644 --- a/packages/nextcloud/lib/src/nextcloud.openapi.dart +++ b/packages/nextcloud/lib/src/nextcloud.openapi.dart @@ -3604,7 +3604,7 @@ class NextcloudNewsFeed { required this.id, required this.url, required this.title, - required this.faviconLink, + this.faviconLink, required this.added, this.folderId, this.unreadCount, @@ -3631,7 +3631,7 @@ class NextcloudNewsFeed { final String title; - final String faviconLink; + final String? faviconLink; final int added; diff --git a/packages/nextcloud/lib/src/nextcloud.openapi.g.dart b/packages/nextcloud/lib/src/nextcloud.openapi.g.dart index c5bb7fa6..24ecae1e 100644 --- a/packages/nextcloud/lib/src/nextcloud.openapi.g.dart +++ b/packages/nextcloud/lib/src/nextcloud.openapi.g.dart @@ -1336,7 +1336,7 @@ NextcloudNewsFeed _$NextcloudNewsFeedFromJson(Map json) { id: json['id'] as int, url: json['url'] as String, title: json['title'] as String, - faviconLink: json['faviconLink'] as String, + faviconLink: json['faviconLink'] as String?, added: json['added'] as int, folderId: json['folderId'] as int?, unreadCount: json['unreadCount'] as int?, diff --git a/packages/nextcloud/lib/src/nextcloud.openapi.json b/packages/nextcloud/lib/src/nextcloud.openapi.json index 67be82fd..6f360fdc 100644 --- a/packages/nextcloud/lib/src/nextcloud.openapi.json +++ b/packages/nextcloud/lib/src/nextcloud.openapi.json @@ -987,7 +987,6 @@ "id", "url", "title", - "faviconLink", "added", "ordering", "pinned", diff --git a/specs/news.json b/specs/news.json index ad979aa4..6f463178 100644 --- a/specs/news.json +++ b/specs/news.json @@ -2,7 +2,7 @@ "openapi": "3.1.0", "info": { "title": "News", - "version": "20.0.0", + "version": "21.0.0", "description": "An RSS/Atom feed reader", "license": { "name": "agpl", @@ -103,7 +103,6 @@ "id", "url", "title", - "faviconLink", "added", "ordering", "pinned", diff --git a/specs/templates/news.json b/specs/templates/news.json index 72b1cc4a..91cc06cc 100644 --- a/specs/templates/news.json +++ b/specs/templates/news.json @@ -2,7 +2,7 @@ "openapi": "3.1.0", "info": { "title": "News", - "version": "20.0.0", + "version": "21.0.0", "description": "An RSS/Atom feed reader", "license": { "name": "agpl", diff --git a/tool/Dockerfile.dev b/tool/Dockerfile.dev index 5a85cae7..cbbf9faa 100644 --- a/tool/Dockerfile.dev +++ b/tool/Dockerfile.dev @@ -11,7 +11,7 @@ RUN ./occ app:disable password_policy RUN OC_PASS="user1" ./occ user:add --password-from-env --display-name "User One" user1 RUN OC_PASS="user2" ./occ user:add --password-from-env --display-name "User Two" user2 -RUN ./occ app:install news # 20.0.0 +RUN ./occ app:install news # 21.0.0 RUN ./occ app:install notes # 4.6.0 RUN ./occ app:enable password_policy