Compare commits

..

No commits in common. "4ee1cf73f1c728afb0114cdf47dc8ae0646b5b1e" and "34ff0135d9aa1651f4bf47308bcf92ab6b60241e" have entirely different histories.

4 changed files with 3 additions and 23 deletions

View File

@ -1,8 +0,0 @@
<?php
$CONFIG = array (
'memcache.locking' => '\OC\Memcache\Redis',
'redis' => array(
'host' => 'redis',
'port' => 6379,
),
);

View File

@ -90,13 +90,13 @@ RUN { \
echo 'opcache.revalidate_freq=1'; \ echo 'opcache.revalidate_freq=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
\ \
mkdir /data; \ mkdir /var/www/data; \
chown -R www-data:root /data; \
chown -R www-data:root /var/www; \ chown -R www-data:root /var/www; \
chmod -R g=u /var/www chmod -R g=u /var/www
VOLUME /var/www/html VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 13.0.2 ENV NEXTCLOUD_VERSION 13.0.2
RUN set -ex; \ RUN set -ex; \
@ -118,7 +118,6 @@ RUN set -ex; \
COPY *.sh / COPY *.sh /
COPY config/* /usr/src/nextcloud/config/ COPY config/* /usr/src/nextcloud/config/
#HEALTHCHECK --interval=1s --timeout=3s --retries=16 \
#CMD test $(ps ax | grep php-fpm | grep -v grep | wc -l) -gt 0 && echo okay
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["php-fpm"] CMD ["php-fpm"]

View File

@ -12,9 +12,6 @@ if (getenv('SQLITE_DATABASE')) {
$password = getenv('MYSQL_PASSWORD'); $password = getenv('MYSQL_PASSWORD');
$database = getenv('MYSQL_DATABASE'); $database = getenv('MYSQL_DATABASE');
$host = getenv('MYSQL_HOST'); $host = getenv('MYSQL_HOST');
// Erase root environment variables
putenv('MYSQL_ROOT_USER');
putenv('MYSQL_ROOT_PASSWORD');
// Create connection // Create connection
$connection = new mysqli($host, $root_user, $root_password); $connection = new mysqli($host, $root_user, $root_password);
// Check connection // Check connection

View File

@ -1,8 +0,0 @@
<?php
$CONFIG = array (
'memcache.locking' => '\OC\Memcache\Redis',
'redis' => array(
'host' => 'redis',
'port' => 6379,
),
);