fix the version for nextcloud and mariadb

This commit is contained in:
Andreas Zweili 2021-11-15 16:17:07 +01:00
parent 3275c3c821
commit ad7b14e05b
2 changed files with 24 additions and 24 deletions

View File

@ -1,4 +1,4 @@
version: '2' version: "2"
services: services:
traefik: traefik:
@ -12,7 +12,7 @@ services:
restart: unless-stopped restart: unless-stopped
db: db:
image: mariadb image: mariadb:10.5-focal
command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
restart: unless-stopped restart: unless-stopped
volumes: volumes:
@ -59,7 +59,7 @@ services:
restart: unless-stopped restart: unless-stopped
cron: cron:
image: nextcloud:apache image: nextcloud:22.1-apache
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- ./data:/var/www/html - ./data:/var/www/html

View File

@ -1,15 +1,15 @@
FROM nextcloud:apache FROM nextcloud:22.1-apache
RUN set -ex; \ RUN set -ex; \
\ \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
ffmpeg \ ffmpeg \
libmagickcore-6.q16-6-extra \ libmagickcore-6.q16-6-extra \
procps \ procps \
smbclient \ smbclient \
supervisor \ supervisor \
# libreoffice \ # libreoffice \
; \ ; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
@ -19,30 +19,30 @@ RUN set -ex; \
\ \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
libbz2-dev \ libbz2-dev \
libc-client-dev \ libc-client-dev \
libkrb5-dev \ libkrb5-dev \
libsmbclient-dev \ libsmbclient-dev \
; \ ; \
\ \
docker-php-ext-configure imap --with-kerberos --with-imap-ssl; \ docker-php-ext-configure imap --with-kerberos --with-imap-ssl; \
docker-php-ext-install \ docker-php-ext-install \
bz2 \ bz2 \
imap \ imap \
; \ ; \
pecl install smbclient; \ pecl install smbclient; \
docker-php-ext-enable 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 auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \ apt-mark manual $savedAptMark; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
| awk '/=>/ { print $3 }' \ | awk '/=>/ { print $3 }' \
| sort -u \ | sort -u \
| xargs -r dpkg-query -S \ | xargs -r dpkg-query -S \
| cut -d: -f1 \ | cut -d: -f1 \
| sort -u \ | sort -u \
| xargs -rt apt-mark manual; \ | xargs -rt apt-mark manual; \
\ \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
@ -50,7 +50,7 @@ RUN set -ex; \
RUN mkdir -p \ RUN mkdir -p \
/var/log/supervisord \ /var/log/supervisord \
/var/run/supervisord \ /var/run/supervisord \
; ;
COPY supervisord.conf / COPY supervisord.conf /