diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index d1ff752..8af48d4 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -1,4 +1,4 @@ -version: '2' +version: "2" services: traefik: @@ -12,7 +12,7 @@ services: restart: unless-stopped db: - image: mariadb + image: mariadb:10.5-focal command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW restart: unless-stopped volumes: @@ -59,7 +59,7 @@ services: restart: unless-stopped cron: - image: nextcloud:apache + image: nextcloud:22.1-apache restart: unless-stopped volumes: - ./data:/var/www/html diff --git a/nextcloud/nextcloud/Dockerfile b/nextcloud/nextcloud/Dockerfile index 27a10f8..1f47c37 100644 --- a/nextcloud/nextcloud/Dockerfile +++ b/nextcloud/nextcloud/Dockerfile @@ -1,15 +1,15 @@ -FROM nextcloud:apache +FROM nextcloud:22.1-apache RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ - ffmpeg \ - libmagickcore-6.q16-6-extra \ - procps \ - smbclient \ - supervisor \ -# libreoffice \ + ffmpeg \ + libmagickcore-6.q16-6-extra \ + procps \ + smbclient \ + supervisor \ + # libreoffice \ ; \ rm -rf /var/lib/apt/lists/* @@ -19,30 +19,30 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ - libbz2-dev \ - libc-client-dev \ - libkrb5-dev \ - libsmbclient-dev \ + libbz2-dev \ + libc-client-dev \ + libkrb5-dev \ + libsmbclient-dev \ ; \ \ docker-php-ext-configure imap --with-kerberos --with-imap-ssl; \ docker-php-ext-install \ - bz2 \ - imap \ + bz2 \ + imap \ ; \ pecl install smbclient; \ docker-php-ext-enable smbclient; \ \ -# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies + # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark; \ ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ - | awk '/=>/ { print $3 }' \ - | sort -u \ - | xargs -r dpkg-query -S \ - | cut -d: -f1 \ - | sort -u \ - | xargs -rt apt-mark manual; \ + | awk '/=>/ { print $3 }' \ + | sort -u \ + | xargs -r dpkg-query -S \ + | cut -d: -f1 \ + | sort -u \ + | xargs -rt apt-mark manual; \ \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ rm -rf /var/lib/apt/lists/* @@ -50,7 +50,7 @@ RUN set -ex; \ RUN mkdir -p \ /var/log/supervisord \ /var/run/supervisord \ -; + ; COPY supervisord.conf /