develop #10

Merged
glenux merged 13 commits from develop into master 2024-07-08 19:53:31 +00:00
2 changed files with 12 additions and 8 deletions
Showing only changes of commit e509d0eb28 - Show all commits

View file

@ -22,7 +22,8 @@ FROM nextcloud:29.0.0-apache
# This is a stupid comment for a demo (remove later) # This is a stupid comment for a demo (remove later)
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y clamdscan nano ghostscript \ && apt-get install -y --no-install-recommends \
clamdscan nano ghostscript \
&& apt-get clean && apt-get clean
# #
@ -52,21 +53,24 @@ RUN apt-get update \
## GMP Support (for bookmark extension) ## GMP Support (for bookmark extension)
## ##
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y libgmp3-dev \ && apt-get install -y --no-install-recommends \
libgmp3-dev \
&& docker-php-ext-install gmp && docker-php-ext-install gmp
## ##
## BZ2 Support (for nextcloud) ## BZ2 Support (for nextcloud)
## ##
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y libbz2-dev \ && apt-get install -y --no-install-recommends \
libbz2-dev \
&& docker-php-ext-install bz2 && docker-php-ext-install bz2
## ##
## SVG and LibreSign support ## SVG and LibreSign support
## ##
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y libmagickcore-6.q16-6-extra \ && apt-get install -y --no-install-recommends \
libmagickcore-6.q16-6-extra \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN sed -i'' 's|.*<policy domain="coder".*"PDF".*|<policy domain="coder" rights="read \| write" pattern="PDF" />|g' \ RUN sed -i'' 's|.*<policy domain="coder".*"PDF".*|<policy domain="coder" rights="read \| write" pattern="PDF" />|g' \
@ -90,14 +94,14 @@ RUN echo '[opcache]' > /usr/local/etc/php/conf.d/opcache.ini \
RUN echo '*/5 * * * * php -d memory_limit=1024M -f /var/www/html/cron.php' \ RUN echo '*/5 * * * * php -d memory_limit=1024M -f /var/www/html/cron.php' \
> /var/spool/cron/crontabs/www-data > /var/spool/cron/crontabs/www-data
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y --no-install-recommends \
supervisor \ supervisor \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& mkdir /var/log/supervisord /var/run/supervisord && mkdir /var/log/supervisord /var/run/supervisord
COPY supervisord.conf /etc/supervisord.conf COPY supervisord.conf /etc/supervisord.conf
COPY ./app.json /app.json COPY ./app.json /app/app.json
COPY ./postdeploy.sh /dokku/postdeploy.sh COPY ./postdeploy.sh /app/postdeploy.sh
ENV NEXTCLOUD_UPDATE=1 ENV NEXTCLOUD_UPDATE=1

View file

@ -1,7 +1,7 @@
{ {
"scripts": { "scripts": {
"dokku": { "dokku": {
"postdeploy": "su -l -s /bin/sh www-data -c /dokku/postdeploy.sh" "postdeploy": "su -l -s /bin/sh www-data -c /app/postdeploy.sh"
} }
} }
} }