Skip to content

cron and redis fixes for running with non-root UID #1469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
RlndVt wants to merge 4 commits into from
Closed

cron and redis fixes for running with non-root UID #1469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c7ef56
Replace crond with a while loop.
RlndVt Apr 6, 2021
64f040b
Runs update.sh
RlndVt Apr 6, 2021
1a22f36
Make redis-session.ini writable by non-root.
RlndVt Apr 6, 2021
47610bb
Runs update.sh
RlndVt Apr 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions 20/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion 20/apache/cron.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion 20/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion 20/fpm-alpine/cron.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions 20/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion 20/fpm/cron.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions 21/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion 21/apache/cron.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion 21/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion 21/fpm-alpine/cron.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions 21/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion 21/fpm/cron.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions 22/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion 22/apache/cron.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion 22/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion 22/fpm-alpine/cron.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions 22/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion 22/fpm/cron.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion Dockerfile-alpine.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-debian.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion docker-cron.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
5 changes: 4 additions & 1 deletion update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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/"
Expand Down