diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 195e4c0c05b803bf6c0db17c4dbb06cafe2e2c08..6816c929b3561f7c3b32d8849c11783e1d3438b0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -100,7 +100,7 @@ test-helm-chart:
stage: test-helm-chart
script:
- cd ${CHART_DIR:-"."}
- - helm test -n nc$CI_MERGE_REQUEST_IID --logs "nc$CI_MERGE_REQUEST_IID"
+ - helm test -n nc$CI_MERGE_REQUEST_IID --logs "nc$CI_MERGE_REQUEST_IID" --timeout 10m
extends:
- .use_kubernetes
- .chart_changes_rules
diff --git a/.helmignore b/.helmignore
index 941be0f9c3828f7c637bb4e48d46af847069810d..bb24c23d0366a66cd8707457a9886f98f1622677 100644
--- a/.helmignore
+++ b/.helmignore
@@ -25,3 +25,4 @@ Screenshot*
CHANGELOG.md
LICENSE
renovate.json
+node_modules
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a801a81d664c072f0ab34b4f6b709176ef557da8..b077f92aadb061516861fe8a711e2f0fae0e95ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
# Changelog
+## [0.12.0] - 2022-09-21
+
+* Allow installing apps from GitHub releases
+* Allow pinning the versions for apps installed from GitHub releases
+
## [0.11.0] - 2022-09-15
* Disable OnlyOffice CPU-heavy tasks on startup (#1069)
diff --git a/Chart.yaml b/Chart.yaml
index 03917eb249d93a7447fa82a7afa46f5dc900ca5f..d8c78d5240631fb2480ed78e5c2f6c4b19b483ba 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -3,8 +3,8 @@ apiVersion: v2
description: |
A helm chart for installing NextCloud and setting up ONLYOFFICE integration
name: nextcloud-onlyoffice
-version: 0.11.3
-appVersion: NC-24.0.2-OO-7.1.1.23
+version: 0.12.0
+appVersion: NC-24.0.5-OO-7.2.0.204
icon: https://cdn.rawgit.com/docker-library/docs/defa5ffc7123177acd60ddef6e16bddf694cc35f/nextcloud/logo.svg
dependencies:
# https://artifacthub.io/packages/helm/nextcloud/nextcloud
diff --git a/README.md b/README.md
index 7ac0d1d53839274e49a3eff6bfcc5598593ea59d..4e3eab87df84e2e5a4f18bc7179f9835f4a929ae 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,9 @@ possible to specify which applications from the app store are available for
installation. It is also possible to enable them by default. Apps that are not
enabled by default can be enabled through the Apps screen in Nextcloud.
+Apps that are installed this way are automatically updated to their newest
+version every time Nextcloud is updated.
+
To install apps, edit the values.yaml file:
```yaml
@@ -67,6 +70,27 @@ apps:
enabled: false # Disables sociallogin by default
```
+Additionally, we have added an option to install Apps immediately from GitHub
+releases. The benefit of this, compared to installing them with `occ`, is that
+we can pin the versions to specific GitHub releases. To install an app from
+GitHub releases:
+
+```yaml
+apps:
+ - name: onlyoffice
+ # The name of the repository. This is the name for a repository located at
+ # https://github.com/ONLYOFFICE/onlyoffice-nextcloud:
+ github_repository: ONLYOFFICE/onlyoffice-nextcloud
+ # The version to install or upgrade the app to
+ version: 7.5.4
+ # The name of the "asset" to download from this release. This name can be
+ # found on https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases
+ release_filename: onlyoffice.tar.gz
+ # Enable the app after installing it
+ enabled: true
+```
+
+
## Values
The included `values.yaml` file configures Nextcloud to use a Mariadb database,
diff --git a/cypress/e2e/test-nextcloud.cy.js b/cypress/e2e/test-nextcloud.cy.js
index 69dd7bf008a763d9e26ed8d050eda52ecab74120..7104ff4fb2dfc3f48548656aedcac3cc15748c3b 100644
--- a/cypress/e2e/test-nextcloud.cy.js
+++ b/cypress/e2e/test-nextcloud.cy.js
@@ -59,7 +59,7 @@ describe('Test nextcloud', () => {
cy.iframe('#onlyofficeFrame').within(() => {
cy.frameLoaded('[name="frameEditor"]')
cy.iframe('[name="frameEditor"]').within(() => {
- cy.get('#id-toolbar-btn-italic').should('be.visible').click()
+ cy.get('#id-toolbar-btn-italic').should('be.visible').click({timeout: 60000})
cy.get('#id_main').click().type('Hi from Cypress!')
})
})
diff --git a/renovate.json b/renovate.json
index f58279359441fcd09e57384d487a88b096e2d397..f5a7464785396920c19b2e10ffa93d05857cbc52 100644
--- a/renovate.json
+++ b/renovate.json
@@ -2,5 +2,16 @@
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"local>stackspin/renovate-config"
+ ],
+ "regexManagers": [
+ {
+ "fileMatch": [
+ "(^|/)values\\.yaml*$"
+ ],
+ "matchStrings": [
+ "github_repository: (?<depName>.*)\n*version: (?<currentValue>.*)"
+ ],
+ "datasourceTemplate": "github-releases"
+ }
]
}
diff --git a/templates/nextcloud-onlyoffice-config.yaml b/templates/nextcloud-onlyoffice-config.yaml
index 88a6a3d78aae0db3f0d4a3d7ebaf3fa057c8a74f..7ef74475ee5b1b6614fc8c08d88a91530255b729 100644
--- a/templates/nextcloud-onlyoffice-config.yaml
+++ b/templates/nextcloud-onlyoffice-config.yaml
@@ -31,11 +31,14 @@ data:
#
# This script gets executed by a post-install,post-upgrade helm hook, which
#
- # * Persists and loads the onlyoffice-config.json config file
- # * Runs upgrade routines after installation of a new release.
- # * Updates all applications
# * Installs all apps declared in the `apps` helm values array
+ # * Installs all apps
+ # * Updates pinned apps if their pinned version has changed
+ # * Always updates unpinned apps to their newest version
+ # * Runs upgrade routines after installation of a new release or new
+ # pinned apps.
# * Configures single-sign-on
+ # * Persists and loads the onlyoffice-config.json config file
# * Updates database indices, columns, keys, etc needed after NC upgrade
set -ev
@@ -49,24 +52,57 @@ data:
# Enable app store so we can run `install` and `enable` commands
php $occ config:system:set appstoreenabled --type boolean --value true
- # Update all apps to their latest version, so they are compatible
- # with the new NC version.
- # Unfortunatly the occ app:install cmd doesn't allow to pin apps to
- # a certain version.
- php $occ app:update --all --no-interaction
+ app_versions=$(php occ app:list --output json)
# Install all apps declared in the `apps` helm values array
{{- range .Values.apps }}
- # -- Begin {{ .name }}
- # Only install {{ .name }} if it's not installed already
+ {{- if not .name }}
+ echo "Skipping app {{ . }} without name variable set"
+ {{- else if and .github_repository .version .release_filename }}
+ # Apps with a pinned version number are downloaded from GitHub so we can
+ # update the pin with Renovatebot
+
+ if [[ $app_versions =~ '"{{ .name }}":"{{ .version }}"' ]]
+ then
+ echo "App {{ .name }} is up-to-date at version {{ .version }}"
+ else
+ echo "No match in ${app_versions} for \"{{ .name }}\":\"{{ .version }}\","
+ echo "Installing app {{ .github_repository }} version '{{ .version }}'"
+ # Where to install the app
+ target_directory="/var/www/html/custom_apps"
+ # We need to edit $ to be able to use `tpl` inside a `range`,
+ # see https://github.com/helm/helm/issues/5979#issuecomment-518231758
+ # allows us to use version variable in the release_filename
+ {{- $_ := set $ "version" .version}}
+ curl "https://github.com/{{ .github_repository }}/releases/download/v{{ .version }}/{{ tpl .release_filename $ }}" -Lo "{{ .name }}.tar.gz"
+ # Remove old version of the app
+ if [[ -d "$target_directory/{{ .name }}" ]]
+ then
+ rm -r "$target_directory/{{ .name }}"
+ fi
+ # Extract app into target directory. The app tars usually contain a folder
+ # named after the app name
+ tar -xf "{{ .name }}.tar.gz" -C "$target_directory"
+ rm "{{ .name }}.tar.gz"
+ fi
+ {{- else }}
+ # Unpinned app
if ! php $occ app:list | grep -q {{ .name }}; then
php $occ app:install {{ .name }} --keep-disabled --no-interaction
+ else
+ # Update the app to its latest version
+ php $occ app:update {{ .name }} --no-interaction
fi
+ {{ end }} # end if and .github_repository .version
{{- if .enabled }}
# Enable {{ .name }} app
php $occ app:enable {{ .name }}
- {{ end }} # -- end {{ .name }}
- {{ end }} # end range {{ .Values.apps }}
+ {{ end }} # end if .enabled
+ {{ end }} # end range .Values.apps
+
+ # Some of the manually installed apps might need to run upgrade scripts, run
+ # them now
+ php $occ upgrade
# Config settings from the configmap above
php $occ config:import /var/local/onlyoffice-config.json
diff --git a/values-local.yaml.example b/values-local.yaml.example
index 2f3a8487bba3e58f06bf9cfc1818ca9b54ff716f..ff9c7cdda77ec0fbd035e23aea0a3ff42f701264 100644
--- a/values-local.yaml.example
+++ b/values-local.yaml.example
@@ -69,6 +69,16 @@ rabbitmq:
# enabled: false
# - name: onlyoffice
# enabled: true
+# - name: polls
+# # Install an app from a github repository. This has the advantage that you
+# # can pin the version number, so it does not get auto-updated to breaking
+# # versions.
+# # Note: you can use the version number in the release_filename variable if
+# # needed, as written here:
+# github_repository: nextcloud/polls
+# version: 3.8.1
+# release_filename: polls-{{ .version }}.tar.gz
+# enabled: true
# sociallogin enables login via oAuth/Open-ID Connect
# sociallogin:
diff --git a/values.yaml b/values.yaml
index 9f8826281932b2596c0eccc289fe09efec9b72f4..3e23d1fa9c2ba88b6f8bceac3bf434fba4b76e1f 100644
--- a/values.yaml
+++ b/values.yaml
@@ -30,11 +30,21 @@ nextcloud:
failureThreshold: 60
apps:
- # OIDC consumer
- name: sociallogin
- enabled: true
- # List of applications that are installed *and enabled*
+ # apps[0].enabled needs to be set to true if you want to enable login via an external
+ # oauth server. In that case you need to configure all the values in `sociallogin`
+ enabled: false
+ # Line order is important here for renovatebot! first github_repository,
+ # then version
+ github_repository: zorn-v/nextcloud-social-login
+ version: 4.17.1
+ release_filename: release.tar.gz
- name: onlyoffice
+ # Line order is important here for renovatebot! first github_repository,
+ # then version
+ github_repository: ONLYOFFICE/onlyoffice-nextcloud
+ version: 7.5.4
+ release_filename: onlyoffice.tar.gz
enabled: true
setupApps: