diff --git a/Dockerfile b/Dockerfile index c6b0b266..9a9dbea9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -63,11 +63,18 @@ WORKDIR /var/www RUN curl -o grav-admin.zip -SL https://getgrav.org/download/core/grav-admin/${GRAV_VERSION} && \ unzip grav-admin.zip && \ mv -T /var/www/grav-admin /var/www/html && \ - rm grav-admin.zip + rm grav-admin.zip && \ + rm -rf /var/www/html/user/plugins # Create cron job for Grav maintenance scripts RUN (crontab -l; echo "* * * * * cd /var/www/html;/usr/local/bin/php bin/grav scheduler 1>> /dev/null 2>&1") | crontab - +# Copy base theme +RUN git clone --depth 1 https://github.com/getgrav/grav-theme-learn4 /var/www/html/user/themes/learn4 + +# Copy plugins +RUN git clone --depth 1 https://github.com/YunoHost/doc-dev /var/www/html/user/plugins + # Return to root user USER root @@ -75,7 +82,7 @@ USER root # COPY docker-entrypoint.sh /entrypoint.sh # provide container inside image for data persistence -VOLUME ["/var/www/html/backup", "/var/www/html/logs", "/var/www/html/user/themes", "/var/www/html/user/pages", "/var/www/html/user/config", "/var/www/html/user/images"] +VOLUME ["/var/www/html/backup", "/var/www/html/user/themes/yunohost-docs", "/var/www/html/logs", "/var/www/html/user/pages", "/var/www/html/user/config", "/var/www/html/user/images"] # ENTRYPOINT ["/entrypoint.sh"] # CMD ["apache2-foreground"] diff --git a/docker-compose.yml b/docker-compose.yml index dc58e4d6..a7c1a06c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,8 +5,7 @@ services: ports: - 8000:80 volumes: - - ./themes:/var/www/html/user/themes + - ./themes/yunohost-docs:/var/www/html/user/themes/yunohost-docs - ./config:/var/www/html/user/config - ./pages:/var/www/html/user/pages - - ./images:/var/www/html/user/images - - ./dev/plugins:/var/www/html/user/plugins + - ./images:/var/www/html/user/images \ No newline at end of file