Skip to content

Commit 35d8083

Browse files
committed
bump to NC 30.0.15
- includes nextcloud/server#55065 Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
1 parent df55f1a commit 35d8083

File tree

4 files changed

+50
-10
lines changed

4 files changed

+50
-10
lines changed

Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@
2222

2323
FROM ubuntu:24.04
2424

25-
ADD https://download.nextcloud.com/server/releases/nextcloud-30.0.12.tar.bz2 /root/nextcloud.tar.bz2
26-
ADD https://github.com/nextcloud-releases/richdocuments/releases/download/v8.5.7/richdocuments-v8.5.7.tar.gz /root/richdocuments.tar.gz
27-
ADD https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.9.0/onlyoffice.tar.gz /root/onlyoffice.tar.gz
25+
ADD https://download.nextcloud.com/server/releases/nextcloud-30.0.15.tar.bz2 /root/nextcloud.tar.bz2
26+
ADD https://github.com/nextcloud-releases/richdocuments/releases/download/v8.5.10/richdocuments-v8.5.10.tar.gz /root/richdocuments.tar.gz
27+
ADD https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.10.0/onlyoffice.tar.gz /root/onlyoffice.tar.gz
2828
COPY resources/entrypoint.sh /usr/sbin/
2929
COPY resources/60-nextcloud.ini /etc/php/8.3/apache2/conf.d/
3030
COPY resources/60-nextcloud.ini /etc/php/8.3/cli/conf.d/
3131
COPY resources/000-default.conf /etc/apache2/sites-enabled/
3232

3333
# uncomment and set to true if a patch nededs to be applied
34-
#COPY resources/19439.patch /root/nc.patch
35-
ENV NC_IS_PATCHED false
34+
COPY resources/55065.patch /root/nc.patch
35+
ENV NC_IS_PATCHED true
3636

3737
RUN /bin/bash -c "export DEBIAN_FRONTEND=noninteractive" && \
3838
echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \
@@ -105,9 +105,9 @@ RUN /bin/bash -c "export DEBIAN_FRONTEND=noninteractive" && \
105105
apt autoremove -y && apt clean
106106

107107
# uncomment and adjust following block if a patch needs to be applied
108-
#RUN cd /var/www/html/ && \
109-
# patch -p1 -t < /root/nc.patch && \
110-
# rm /root/nc.patch
108+
RUN cd /var/www/html/ && \
109+
patch -p1 -t < /root/nc.patch && \
110+
rm /root/nc.patch
111111

112112
EXPOSE 80
113113

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1919

2020
app_name=nextcloud
21-
app_version=30.0.11-90
21+
app_version=30.0.15-0
2222
app_upgrade_from=29.0.11-0
2323

2424
ucs_version=5.0

inst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ nextcloud_configure_saml() {
281281
--set simplesamlAttributes=TRUE \
282282
--set AssertionConsumerService="https://$hostname.$domainname/nextcloud/apps/user_saml/saml/acs" \
283283
--set simplesamlNameIDAttribute="uid" \
284-
--set singleLogoutService="https://$hostname.$domainname/nextcloud/apps/user_saml/saml/sls" || die
284+
--set singleLogoutService="https://$hostname.$domainname/nextcloud/apps/user_saml/saml/sls" || die "Failed to create saml/serviceprovider (SimpleSAMLphp)"
285285

286286
IDP_CERT=$(curl -s https://"${ucs_server_sso_fqdn:-ucs-sso.$domainname}"/simplesamlphp/saml2/idp/certificate | sed -ne '
287287
/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p # got the range, ok

resources/55065.patch

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
From ac6653ec5b9746c6695fc46dcee81379af048220 Mon Sep 17 00:00:00 2001
2+
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
3+
Date: Fri, 12 Sep 2025 11:48:28 +0200
4+
Subject: [PATCH] fix(Apps): fix install command check on existing apps
5+
6+
- AppManager::isInstalled() is misleading, as it checks only whether it is
7+
enabled. But an app might not be present in some edge cases.
8+
- AppManager::getAppPath() does however only check whether an app dir is
9+
present, independent of the enabled-state.
10+
11+
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
12+
---
13+
core/Command/App/Install.php | 5 ++++-
14+
1 file changed, 4 insertions(+), 1 deletion(-)
15+
16+
diff --git a/core/Command/App/Install.php b/core/Command/App/Install.php
17+
index aa263a8f3bfc9..f7fa92208eaaa 100644
18+
--- a/core/Command/App/Install.php
19+
+++ b/core/Command/App/Install.php
20+
@@ -9,6 +9,7 @@
21+
namespace OC\Core\Command\App;
22+
23+
use OC\Installer;
24+
+use OCP\App\AppPathNotFoundException;
25+
use OCP\App\IAppManager;
26+
use Symfony\Component\Console\Command\Command;
27+
use Symfony\Component\Console\Input\InputArgument;
28+
@@ -58,9 +59,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
29+
$appId = $input->getArgument('app-id');
30+
$forceEnable = (bool) $input->getOption('force');
31+
32+
- if ($this->appManager->isInstalled($appId)) {
33+
+ try {
34+
+ $this->appManager->getAppPath($appId);
35+
$output->writeln($appId . ' already installed');
36+
return 1;
37+
+ } catch (AppPathNotFoundException) {
38+
}
39+
40+
try {

0 commit comments

Comments
 (0)