aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-06-16 08:14:46 +02:00
Code Activity

Merge 47610bb7de into f4dbcf523a

Browse source
This commit is contained in:
Roland Vet 2021-11-26 23:47:22 +01:00 • committed by GitHub
commit b3aed6f4cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 66 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
20/apache/Dockerfile
View file

@ -13,8 +13,8 @@ RUN set -ex; \
; \ ; \
rm -rf /var/lib/apt/lists/*; \ rm -rf /var/lib/apt/lists/*; \
\ \
mkdir -p /var/spool/cron/crontabs; \ touch /usr/local/etc/php/conf.d/redis-session.ini; \
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
# install the PHP extensions we need # install the PHP extensions we need
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html

5
20/apache/cron.sh
View file

@ -1,4 +1,7 @@
#!/bin/sh #!/bin/sh
set -eu set -eu
exec busybox crond -f -l 0 -L /dev/stdout while [ 1 ]; do
(php -f /var/www/html/cron.php &);
sleep 5m;
done

3
20/fpm-alpine/Dockerfile
View file

@ -9,7 +9,8 @@ RUN set -ex; \
; \ ; \
\ \
rm /var/spool/cron/crontabs/root; \ 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 # install the PHP extensions we need
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html

5
20/fpm-alpine/cron.sh
View file

@ -1,4 +1,7 @@
#!/bin/sh #!/bin/sh
set -eu set -eu
exec busybox crond -f -l 0 -L /dev/stdout while [ 1 ]; do
(php -f /var/www/html/cron.php &);
sleep 5m;
done

4
20/fpm/Dockerfile
View file

@ -13,8 +13,8 @@ RUN set -ex; \
; \ ; \
rm -rf /var/lib/apt/lists/*; \ rm -rf /var/lib/apt/lists/*; \
\ \
mkdir -p /var/spool/cron/crontabs; \ touch /usr/local/etc/php/conf.d/redis-session.ini; \
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
# install the PHP extensions we need # install the PHP extensions we need
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html

5
20/fpm/cron.sh
View file

@ -1,4 +1,7 @@
#!/bin/sh #!/bin/sh
set -eu set -eu
exec busybox crond -f -l 0 -L /dev/stdout while [ 1 ]; do
(php -f /var/www/html/cron.php &);
sleep 5m;
done

4
21/apache/Dockerfile
View file

@ -13,8 +13,8 @@ RUN set -ex; \
; \ ; \
rm -rf /var/lib/apt/lists/*; \ rm -rf /var/lib/apt/lists/*; \
\ \
mkdir -p /var/spool/cron/crontabs; \ touch /usr/local/etc/php/conf.d/redis-session.ini; \
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
# install the PHP extensions we need # install the PHP extensions we need
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html

5
21/apache/cron.sh
View file

@ -1,4 +1,7 @@
#!/bin/sh #!/bin/sh
set -eu set -eu
exec busybox crond -f -l 0 -L /dev/stdout while [ 1 ]; do
(php -f /var/www/html/cron.php &);
sleep 5m;
done

3
21/fpm-alpine/Dockerfile
View file

@ -9,7 +9,8 @@ RUN set -ex; \
; \ ; \
\ \
rm /var/spool/cron/crontabs/root; \ 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 # install the PHP extensions we need
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html

5
21/fpm-alpine/cron.sh
View file

@ -1,4 +1,7 @@
#!/bin/sh #!/bin/sh
set -eu set -eu
exec busybox crond -f -l 0 -L /dev/stdout while [ 1 ]; do
(php -f /var/www/html/cron.php &);
sleep 5m;
done

4
21/fpm/Dockerfile
View file

@ -13,8 +13,8 @@ RUN set -ex; \
; \ ; \
rm -rf /var/lib/apt/lists/*; \ rm -rf /var/lib/apt/lists/*; \
\ \
mkdir -p /var/spool/cron/crontabs; \ touch /usr/local/etc/php/conf.d/redis-session.ini; \
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
# install the PHP extensions we need # install the PHP extensions we need
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html

5
21/fpm/cron.sh
View file

@ -1,4 +1,7 @@
#!/bin/sh #!/bin/sh
set -eu set -eu
exec busybox crond -f -l 0 -L /dev/stdout while [ 1 ]; do
(php -f /var/www/html/cron.php &);
sleep 5m;
done

4
22/apache/Dockerfile
View file

@ -13,8 +13,8 @@ RUN set -ex; \
; \ ; \
rm -rf /var/lib/apt/lists/*; \ rm -rf /var/lib/apt/lists/*; \
\ \
mkdir -p /var/spool/cron/crontabs; \ touch /usr/local/etc/php/conf.d/redis-session.ini; \
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
# install the PHP extensions we need # install the PHP extensions we need
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html

5
22/apache/cron.sh
View file

@ -1,4 +1,7 @@
#!/bin/sh #!/bin/sh
set -eu set -eu
exec busybox crond -f -l 0 -L /dev/stdout while [ 1 ]; do
(php -f /var/www/html/cron.php &);
sleep 5m;
done

3
22/fpm-alpine/Dockerfile
View file

@ -9,7 +9,8 @@ RUN set -ex; \
; \ ; \
\ \
rm /var/spool/cron/crontabs/root; \ 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 # install the PHP extensions we need
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html

5
22/fpm-alpine/cron.sh
View file

@ -1,4 +1,7 @@
#!/bin/sh #!/bin/sh
set -eu set -eu
exec busybox crond -f -l 0 -L /dev/stdout while [ 1 ]; do
(php -f /var/www/html/cron.php &);
sleep 5m;
done

4
22/fpm/Dockerfile
View file

@ -13,8 +13,8 @@ RUN set -ex; \
; \ ; \
rm -rf /var/lib/apt/lists/*; \ rm -rf /var/lib/apt/lists/*; \
\ \
mkdir -p /var/spool/cron/crontabs; \ touch /usr/local/etc/php/conf.d/redis-session.ini; \
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
# install the PHP extensions we need # install the PHP extensions we need
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html

5
22/fpm/cron.sh
View file

@ -1,4 +1,7 @@
#!/bin/sh #!/bin/sh
set -eu set -eu
exec busybox crond -f -l 0 -L /dev/stdout while [ 1 ]; do
(php -f /var/www/html/cron.php &);
sleep 5m;
done

3
Dockerfile-alpine.template
View file

@ -8,7 +8,8 @@ RUN set -ex; \
; \ ; \
\ \
rm /var/spool/cron/crontabs/root; \ 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 # install the PHP extensions we need
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html

4
Dockerfile-debian.template
View file

@ -12,8 +12,8 @@ RUN set -ex; \
; \ ; \
rm -rf /var/lib/apt/lists/*; \ rm -rf /var/lib/apt/lists/*; \
\ \
mkdir -p /var/spool/cron/crontabs; \ touch /usr/local/etc/php/conf.d/redis-session.ini; \
echo '*/%%CRONTAB_INT%% * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
# install the PHP extensions we need # install the PHP extensions we need
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html

