Merge nc volumes

This commit is contained in:
Hattshire 2023-10-05 06:34:56 +00:00
parent c084dd2a19
commit de973f6600
2 changed files with 5 additions and 9 deletions

View file

@ -4,12 +4,9 @@ volumes:
#SSL #SSL
certs: certs:
acme: acme:
# vhost.d:
html: html:
#NextCloud #NextCloud
nc-data: nc-data:
nc-userdata:
nc-apps:
db-data: db-data:
networks: networks:
@ -24,8 +21,6 @@ services:
- 80 - 80
volumes: volumes:
- nc-data:/var/www/html - nc-data:/var/www/html
- nc-userdata:/var/www/html/data
- nc-apps:/var/www/html/apps
environment: environment:
- VIRTUAL_HOST=palta.cyou - VIRTUAL_HOST=palta.cyou
- LETSENCRYPT_HOST=palta.cyou - LETSENCRYPT_HOST=palta.cyou
@ -60,13 +55,15 @@ services:
restart: always restart: always
volumes: volumes:
- nc-data:/var/www/html - nc-data:/var/www/html
- nc-userdata:/var/www/html/data
- nc-apps:/var/www/html/apps
entrypoint: /cron.sh entrypoint: /cron.sh
depends_on: depends_on:
- db - db
- redis - redis
# nextcloud-front:
# build: ./images/ngx
# restart: always
# =========== SSL # =========== SSL
reverse_proxy: reverse_proxy:
@ -103,7 +100,6 @@ services:
- DEFAULT_EMAIL=admin@uwu.email - DEFAULT_EMAIL=admin@uwu.email
db: db:
# container_name: db
image: postgres:14-alpine image: postgres:14-alpine
restart: always restart: always
ports: ports:

View file

@ -1,5 +1,5 @@
FROM nextcloud:25.0 FROM nextcloud:25.0
RUN echo "*/5 * * * * php -f /var/www/nextcloud/occ preview:pre-generate">> /var/spool/cron/crontabs/www-data RUN echo "*/5 * * * * php -f /var/www/nextcloud/occ preview:pre-generate">> /var/spool/cron/crontabs/www-data
RUN apt-get update && apt-get install -y ffmpeg imagemagick \ RUN apt-get update && apt-get install --no-install-recommends -y ffmpeg imagemagick && apt remove gcc -y && apt autoremove -y \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*