Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
073be13
add jammy baseimage based on focal logic
thelamer Dec 29, 2021
a7f6bf8
Bot Updating Package Versions
LinuxServer-CI Dec 29, 2021
3bf5656
Bot Updating Package Versions
LinuxServer-CI Jan 4, 2022
0e36ca7
jammy: add tamper check
aptalca Jan 4, 2022
db8734a
Bot Updating Package Versions
LinuxServer-CI Jan 11, 2022
1cc20ab
Bot Updating Package Versions
LinuxServer-CI Jan 18, 2022
d70974b
Merge pull request #82 from linuxserver/jammy-tamper
aptalca Jan 24, 2022
4206486
Bot Updating Package Versions
LinuxServer-CI Jan 24, 2022
22f46fa
Bot Updating Package Versions
LinuxServer-CI Feb 1, 2022
0872c2b
Bot Updating Package Versions
LinuxServer-CI Feb 8, 2022
f37105c
Bot Updating Package Versions
LinuxServer-CI Feb 22, 2022
e443954
Bot Updating Package Versions
LinuxServer-CI Mar 1, 2022
3e22a30
Bot Updating Package Versions
LinuxServer-CI Mar 8, 2022
6e7b680
Bot Updating Package Versions
LinuxServer-CI Mar 15, 2022
2926d83
Bot Updating Package Versions
LinuxServer-CI Mar 22, 2022
4a34e6b
Bot Updating Package Versions
LinuxServer-CI Mar 29, 2022
71e193f
Bot Updating Package Versions
LinuxServer-CI Apr 5, 2022
0527bac
Bot Updating Package Versions
LinuxServer-CI Apr 12, 2022
c7d664a
Bot Updating Package Versions
LinuxServer-CI Apr 19, 2022
8c75b07
add retry to mod curls
aptalca Apr 20, 2022
ed51367
Merge pull request #87 from linuxserver/jammy-modcurl
aptalca Apr 21, 2022
697dc21
Bot Updating Package Versions
LinuxServer-CI Apr 21, 2022
76ae880
Bot Updating Package Versions
LinuxServer-CI May 3, 2022
dbb009c
Bot Updating Package Versions
LinuxServer-CI May 10, 2022
323ce36
Bot Updating Package Versions
LinuxServer-CI May 17, 2022
baae4e6
Bot Updating Package Versions
LinuxServer-CI May 24, 2022
45f4648
Initial s6 v3 commit
thespad May 24, 2022
f6f7c9e
Copy arm sources for arm builds
thespad May 24, 2022
d8b1237
Add CI check
thespad May 26, 2022
3a7fc5e
Update CI init message
thespad May 27, 2022
b65cc90
Remove patch package from runtime as it's done in rootfs now
thespad May 27, 2022
d277d89
Bot Updating Package Versions
LinuxServer-CI May 31, 2022
98ebac4
Add compatibility shim for v2 scandir
thespad Jun 3, 2022
3848316
Trailing newline
thespad Jun 3, 2022
f2a45dd
Merge pull request #92 from linuxserver/s6-3.1.0.1-jammy
thespad Jun 6, 2022
754123e
Bot Updating Package Versions
LinuxServer-CI Jun 14, 2022
9bfc6a8
Set s6 service max timeout to 0
thespad Jun 14, 2022
d25c6ba
Merge pull request #94 from linuxserver/jammy-timeout
thespad Jun 14, 2022
5b3a523
Fix umask handling for s6 v3
thespad Jun 20, 2022
8c5eeec
Bot Updating Package Versions
LinuxServer-CI Jun 21, 2022
f93eb35
Bot Updating Package Versions
LinuxServer-CI Jun 28, 2022
580858a
Bot Updating Package Versions
LinuxServer-CI Jul 12, 2022
ee07f35
Support hybrid mods
thespad Jul 22, 2022
9f4950c
Fix indentation
thespad Jul 22, 2022
0cf2d90
Merge pull request #98 from linuxserver/hybrid-mods-jammy
thespad Jul 22, 2022
74e69e2
Add mod-init
thespad Jul 22, 2022
28b1121
Add init-services anchor
thespad Jul 23, 2022
3371c5a
Merge pull request #100 from linuxserver/mod-init-jammy
aptalca Jul 26, 2022
80ea2d8
update arm apt/sources.list
sususu98 Jul 29, 2022
c09de3e
Support universal mod package install
thespad Jul 29, 2022
c5eaf2d
Merge pull request #105 from linuxserver/mod-package-jammy
thespad Jul 31, 2022
6284a87
Bot Updating Package Versions
LinuxServer-CI Jul 31, 2022
a406406
Merge branch 'linuxserver:jammy' into jammy
sususu98 Aug 4, 2022
23f6bf7
Merge pull request #101 from sususu98/jammy
nemchik Aug 5, 2022
689443a
Bot Updating Package Versions
LinuxServer-CI Aug 9, 2022
262079f
Bot Updating Package Versions
LinuxServer-CI Aug 16, 2022
895959c
Update 01-migrations
nemchik Aug 22, 2022
a4a57be
Merge pull request #108 from linuxserver/nemchik-patch-3
nemchik Aug 27, 2022
6f938ce
Support new custom files locations
thespad Aug 28, 2022
6a47d6e
Merge pull request #113 from linuxserver/new-custom-files-jammy
nemchik Aug 28, 2022
edc1b4b
Fix custom service logic
thespad Sep 2, 2022
f9f4903
Include paths
thespad Sep 2, 2022
4f4d9e3
Fix script tee
thespad Sep 2, 2022
f8af24e
Remove circular dep
thespad Sep 2, 2022
e5eae41
Fix formatting
thespad Sep 2, 2022
d621bca
Merge pull request #116 from linuxserver/fix-custom-svc-logic-jammy
thespad Sep 2, 2022
12e4373
Bot Updating Package Versions
LinuxServer-CI Sep 2, 2022
e22da8a
Add custom services to user bundle
thespad Sep 3, 2022
1fe03df
Merge pull request #117 from linuxserver/custom-user-bundle-jammy
aptalca Sep 3, 2022
704cc3c
Rework legacy custom file handling
thespad Sep 5, 2022
654ff8d
Fix copy/paste snafu
thespad Sep 5, 2022
aecc9fa
Fix package install logic
thespad Sep 6, 2022
9ab0ba6
Merge pull request #119 from linuxserver/jammy-custom-rework
thespad Sep 10, 2022
bcc82ac
Make Jammy Fully v3 Compliant (#111)
thespad Sep 11, 2022
93b708c
Remove custom svc from user bundle
thespad Sep 13, 2022
6fa506a
Fix errors if custom dir is mounted but empty
thespad Sep 13, 2022
dbfeb9c
Add user bundle removal to legacy block too
thespad Sep 13, 2022
7b324db
Merge pull request #121 from linuxserver/custom-svc-clean-jammy
nemchik Sep 13, 2022
378ab6c
Bot Updating Package Versions
LinuxServer-CI Sep 13, 2022
2e906c8
Bot Updating Templated Files
LinuxServer-CI Sep 20, 2022
6db649a
Bot Updating Package Versions
LinuxServer-CI Sep 20, 2022
56dcc88
CI oneshot should depend on legacy-services
thespad Sep 22, 2022
c2a3f98
Merge pull request #123 from linuxserver/ci-deps
thespad Sep 23, 2022
321b69e
Bot Updating Package Versions
LinuxServer-CI Sep 23, 2022
3d93f92
Bot Updating Package Versions
LinuxServer-CI Oct 4, 2022
9200995
Pull docker-mods from repo, install curl/jq/netcat
thespad Oct 5, 2022
f4a4c5d
Merge pull request #124 from linuxserver/mods-n-things-jammy
thespad Oct 5, 2022
25ad86e
Bot Updating Package Versions
LinuxServer-CI Oct 5, 2022
94e534e
Bot Updating Package Versions
LinuxServer-CI Oct 25, 2022
de53083
Fix migrations
nemchik Oct 28, 2022
2a8b481
Merge pull request #125 from linuxserver/jammy-migrations
nemchik Oct 30, 2022
2c93aea
Bot Updating Package Versions
LinuxServer-CI Oct 30, 2022
3e16c75
Bot Updating Package Versions
LinuxServer-CI Nov 1, 2022
8af1ed2
Bot Updating Package Versions
LinuxServer-CI Nov 8, 2022
28aa777
Bot Updating Package Versions
LinuxServer-CI Nov 22, 2022
a29eef6
chmod docker-mods script on ADD
thespad Nov 23, 2022
522b52d
Merge pull request #128 from linuxserver/buildkit-jammy
thespad Nov 23, 2022
fb96c3b
Bot Updating Templated Files
LinuxServer-CI Nov 29, 2022
b823bf1
Bot Updating Templated Files
LinuxServer-CI Nov 29, 2022
57fe51d
Bot Updating Templated Files
LinuxServer-CI Nov 29, 2022
1b2c125
Bot Updating Package Versions
LinuxServer-CI Dec 6, 2022
d10fcb7
Minor Dockerfile optimisations
thespad Dec 10, 2022
f3c387d
Remove legacy scripts check
thespad Dec 10, 2022
b74ce81
Remove legacy custom file handlers
thespad Dec 10, 2022
82e533b
Bot Updating Package Versions
LinuxServer-CI Dec 13, 2022
e1a12b4
Merge pull request #130 from linuxserver/jammy-legacy-scripts
thespad Jan 2, 2023
5316f44
Bot Updating Package Versions
LinuxServer-CI Jan 10, 2023
f5e6c03
Bot Updating Templated Files
LinuxServer-CI Feb 14, 2023
7c38a8b
Bot Updating Templated Files
LinuxServer-CI Feb 14, 2023
5689895
Bot Updating Package Versions
LinuxServer-CI Feb 14, 2023
41d38f7
Bot Updating Package Versions
LinuxServer-CI Feb 21, 2023
23315d5
Bot Updating Package Versions
LinuxServer-CI Feb 28, 2023
f969c18
Remove legacy /run symlink hack
thespad Mar 1, 2023
ed6b9c5
Rename CI check
thespad Mar 1, 2023
6897e7b
Remove copied contenv, sourced from mods now
thespad Mar 1, 2023
c7cfb77
Custom branding
thespad Mar 1, 2023
bd1f0b9
Run builder
thespad Mar 1, 2023
803d204
Merge pull request #133 from linuxserver/jammy-branding
thespad Mar 1, 2023
20b645b
Bot Updating Templated Files
LinuxServer-CI Mar 1, 2023
af3a96f
Bot Updating Package Versions
LinuxServer-CI Mar 1, 2023
22c03eb
Bot Updating Package Versions
LinuxServer-CI Mar 7, 2023
da8a708
Bot Updating Package Versions
LinuxServer-CI Mar 21, 2023
c85d252
Bot Updating Templated Files
LinuxServer-CI Apr 4, 2023
c07cfd1
Bot Updating Templated Files
LinuxServer-CI Apr 4, 2023
a89b3bb
Bot Updating Templated Files
LinuxServer-CI Apr 4, 2023
a4d964e
Bot Updating Package Versions
LinuxServer-CI Apr 11, 2023
fe39690
Add armhf deprecation notice
thespad Apr 12, 2023
e8e56e9
Merge pull request #135 from linuxserver/jammy-armhf-notice
thespad Apr 12, 2023
001e244
Bot Updating Package Versions
LinuxServer-CI Apr 12, 2023
00a19c9
Bot Updating Package Versions
LinuxServer-CI Apr 18, 2023
0fde9dc
Bot Updating Templated Files
LinuxServer-CI Apr 25, 2023
d0f3c09
Bot Updating Templated Files
LinuxServer-CI Apr 25, 2023
2312efe
Bot Updating Package Versions
LinuxServer-CI Apr 25, 2023
f1aa968
Bot Updating Package Versions
LinuxServer-CI May 2, 2023
2cf7d3b
Bump s6 to 3.1.5.0 (Jammy)
thespad May 12, 2023
e8f3de5
Create lsiopy venv folder and envs
thespad May 15, 2023
0f23603
Externalise package-install
thespad May 16, 2023
487abae
Merge pull request #140 from linuxserver/jammy-s6bump
thespad May 16, 2023
4c11b05
Bot Updating Templated Files
LinuxServer-CI May 23, 2023
30b1306
Bot Updating Package Versions
LinuxServer-CI May 30, 2023
4773a43
Bot Updating Package Versions
LinuxServer-CI Jun 6, 2023
a55df65
Bot Updating Package Versions
LinuxServer-CI Jun 27, 2023
11d753d
Bot Updating Templated Files
LinuxServer-CI Jul 4, 2023
71502cc
Bot Updating Templated Files
LinuxServer-CI Jul 4, 2023
3adcc65
Bot Updating Package Versions
LinuxServer-CI Jul 25, 2023
6b17ac8
Include cron
nemchik Jul 30, 2023
538b1b7
cron in base
nemchik Aug 19, 2023
d755500
Merge branch 'standard-cron' into standard-cron-focal
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
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ FROM alpine:3.16 as rootfs-stage
# environment
ENV REL=focal
ENV ARCH=amd64

# install packages
RUN \
apk add --no-cache \
Expand Down Expand Up @@ -103,6 +104,7 @@ RUN \
locales && \
echo "**** install packages ****" && \
apt-get install -y \
cron \
curl \
gnupg \
jq \
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ FROM alpine:3.16 as rootfs-stage
# environment
ENV REL=focal
ENV ARCH=arm64

# install packages
RUN \
apk add --no-cache \
Expand Down Expand Up @@ -103,6 +104,7 @@ RUN \
locales && \
echo "**** install packages ****" && \
apt-get install -y \
cron \
curl \
gnupg \
jq \
Expand Down
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.