Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
1009478
Initial 3.17 release
thespad Nov 23, 2022
92bd611
Merge pull request #161 from linuxserver/3.17-initial
thespad Nov 23, 2022
305e9a2
Bot Updating Package Versions
LinuxServer-CI Nov 23, 2022
078343f
Add alpine-release package
thespad Nov 25, 2022
7596410
Spaces
thespad Nov 25, 2022
ad924e7
Merge pull request #162 from linuxserver/alpine-release
thespad Nov 25, 2022
df09f6d
Bot Updating Package Versions
LinuxServer-CI Nov 25, 2022
5d59580
Bot Updating Templated Files
LinuxServer-CI Nov 29, 2022
87dfb43
Bot Updating Templated Files
LinuxServer-CI Nov 29, 2022
7b446f0
Bot Updating Templated Files
LinuxServer-CI Nov 29, 2022
a7991de
Bot Updating Package Versions
LinuxServer-CI Dec 6, 2022
9fcf5d8
Minor Dockerfile optimisations
thespad Dec 10, 2022
f72ffa6
Remove legacy scripts check
thespad Dec 10, 2022
8736a36
Remove legacy custom file handlers
thespad Dec 10, 2022
2180f0d
Bot Updating Package Versions
LinuxServer-CI Dec 20, 2022
82bb8aa
Bot Updating Package Versions
LinuxServer-CI Dec 27, 2022
91a498c
Merge pull request #165 from linuxserver/3.17-legacy-scripts
thespad Jan 2, 2023
659bf29
Bot Updating Package Versions
LinuxServer-CI Jan 10, 2023
1a6f120
Bot Updating Package Versions
LinuxServer-CI Jan 17, 2023
67cd472
Bot Updating Templated Files
LinuxServer-CI Feb 14, 2023
00f7a67
Bot Updating Templated Files
LinuxServer-CI Feb 14, 2023
c675e2f
Bot Updating Package Versions
LinuxServer-CI Feb 14, 2023
b11a5ca
Bot Updating Package Versions
LinuxServer-CI Feb 21, 2023
62ae116
Remove legacy /run symlink hack
thespad Mar 1, 2023
062b99c
Rename CI check
thespad Mar 1, 2023
292e1ef
Remove copied contenv, source from mods now
thespad Mar 1, 2023
bb923d4
Custom branding
thespad Mar 1, 2023
e128cf0
Add netcat-openbsd
thespad Mar 1, 2023
8f6304d
Fix permissions
thespad Mar 1, 2023
d2c3074
Restore procps
thespad Mar 1, 2023
eea14b9
Merge pull request #173 from linuxserver/3.17-branding
thespad Mar 1, 2023
fbb9785
Bot Updating Templated Files
LinuxServer-CI Mar 1, 2023
527b372
Bot Updating Package Versions
LinuxServer-CI Mar 1, 2023
31ef1b0
Bot Updating Package Versions
LinuxServer-CI Mar 21, 2023
a7ed4de
Bot Updating Package Versions
LinuxServer-CI Mar 28, 2023
64afadb
Bot Updating Templated Files
LinuxServer-CI Apr 4, 2023
c54869a
Bot Updating Templated Files
LinuxServer-CI Apr 4, 2023
72281a0
Bot Updating Templated Files
LinuxServer-CI Apr 4, 2023
3709677
Bot Updating Package Versions
LinuxServer-CI Apr 4, 2023
eb6d5d5
Add armhf deprecation notice
thespad Apr 12, 2023
a9ef2cc
Merge pull request #178 from linuxserver/master-armhf-notice
thespad Apr 12, 2023
08e780a
Bot Updating Package Versions
LinuxServer-CI Apr 15, 2023
5d733ee
Bot Updating Package Versions
LinuxServer-CI Apr 22, 2023
a846564
Bot Updating Templated Files
LinuxServer-CI Apr 29, 2023
a7ba205
Bot Updating Templated Files
LinuxServer-CI Apr 29, 2023
eb4b14c
Bot Updating Package Versions
LinuxServer-CI May 6, 2023
9104423
Initial release
thespad May 10, 2023
7fc5da5
Merge pull request #183 from linuxserver/3.18-initial
thespad May 10, 2023
76c8c4f
Bot Updating Package Versions
LinuxServer-CI May 10, 2023
d36f2dd
Bot Updating Package Versions
LinuxServer-CI May 13, 2023
8b12480
Create lsiopy venv folder and envs
thespad May 15, 2023
643409d
Merge pull request #187 from linuxserver/3.18-pyvenv
thespad May 15, 2023
3964282
use venv in init mods package install
aptalca May 15, 2023
15496c0
Externalise package check
thespad May 16, 2023
466a927
Merge pull request #188 from linuxserver/3.18-package-install
thespad May 16, 2023
07df980
Bot Updating Package Versions
LinuxServer-CI May 20, 2023
d2b85ed
Bot Updating Templated Files
LinuxServer-CI May 27, 2023
a0d322b
Bot Updating Package Versions
LinuxServer-CI May 27, 2023
1adb03a
Bot Updating Package Versions
LinuxServer-CI Jun 3, 2023
e434ab3
Bot Updating Package Versions
LinuxServer-CI Jun 17, 2023
4fe4220
Bot Updating Templated Files
LinuxServer-CI Jul 1, 2023
7d5f743
Bot Updating Package Versions
LinuxServer-CI Jul 8, 2023
aa9b7f4
Bot Updating Package Versions
LinuxServer-CI Jul 15, 2023
8cf7e20
Bot Updating Package Versions
LinuxServer-CI Jul 22, 2023
96984e3
Bot Updating Package Versions
LinuxServer-CI Jul 29, 2023
816d25f
Bot Updating Package Versions
LinuxServer-CI Aug 5, 2023
5e374ee
Bot Updating Package Versions
LinuxServer-CI Aug 12, 2023
ed066bd
cron in base
nemchik Aug 19, 2023
4d5f322
Merge branch 'standard-cron' into standard-cron-3.16
nemchik Aug 26, 2023
45ee5a9
Add missing type file
nemchik Aug 26, 2023
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
26 changes: 26 additions & 0 deletions root/etc/s6-overlay/s6-rc.d/init-crontab-config/run
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/usr/bin/with-contenv bash
# shellcheck shell=bash

