|
|
@ -42,7 +42,7 @@ RUN usermod --uid $FILESUID www-data && \ |
|
|
|
chown -R www-data:www-data /var/www /vol |
|
|
|
|
|
|
|
# copy our custom scripts |
|
|
|
COPY resources/bin/ /usr/local/bin/ |
|
|
|
COPY assets/bin/ /usr/local/bin/ |
|
|
|
|
|
|
|
### |
|
|
|
### Apache |
|
|
@ -52,7 +52,7 @@ COPY resources/bin/ /usr/local/bin/ |
|
|
|
RUN a2enmod rewrite headers env dir mime proxy_fcgi && a2enconf php${phpv}-fpm |
|
|
|
|
|
|
|
# copy site config |
|
|
|
COPY resources/apache/nextcloud.conf /etc/apache2/sites-available/ |
|
|
|
COPY assets/apache/nextcloud.conf /etc/apache2/sites-available/ |
|
|
|
WORKDIR /etc/apache2/sites-enabled |
|
|
|
RUN rm 000-default.conf && ln -s ../sites-available/nextcloud.conf |
|
|
|
|
|
|
@ -64,15 +64,15 @@ RUN rm 000-default.conf && ln -s ../sites-available/nextcloud.conf |
|
|
|
RUN systemctl enable php${phpv}-fpm |
|
|
|
|
|
|
|
# copy php configuration |
|
|
|
COPY resources/php/php.ini /etc/php/${phpv}/fpm/ |
|
|
|
COPY resources/php/www.conf /etc/php/${phpv}/fpm/pool.d/ |
|
|
|
COPY assets/php/php.ini /etc/php/${phpv}/fpm/ |
|
|
|
COPY assets/php/www.conf /etc/php/${phpv}/fpm/pool.d/ |
|
|
|
|
|
|
|
### |
|
|
|
### Redis |
|
|
|
### |
|
|
|
|
|
|
|
# copy redis config |
|
|
|
COPY --chown=redis:redis resources/redis.conf /etc/redis/redis.conf |
|
|
|
COPY --chown=redis:redis assets/redis.conf /etc/redis/redis.conf |
|
|
|
|
|
|
|
# add www-data to redis group so it can use the socket |
|
|
|
RUN usermod -a -G redis www-data |
|
|
@ -82,7 +82,7 @@ RUN usermod -a -G redis www-data |
|
|
|
### |
|
|
|
|
|
|
|
# configure PostgreSQL access |
|
|
|
COPY --chown=postgres:postgres resources/pg_hba.conf /etc/postgresql/${psqlv}/main/pg_hba.conf |
|
|
|
COPY --chown=postgres:postgres assets/pg_hba.conf /etc/postgresql/${psqlv}/main/pg_hba.conf |
|
|
|
|
|
|
|
### |
|
|
|
### Nextcloud |
|
|
@ -97,12 +97,12 @@ RUN wget https://download.nextcloud.com/server/releases/latest.zip && \ |
|
|
|
rm latest.zip |
|
|
|
|
|
|
|
# copy nextcloud config |
|
|
|
COPY --chown=www-data:www-data resources/my.config.php nextcloud/config/ |
|
|
|
COPY --chown=www-data:www-data assets/my.config.php nextcloud/config/ |
|
|
|
|
|
|
|
### |
|
|
|
### Crontab |
|
|
|
### |
|
|
|
COPY resources/crontab /root/ |
|
|
|
COPY assets/crontab /root/ |
|
|
|
# crontab for www-data |
|
|
|
RUN crontab -u www-data /root/crontab |
|
|
|
|
|
|
|