diff --git a/Makefile b/Makefile index 77ec835..75c2d25 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,9 @@ add-plugins: docker exec -ti isard-apps-nextcloud-app /bin/sh -c "su - www-data -s /bin/sh -c 'PHP_MEMORY_LIMIT=512M php /var/www/html/occ app:install user_saml'" docker exec -ti isard-apps-nextcloud-app /bin/sh -c "su - www-data -s /bin/sh -c 'PHP_MEMORY_LIMIT=512M php /var/www/html/occ app:enable user_saml'" docker exec -ti isard-apps-nextcloud-app /bin/sh -c "su - www-data -s /bin/sh -c 'PHP_MEMORY_LIMIT=512M php /var/www/html/occ app:install ownpad'" - docker exec -ti isard-apps-nextcloud-app /bin/sh -c "/ownpad_cfg.sh" + docker exec isard-apps-nextcloud-app apk add jq + docker exec isard-apps-nextcloud-app sh -c 'jq ". + {\"pad\": [\"application/x-ownpad\"], \"calc\": [\"application/x-ownpad\"]}" /var/www/html/resources/config/mimetypemapping.dist.json > /var/www/html/config/mimetypemapping.json' + docker exec -u www-data isard-apps-nextcloud-app sh -c 'PHP_MEMORY_LIMIT=512M php /var/www/html/occ files:scan --all' docker exec -ti isard-apps-nextcloud-app /bin/sh -c "su - www-data -s /bin/sh -c 'PHP_MEMORY_LIMIT=512M php /var/www/html/occ app:enable ownpad'" diff --git a/docker/nextcloud/Dockerfile b/docker/nextcloud/Dockerfile index d7e1747..cbbc06d 100644 --- a/docker/nextcloud/Dockerfile +++ b/docker/nextcloud/Dockerfile @@ -47,7 +47,6 @@ RUN mkdir -p \ COPY supervisord.conf / -COPY ownpad_cfg.sh / ENV NEXTCLOUD_UPDATE=1 CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"] \ No newline at end of file diff --git a/docker/nextcloud/ownpad_cfg.sh b/docker/nextcloud/ownpad_cfg.sh deleted file mode 100755 index e04f6ab..0000000 --- a/docker/nextcloud/ownpad_cfg.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -cp /var/www/html/resources/config/mimetypemapping.dist.json /var/www/html/config/mimetypemapping.json -sed -i '$d' /var/www/html/config/mimetypemapping.json -sed -i '${s/$/,/}' /var/www/html/config/mimetypemapping.json -echo $'\t"pad": ["application/x-ownpad"],\n\t"calc": ["application/x-ownpad"]\n}' >> /var/www/html/config/mimetypemapping.json -su - www-data -s /bin/sh -c 'PHP_MEMORY_LIMIT=512M php /var/www/html/occ files:scan --all' \ No newline at end of file