for cron_user in abc root; do
if [[ -f "/defaults/crontabs/${cron_user}" ]]; then
# make folders
mkdir -p \
/config/crontabs

# if crontabs do not exist in config
if [[ ! -f "/config/crontabs/${cron_user}" ]]; then
# copy crontab from system
if crontab -l -u "${cron_user}" >/dev/null; then
crontab -l -u "${cron_user}" >"/config/crontabs/${cron_user}"
fi

# if crontabs still do not exist in config (were not copied from system)
# copy crontab from image defaults (using -n, do not overwrite an existing file)
cp -n "/defaults/crontabs/${cron_user}" /config/crontabs/
fi

# set permissions and import user crontabs
lsiown "${cron_user}":"${cron_user}" "/config/crontabs/${cron_user}"
crontab -u "${cron_user}" "/config/crontabs/${cron_user}"
fi
done
1 change: 1 addition & 0 deletions root/etc/s6-overlay/s6-rc.d/init-crontab-config/type
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
oneshot
1 change: 1 addition & 0 deletions root/etc/s6-overlay/s6-rc.d/init-crontab-config/up
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/init-crontab-config/run
Empty file.
15 changes: 15 additions & 0 deletions root/etc/s6-overlay/s6-rc.d/svc-cron/run
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/usr/bin/with-contenv bash
# shellcheck shell=bash

if builtin command -v crontab >/dev/null && [[ -n "$(crontab -l -u abc)" || -n "$(crontab -l -u root)" ]]; then
if builtin command -v busybox >/dev/null && [[ $(busybox) =~ [[:space:]](crond)([,]|$) ]]; then
exec busybox crond -f -S -l 5
elif [[ -f /usr/bin/apt ]] && [[ -f /usr/sbin/cron ]]; then
exec /usr/sbin/cron -f -L 5
else
echo "**** cron not found ****"
sleep infinity
fi
else
sleep infinity
fi
1 change: 1 addition & 0 deletions root/etc/s6-overlay/s6-rc.d/svc-cron/type
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
longrun
Empty file.