diff --git a/dd-apps/docker/nextcloud/Dockerfile b/dd-apps/docker/nextcloud/Dockerfile index dbdf86a..4dfe480 100644 --- a/dd-apps/docker/nextcloud/Dockerfile +++ b/dd-apps/docker/nextcloud/Dockerfile @@ -42,6 +42,14 @@ RUN set -ex; \ composer \ ; +RUN apk update +RUN apk add bash +RUN apk add curl + +# INSTALL COMPOSER +RUN curl -s https://getcomposer.org/installer | php +RUN alias composer='php composer.phar' + RUN set -ex; \ \ apk add --no-cache --virtual .build-deps \ @@ -82,9 +90,10 @@ COPY saml.sh / COPY template.docx / ## Save current forms plugin hash -#RUN sh -c 'curl -sL https://api.github.com/repos/3iPunt/nextcloud_forms/commits/STABLE_25 | jq -r .sha > /forms.hash' +RUN sh -c 'curl -sL https://api.github.com/repos/3iPunt/nextcloud_forms/commits/STABLE_25 | jq -r .sha > /forms.hash' ## And current forms code -#RUN sh -c 'curl -sL "https://github.com/3iPunt/nextcloud_forms/archive/$(cat /forms.hash).zip" > /forms.zip' +RUN sh -c 'curl -sL "https://github.com/3iPunt/nextcloud_forms/archive/$(cat /forms.hash).zip" > /forms.zip' + # Setup cron as documented in: # https://github.com/nextcloud/docker/blob/master/.examples/dockerfiles/cron/fpm-alpine/Dockerfile diff --git a/dd-apps/docker/nextcloud/nextcloud.yml b/dd-apps/docker/nextcloud/nextcloud.yml index 6483e2e..5206903 100644 --- a/dd-apps/docker/nextcloud/nextcloud.yml +++ b/dd-apps/docker/nextcloud/nextcloud.yml @@ -29,7 +29,6 @@ services: - IMG=${NEXTCLOUD_IMG_OVERRIDE-nextcloud:25.0.5-fpm-alpine} container_name: dd-apps-nextcloud-app image: registry.dd-work.space/dd/apps-nextcloud:${DD_BUILD:-latest} - #image: registry.dd-work.space/dd/apps-nextcloud:bdffd5a7 restart: unless-stopped depends_on: - dd-apps-postgresql @@ -41,7 +40,7 @@ services: # Making these dirs explicit so we can segregate them easier in the future #- ${SRC_FOLDER}/nextcloud/custom_apps:/var/www/html/custom_apps #- ${SRC_FOLDER}/nextcloud/config:/var/www/html/config - - ${DATA_FOLDER}/nextcloud:/var/www/html/data:ro + - ${DATA_FOLDER}/nextcloud:/var/www/html/data:rw - ${BUILD_APPS_ROOT_PATH}/docker/nextcloud/src/themes/dd:/var/www/html/themes/dd:ro # We need this to configure the custom logos and background