Skip to content
Commits on Source (5)
Hide whitespace changes
Inline Side-by-side
base/Dockerfile
View file @ 4bd3f37b
......@@ -36,7 +36,7 @@ RUN for app in $(cat /usr/src/nextcloud/apps/nextcloud.json | jq -r .remove[]);d
rm /usr/src/nextcloud/config/autoconfig.php /usr/src/nextcloud/config/config.sample.php;
RUN for patch in /usr/src/nextcloud/patches/*.diff; \
do \
patch -p0 < $patch; \
patch -p0 < $patch || exit 1; \
done; \
rm -r /usr/src/nextcloud/patches/;
......
base/apps/nextcloud.json
View file @ 4bd3f37b
{
"apps": {
"announcementcenter": "https://github.com/nextcloud-releases/announcementcenter/releases/download/v6.7.0/announcementcenter-v6.7.0.tar.gz",
"appointments": "https://github.com/SergeyMosin/Appointments/raw/v1.15.5/build/artifacts/appstore/appointments.tar.gz",
"announcementcenter": "https://github.com/nextcloud-releases/announcementcenter/releases/download/v6.8.1/announcementcenter-v6.8.1.tar.gz",
"appointments": "https://github.com/SergeyMosin/Appointments/raw/v2.0.4/build/artifacts/appstore/appointments.tar.gz",
"bookmarks": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.3/bookmarks-13.1.3.tar.gz",
"calendar": "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.4/calendar-v4.6.4.tar.gz",
"calendar_resource_management": "https://github.com/nextcloud-releases/calendar_resource_management/releases/download/v0.6.0-alpha1/calendar_resource_management-v0.6.0-alpha1.tar.gz",
"calendar": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.0-beta4/calendar-v4.7.0-beta4.tar.gz",
"calendar_resource_management": "https://github.com/nextcloud-releases/calendar_resource_management/releases/download/v0.7.0/calendar_resource_management-v0.7.0.tar.gz",
"collectives": "https://github.com/nextcloud/collectives/releases/download/v2.9.2/collectives-2.9.2.tar.gz",
"contacts": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.1/contacts-v5.5.1.tar.gz",
"contacts": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.3/contacts-v5.5.3.tar.gz",
"data_request": "https://github.com/nextcloud-releases/data_request/releases/download/v1.14.0/data_request-v1.14.0.tar.gz",
"deck": "https://github.com/nextcloud-releases/deck/releases/download/v1.11.3/deck-v1.11.3.tar.gz",
"deck": "https://github.com/nextcloud-releases/deck/releases/download/v1.11.4/deck-v1.11.4.tar.gz",
"drawio": "https://github.com/jgraph/drawio-nextcloud/releases/download/v2.1.4/drawio-v2.1.4.tar.gz",
"drop_account": "https://packages.framasoft.org/projects/nextcloud-apps/drop-account/drop_account-2.3.2.tar.gz",
"electronicsignatures": "https://github.com/eideasy/nextcloud-electronic-signatures-plugin/releases/download/v2.0.5/v2.0.5.tar.gz",
"external": "https://github.com/nextcloud-releases/external/releases/download/v5.2.1/external-v5.2.1.tar.gz",
"files_automatedtagging": "https://github.com/nextcloud-releases/files_automatedtagging/releases/download/v1.17.0/files_automatedtagging-v1.17.0.tar.gz",
"files_fulltextsearch": "https://github.com/nextcloud-releases/files_fulltextsearch/releases/download/27.0.1/files_fulltextsearch-27.0.1.tar.gz",
"files_linkeditor": "https://github.com/te-online/nextcloud-app-releases/raw/main/files_linkeditor/v1.1.16/files_linkeditor.tar.gz",
"files_linkeditor": "https://github.com/te-online/nextcloud-app-releases/raw/main/files_linkeditor/v1.1.20/files_linkeditor.tar.gz",
"files_mindmap": "https://github.com/ACTom/files_mindmap/releases/download/v0.0.30/files_mindmap-0.0.30.tar.gz",
"files_versions_s3": "https://github.com/nextcloud-releases/files_versions_s3/releases/download/v0.2.1/files_versions_s3-v0.2.1.tar.gz",
"forms": "https://github.com/nextcloud-releases/forms/releases/download/v3.4.4/forms-v3.4.4.tar.gz",
"forms": "https://github.com/nextcloud-releases/forms/releases/download/v3.4.6/forms-v3.4.6.tar.gz",
"fulltextsearch": "https://github.com/nextcloud-releases/fulltextsearch/releases/download/27.0.3/fulltextsearch-27.0.3.tar.gz",
"fulltextsearch_elasticsearch": "https://github.com/nextcloud-releases/fulltextsearch_elasticsearch/releases/download/27.0.5/fulltextsearch_elasticsearch-27.0.5.tar.gz",
"groupfolders": "https://github.com/nextcloud-releases/groupfolders/releases/download/v15.3.4/groupfolders-v15.3.4.tar.gz",
"fulltextsearch_elasticsearch": "https://github.com/nextcloud-releases/fulltextsearch_elasticsearch/releases/download/27.0.6/fulltextsearch_elasticsearch-27.0.6.tar.gz",
"groupfolders": "https://github.com/nextcloud-releases/groupfolders/releases/download/v15.3.7/groupfolders-v15.3.7.tar.gz",
"impersonate": "https://github.com/nextcloud-releases/impersonate/releases/download/v1.14.0/impersonate-v1.14.0.tar.gz",
"keeweb": "https://github.com/jhass/nextcloud-keeweb/releases/download/v0.6.13/keeweb-0.6.13.tar.gz",
"mail": "https://github.com/nextcloud-releases/mail/releases/download/v3.5.5/mail-v3.5.5.tar.gz",
"mail": "https://github.com/nextcloud-releases/mail/releases/download/v3.6.0-rc1/mail-v3.6.0-rc1.tar.gz",
"music": "https://github.com/owncloud/music/releases/download/v1.9.1/music_1.9.1_for_nextcloud.tar.gz",
"notes": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.2/notes.tar.gz",
"onlyoffice": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v8.2.4/onlyoffice.tar.gz",
"notes": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.4/notes-v4.9.4.tar.gz",
"onlyoffice": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.1.2/onlyoffice.tar.gz",
"ownpad": "https://github.com/otetard/ownpad/releases/download/v0.9.5/ownpad.tar.gz",
"passwords": "https://git.mdns.eu/api/v4/projects/45/packages/generic/passwords/2023.12.2/passwords.tar.gz",
"polls": "https://github.com/nextcloud/polls/releases/download/v5.4.2/polls.tar.gz",
"quota_warning": "https://github.com/nextcloud-releases/quota_warning/releases/download/v1.18.0/quota_warning-v1.18.0.tar.gz",
"passwords": "https://git.mdns.eu/api/v4/projects/45/packages/generic/passwords/2023.9.0/passwords.tar.gz",
"polls": "https://github.com/nextcloud/polls/releases/download/v5.4.3/polls.tar.gz",
"quota_warning": "https://github.com/nextcloud-releases/quota_warning/releases/download/v1.19.0/quota_warning-v1.19.0.tar.gz",
"registration": "https://github.com/nextcloud-releases/registration/releases/download/v2.2.0/registration-v2.2.0.tar.gz",
"richdocuments": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.2.4/richdocuments-v8.2.4.tar.gz",
"richdocuments": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.2.6/richdocuments-v8.2.6.tar.gz",
"side_menu": "https://gitnet.fr/attachments/6c94236a-2f34-4a6a-8573-10b7559f2901",
"sociallogin": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v5.6.3/release.tar.gz",
"spreed": "https://github.com/nextcloud-releases/spreed/releases/download/v17.1.5/spreed-v17.1.5.tar.gz",
"tables": "https://github.com/nextcloud-releases/tables/releases/download/v0.6.6/tables-v0.6.6.tar.gz",
"sociallogin": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v5.6.4/release.tar.gz",
"spreed": "https://github.com/nextcloud-releases/spreed/releases/download/v17.1.7/spreed-v17.1.7.tar.gz",
"tables": "https://github.com/nextcloud-releases/tables/releases/download/v0.7.0-beta.3/tables-v0.7.0-beta.3.tar.gz",
"tasks": "https://github.com/nextcloud/tasks/releases/download/v0.15.0/tasks.tar.gz",
"theming_customcss": "https://github.com/juliushaertl/theming_customcss/releases/download/v1.15.0/theming_customcss.tar.gz",
"timemanager": "https://github.com/te-online/nextcloud-app-releases/raw/main/timemanager/v0.3.9/timemanager.tar.gz",
"timetracker": "https://mtier.org/timetracker/timetracker-0.0.80.tar.gz",
"timetracker": "https://mtier.org/timetracker/timetracker-0.0.82.tar.gz",
"user_migration": "https://github.com/nextcloud-releases/user_migration/releases/download/v4.0.1/user_migration-v4.0.1.tar.gz",
"user_saml": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.6/user_saml-v5.2.6.tar.gz"
"user_saml": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.7/user_saml-v5.2.7.tar.gz"
},
"remove": [
"encryption",
......@@ -51,5 +51,5 @@
"support",
"updatenotification"
],
"version": "27.1.7"
}
"version": "27.1.8"
}
\ No newline at end of file
base/patches/fix-oo.diff deleted 100644 → 0
View file @ a9f3cd77
# Waiting a new relaease of OO:https://github.com/ONLYOFFICE/onlyoffice-nextcloud/issues/864
--- apps/onlyoffice/appinfo/info.xml
+++ apps/onlyoffice/appinfo/info.xml
@@ -39,7 +39,4 @@
<commands>
<command>OCA\Onlyoffice\Command\DocumentServer</command>
</commands>
- <background-jobs>
- <job>OCA\Onlyoffice\Cron\EditorsCheck</job>
- </background-jobs>
</info>
# Waiting a new relaease of OO:https://github.com/ONLYOFFICE/onlyoffice-nextcloud/issues/864
--- apps/onlyoffice/lib/Controller/JobListController.php
+++ apps/onlyoffice/lib/Controller/JobListController.php
@@ -96,11 +96,7 @@ class JobListController extends Controller {
*
*/
private function checkEditorsCheckJob() {
- if ($this->config->GetEditorsCheckInterval() > 0) {
- $this->addJob(EditorsCheck::class);
- } else {
- $this->removeJob(EditorsCheck::class);
- }
+ $this->removeJob(EditorsCheck::class);
}
/**
base/refresh_config.sh
View file @ 4bd3f37b
......@@ -24,3 +24,4 @@ else
fi
php occ config:app:set mail app.mail.smtp.timeout --value=10
php occ config:app:set onlyoffice cronChecker --value=false
ci/functions
View file @ 4bd3f37b
......@@ -12,7 +12,7 @@ function build_kaniko() {
echo $DESTINATION
echo $BASE_TAG
echo "======"
/kaniko/executor --cache --context ${CONTEXT} ${DESTINATION} --build-arg MARKETTING_VERSION=$MARKETTING_VERSION --build-arg MINOR_VERSION=$MINOR_VERSION --build-arg PATCH_VERSION=$PATCH_VERSION --build-arg BASE_TAG=$BASE_TAG
/kaniko/executor --context ${CONTEXT} ${DESTINATION} --build-arg MARKETTING_VERSION=$MARKETTING_VERSION --build-arg MINOR_VERSION=$MINOR_VERSION --build-arg PATCH_VERSION=$PATCH_VERSION --build-arg BASE_TAG=$BASE_TAG
}
function print_versions() {
......
scripts/nextcloud-apps.py 100644 → 100755
View file @ 4bd3f37b
#!/usr/bin/python3
import argparse,requests,json,tarfile,os
def get_manifest(path):
......@@ -15,8 +17,8 @@ def update_nc(manifest, major=""):
response = requests.get('https://api.github.com/repos/nextcloud/server/releases')
body = response.json()
for version in body:
if (not version["draft"] and not version["prerelease"] and version["name"].startswith("v"+major)):
manifest["version"] = version["name"][1:]
if (not version["draft"] and not version["prerelease"] and version["tag_name"].startswith("v"+major)):
manifest["version"] = version["tag_name"][1:]
break
def update_apps(manifest):
......