diff --git a/Makefile b/Makefile index a3d1572..3cf0b20 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ USER_EMAIL ?= ${USER_NAME}@${DCAPE_DOMAIN} IMAGE ?= nextcloud #- docker image version from dcape -IMAGE_VER ?= 29-fpm-alpine +IMAGE_VER ?= 30-fpm-alpine #- Redis container image version REDIS_IMAGE_VER ?= 7.2-alpine @@ -48,7 +48,7 @@ REDIS_PASS ?= $(shell < /dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head OO_IMAGE ?= onlyoffice/documentserver #- OnlyOffice image version -OO_IMAGE_VER ?= 8.1 +OO_IMAGE_VER ?= 8.2 #- OnlyOffice database OO_PGDATABASE ?= onlyoffice @@ -90,9 +90,13 @@ setup: chown -R 82:82 ${APP_ROOT}/html ${APP_ROOT}/config ${APP_ROOT}/data ; \ $(MAKE) -s db-create db-create-oo -## Execute OCC command inside app container (php occ $OCC_CMD) +## Execute OCC command inside nextcloud container (php occ $OCC_CMD) exec-occ: - $(MAKE) -s dc CMD='exec -ti -u www-data app php /var/www/html/occ ${OCC_CMD}' + $(MAKE) -s dc CMD='exec -ti -u www-data nextcloud php /var/www/html/occ ${OCC_CMD}' + +## Execute cron command inside nextcloud container (php cron.php) +exec-cron: + $(MAKE) -s dc CMD='exec -ti -u www-data anextcloudpp php cron.php' ## Create OnlyOffice database db-create-oo: diff --git a/README.md b/README.md index e68403a..8c9b65e 100644 --- a/README.md +++ b/README.md @@ -49,10 +49,16 @@ make up ## Using for operations/console For OCC commands inside nextcloud container example: -``` +```shell make exec-occ OCC_CMD='config:system:set default_phone_region --value=RU' ``` +For run cron jobs inside nextcloud container example: +```shell +make exec-cron' +``` + + ## License Copyright 2023 Aleksei Kovrizhkin , Andrey Pazychev diff --git a/docker-compose.yml b/docker-compose.yml index deb24bf..a24bc3b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,18 +1,13 @@ services: - front: + app: image: ${NGINX_IMAGE}:${NGINX_IMAGE_VER} depends_on: - - app + - nextcloud restart: always labels: - - traefik.enable=true - - dcape.traefik.tag=${DCAPE_TAG} - - traefik.http.routers.${APP_TAG}-front.rule=Host(`${APP_SITE:?Must be set}`) - - traefik.http.routers.${APP_TAG}-front.tls=${USE_TLS} - - traefik.http.routers.${APP_TAG}-front.tls.certresolver=letsEncrypt # hsts middleware defined in DCAPE/apps/traefik/docker-compose.inc.yml - - traefik.http.routers.${APP_TAG}-front.middlewares=hsts + - traefik.http.routers.${APP_TAG}.middlewares=hsts volumes: - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro @@ -20,9 +15,9 @@ services: - ${APP_ROOT}/data:${DATA_DIR}:ro - ${APP_ROOT}/etc/nginx/default.conf:/etc/nginx/conf.d/default.conf:ro - app: + nextcloud: image: ${IMAGE}:${IMAGE_VER} - hostname: ${APP_TAG}-app + hostname: ${APP_TAG}-nextcloud restart: always depends_on: - cache @@ -35,6 +30,7 @@ services: - ${APP_ROOT}/data:${DATA_DIR} - ${APP_ROOT}/config:/var/www/html/config - ${APP_ROOT}/etc/php-fpm.d/zz-docker.conf:/usr/local/etc/php-fpm.d/zz-docker.conf:ro + - ${APP_ROOT}/etc/php/opcache-recommended.ini:/usr/local/etc/php/conf.d/opcache-recommended.ini:ro environment: - POSTGRES_DB=${PGDATABASE} - POSTGRES_USER=${PGUSER}