5
docker-cron.sh
View file

@ -1,4 +1,7 @@
#!/bin/sh #!/bin/sh
set -eu 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

5
update.sh
View file

@ -111,7 +111,6 @@ function create_variant() {
s/%%MEMCACHED_VERSION%%/'"${pecl_versions[memcached]}"'/g; s/%%MEMCACHED_VERSION%%/'"${pecl_versions[memcached]}"'/g;
s/%%REDIS_VERSION%%/'"${pecl_versions[redis]}"'/g; s/%%REDIS_VERSION%%/'"${pecl_versions[redis]}"'/g;
s/%%IMAGICK_VERSION%%/'"${pecl_versions[imagick]}"'/g; s/%%IMAGICK_VERSION%%/'"${pecl_versions[imagick]}"'/g;
s/%%CRONTAB_INT%%/'"$crontabInt"'/g;
' "$dir/Dockerfile" ' "$dir/Dockerfile"
case "$phpVersion" in case "$phpVersion" in
@ -132,6 +131,10 @@ function create_variant() {
for name in entrypoint cron; do for name in entrypoint cron; do
cp "docker-$name.sh" "$dir/$name.sh" cp "docker-$name.sh" "$dir/$name.sh"
done done
# Replace the variable.
sed -ri -e '
s/%%CRONTAB_INT%%/'"$crontabInt"'/g;
' "$dir/cron.sh"
# Copy the upgrade.exclude # Copy the upgrade.exclude
cp upgrade.exclude "$dir/" cp upgrade.exclude "$dir/"