mirror of
https://github.com/nextcloud/docker.git
synced 2025-06-15 15:54:47 +02:00
Merge 47610bb7de
into f4dbcf523a
This commit is contained in:
commit
b3aed6f4cc
22 changed files with 66 additions and 29 deletions
|
@ -13,8 +13,8 @@ RUN set -ex; \
|
|||
; \
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
\
|
||||
mkdir -p /var/spool/cron/crontabs; \
|
||||
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
|
||||
touch /usr/local/etc/php/conf.d/redis-session.ini; \
|
||||
chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
|
||||
|
||||
# install the PHP extensions we need
|
||||
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
|
||||
|
|
|
@ -1,4 +1,7 @@
|
|||
#!/bin/sh
|
||||
set -eu
|
||||
|
||||
exec busybox crond -f -l 0 -L /dev/stdout
|
||||
while [ 1 ]; do
|
||||
(php -f /var/www/html/cron.php &);
|
||||
sleep 5m;
|
||||
done
|
||||
|
|
|
@ -9,7 +9,8 @@ RUN set -ex; \
|
|||
; \
|
||||
\
|
||||
rm /var/spool/cron/crontabs/root; \
|
||||
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
|
||||
touch /usr/local/etc/php/conf.d/redis-session.ini; \
|
||||
chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
|
||||
|
||||
# install the PHP extensions we need
|
||||
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
|
||||
|
|
|
@ -1,4 +1,7 @@
|
|||
#!/bin/sh
|
||||
set -eu
|
||||
|
||||
exec busybox crond -f -l 0 -L /dev/stdout
|
||||
while [ 1 ]; do
|
||||
(php -f /var/www/html/cron.php &);
|
||||
sleep 5m;
|
||||
done
|
||||
|
|
|
@ -13,8 +13,8 @@ RUN set -ex; \
|
|||
; \
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
\
|
||||
mkdir -p /var/spool/cron/crontabs; \
|
||||
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
|
||||
touch /usr/local/etc/php/conf.d/redis-session.ini; \
|
||||
chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
|
||||
|
||||
# install the PHP extensions we need
|
||||
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
|
||||
|
|
|
@ -1,4 +1,7 @@
|
|||
#!/bin/sh
|
||||
set -eu
|
||||
|
||||
exec busybox crond -f -l 0 -L /dev/stdout
|
||||
while [ 1 ]; do
|
||||
(php -f /var/www/html/cron.php &);
|
||||
sleep 5m;
|
||||
done
|
||||
|
|
|
@ -13,8 +13,8 @@ RUN set -ex; \
|
|||
; \
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
\
|
||||
mkdir -p /var/spool/cron/crontabs; \
|
||||
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
|
||||
touch /usr/local/etc/php/conf.d/redis-session.ini; \
|
||||
chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
|
||||
|
||||
# install the PHP extensions we need
|
||||
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
|
||||
|
|
|
@ -1,4 +1,7 @@
|
|||
#!/bin/sh
|
||||
set -eu
|
||||
|
||||
exec busybox crond -f -l 0 -L /dev/stdout
|
||||
while [ 1 ]; do
|
||||
(php -f /var/www/html/cron.php &);
|
||||
sleep 5m;
|
||||
done
|
||||
|
|
|
@ -9,7 +9,8 @@ RUN set -ex; \
|
|||
; \
|
||||
\
|
||||
rm /var/spool/cron/crontabs/root; \
|
||||
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
|
||||
touch /usr/local/etc/php/conf.d/redis-session.ini; \
|
||||
chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
|
||||
|
||||
# install the PHP extensions we need
|
||||
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
|
||||
|
|
|
@ -1,4 +1,7 @@
|
|||
#!/bin/sh
|
||||
set -eu
|
||||
|
||||
exec busybox crond -f -l 0 -L /dev/stdout
|
||||
while [ 1 ]; do
|
||||
(php -f /var/www/html/cron.php &);
|
||||
sleep 5m;
|
||||
done
|
||||
|
|
|
@ -13,8 +13,8 @@ RUN set -ex; \
|
|||
; \
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
\
|
||||
mkdir -p /var/spool/cron/crontabs; \
|
||||
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
|
||||
touch /usr/local/etc/php/conf.d/redis-session.ini; \
|
||||
chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
|
||||
|
||||
# install the PHP extensions we need
|
||||
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
|
||||
|
|
|
@ -1,4 +1,7 @@
|
|||
#!/bin/sh
|
||||
set -eu
|
||||
|
||||
exec busybox crond -f -l 0 -L /dev/stdout
|
||||
while [ 1 ]; do
|
||||
(php -f /var/www/html/cron.php &);
|
||||
sleep 5m;
|
||||
done
|
||||
|
|
|
@ -13,8 +13,8 @@ RUN set -ex; \
|
|||
; \
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
\
|
||||
mkdir -p /var/spool/cron/crontabs; \
|
||||
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
|
||||
touch /usr/local/etc/php/conf.d/redis-session.ini; \
|
||||
chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
|
||||
|
||||
# install the PHP extensions we need
|
||||
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
|
||||
|
|
|
@ -1,4 +1,7 @@
|
|||
#!/bin/sh
|
||||
set -eu
|
||||
|
||||
exec busybox crond -f -l 0 -L /dev/stdout
|
||||
while [ 1 ]; do
|
||||
(php -f /var/www/html/cron.php &);
|
||||
sleep 5m;
|
||||
done
|
||||
|
|
|
@ -9,7 +9,8 @@ RUN set -ex; \
|
|||
; \
|
||||
\
|
||||
rm /var/spool/cron/crontabs/root; \
|
||||
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
|
||||
touch /usr/local/etc/php/conf.d/redis-session.ini; \
|
||||
chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
|
||||
|
||||
# install the PHP extensions we need
|
||||
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
|
||||
|
|
|
@ -1,4 +1,7 @@
|
|||
#!/bin/sh
|
||||
set -eu
|
||||
|
||||
exec busybox crond -f -l 0 -L /dev/stdout
|
||||
while [ 1 ]; do
|
||||
(php -f /var/www/html/cron.php &);
|
||||
sleep 5m;
|
||||
done
|
||||
|
|
|
@ -13,8 +13,8 @@ RUN set -ex; \
|
|||
; \
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
\
|
||||
mkdir -p /var/spool/cron/crontabs; \
|
||||
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
|
||||
touch /usr/local/etc/php/conf.d/redis-session.ini; \
|
||||
chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
|
||||
|
||||
# install the PHP extensions we need
|
||||
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
|
||||
|
|
|
@ -1,4 +1,7 @@
|
|||
#!/bin/sh
|
||||
set -eu
|
||||
|
||||
exec busybox crond -f -l 0 -L /dev/stdout
|
||||
while [ 1 ]; do
|
||||
(php -f /var/www/html/cron.php &);
|
||||
sleep 5m;
|
||||
done
|
||||
|
|
|
@ -8,7 +8,8 @@ RUN set -ex; \
|
|||
; \
|
||||
\
|
||||
rm /var/spool/cron/crontabs/root; \
|
||||
echo '*/%%CRONTAB_INT%% * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
|
||||
touch /usr/local/etc/php/conf.d/redis-session.ini; \
|
||||
chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
|
||||
|
||||
# install the PHP extensions we need
|
||||
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
|
||||
|
|
|
@ -12,8 +12,8 @@ RUN set -ex; \
|
|||
; \
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
\
|
||||
mkdir -p /var/spool/cron/crontabs; \
|
||||
echo '*/%%CRONTAB_INT%% * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
|
||||
touch /usr/local/etc/php/conf.d/redis-session.ini; \
|
||||
chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
|
||||
|
||||
# install the PHP extensions we need
|
||||
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
|
||||
|
|
|
@ -1,4 +1,7 @@
|
|||
#!/bin/sh
|
||||
set -eu
|
||||
|
||||
exec busybox crond -f -l 0 -L /dev/stdout
|
||||
while [ 1 ]; do
|
||||
(php -f /var/www/html/cron.php &);
|
||||
sleep %%CRONTAB_INT%%m;
|
||||
done
|
||||
|
|
|
@ -111,7 +111,6 @@ function create_variant() {
|
|||
s/%%MEMCACHED_VERSION%%/'"${pecl_versions[memcached]}"'/g;
|
||||
s/%%REDIS_VERSION%%/'"${pecl_versions[redis]}"'/g;
|
||||
s/%%IMAGICK_VERSION%%/'"${pecl_versions[imagick]}"'/g;
|
||||
s/%%CRONTAB_INT%%/'"$crontabInt"'/g;
|
||||
' "$dir/Dockerfile"
|
||||
|
||||
case "$phpVersion" in
|
||||
|
@ -132,6 +131,10 @@ function create_variant() {
|
|||
for name in entrypoint cron; do
|
||||
cp "docker-$name.sh" "$dir/$name.sh"
|
||||
done
|
||||
# Replace the variable.
|
||||
sed -ri -e '
|
||||
s/%%CRONTAB_INT%%/'"$crontabInt"'/g;
|
||||
' "$dir/cron.sh"
|
||||
|
||||
# Copy the upgrade.exclude
|
||||
cp upgrade.exclude "$dir/"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue