diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2021-11-10 14:10:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-10 14:10:05 +0300 |
| commit | b00bfdbbb80c6f4fd2db74809c971bf5deb4cdd6 (patch) | |
| tree | 6a089fd11d40286d80cdbc1de9786489eca7a07a | |
| parent | 5754ce6fabc66a5b914ce521353064bc4192944f (diff) | |
| parent | 10f37edc0263aef3ce028abdc4ebadd6e0ef9ecf (diff) | |
Merge pull request #153 from nextcloud/prepare-21.0.5
bump to 21.0.5
| -rw-r--r-- | Dockerfile | 9 | ||||
| -rw-r--r-- | Makefile | 3 |
2 files changed, 7 insertions, 5 deletions
@@ -22,9 +22,9 @@ FROM ubuntu:20.04 -ADD https://download.nextcloud.com/server/releases/nextcloud-21.0.4.tar.bz2 /root/nextcloud.tar.bz2 -ADD https://github.com/nextcloud-releases/richdocuments/releases/download/v4.2.1/richdocuments.tar.gz /root/richdocuments.tar.gz -ADD https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v7.1.2/onlyoffice.tar.gz /root/onlyoffice.tar.gz +ADD https://download.nextcloud.com/server/releases/nextcloud-21.0.5.tar.bz2 /root/nextcloud.tar.bz2 +ADD https://github.com/nextcloud-releases/richdocuments/releases/download/v4.2.3/richdocuments.tar.gz /root/richdocuments.tar.gz +ADD https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v7.2.0/onlyoffice.tar.gz /root/onlyoffice.tar.gz COPY resources/entrypoint.sh /usr/sbin/ COPY resources/60-nextcloud.ini /etc/php/7.4/apache2/conf.d/ COPY resources/60-nextcloud.ini /etc/php/7.4/cli/conf.d/ @@ -64,8 +64,9 @@ RUN /bin/bash -c "export DEBIAN_FRONTEND=noninteractive" && \ pwgen \ sudo \ lbzip2 \ - unattended-upgrades \ + libmagickcore-6.q16-6-extra \ libsmbclient-dev \ + unattended-upgrades \ unzip RUN wget -O /tmp/libsmbclient-php.zip https://github.com/eduardok/libsmbclient-php/archive/master.zip && \ @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. app_name=nextcloud -app_version=21.0.4-0 +app_version=21.0.5-0 app_upgrade_from=20.0.10-0 ucs_version=4.4 @@ -39,6 +39,7 @@ add-version: .PHONY: push-files push-files: univention-appcenter-control upload --noninteractive $(ucs_version)/$(app_name)=$(app_version) \ + attributes \ env \ restore_data_before_setup \ setup \ |