Merge remote-tracking branch 'upstream/master'
This commit is contained in:
BuildTools
commit
dbabe2bee4
6 changed files with 82 additions and 50 deletions
2
.github/CONTRIBUTING.md
vendored
2
.github/CONTRIBUTING.md
vendored
|
|
@ -6,7 +6,7 @@
|
|||
* Read, and fill the Pull Request template
|
||||
* If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR
|
||||
* If the PR is addressing an existing issue include, closes #\<issue number>, in the body of the PR commit message
|
||||
* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn)
|
||||
* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://linuxserver.io/discord)
|
||||
|
||||
## Common files
|
||||
|
||||
|
|
|
|||
2
.github/ISSUE_TEMPLATE/config.yml
vendored
2
.github/ISSUE_TEMPLATE/config.yml
vendored
|
|
@ -1,7 +1,7 @@
|
|||
blank_issues_enabled: false
|
||||
contact_links:
|
||||
- name: Discord chat support
|
||||
url: https://discord.gg/YWrKVTn
|
||||
url: https://linuxserver.io/discord
|
||||
about: Realtime support / chat with the community and the team.
|
||||
|
||||
- name: Discourse discussion forum
|
||||
|
|
|
|||
10
.github/workflows/external_trigger.yml
vendored
10
.github/workflows/external_trigger.yml
vendored
|
|
@ -15,7 +15,10 @@ jobs:
|
|||
SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
|
||||
run: |
|
||||
printf "# External trigger for docker-plex\n\n" >> $GITHUB_STEP_SUMMARY
|
||||
if grep -q "^plex_master" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
|
||||
if grep -q "^plex_master_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
|
||||
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
|
||||
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`plex_master_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY
|
||||
elif grep -q "^plex_master" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
|
||||
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
|
||||
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`plex_master\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
|
||||
exit 0
|
||||
|
|
@ -25,6 +28,11 @@ jobs:
|
|||
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
|
||||
EXT_RELEASE=$(curl -s "https://plex.tv/api/downloads/5.json" | jq -r '. | .computer.Linux.version')
|
||||
echo "Type is \`custom_json\`" >> $GITHUB_STEP_SUMMARY
|
||||
if grep -q "^plex_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
|
||||
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
|
||||
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY
|
||||
exit 0
|
||||
fi
|
||||
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
|
||||
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
|
||||
echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY
|
||||
|
|
|
|||
39
Jenkinsfile
vendored
39
Jenkinsfile
vendored
|
|
@ -58,11 +58,23 @@ pipeline {
|
|||
steps{
|
||||
echo "Running on node: ${NODE_NAME}"
|
||||
sh '''#! /bin/bash
|
||||
containers=$(docker ps -aq)
|
||||
echo "Pruning builder"
|
||||
docker builder prune -f --builder container || :
|
||||
containers=$(docker ps -q)
|
||||
if [[ -n "${containers}" ]]; then
|
||||
docker stop ${containers}
|
||||
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
|
||||
for container in ${containers}; do
|
||||
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
|
||||
echo "skipping buildx container in docker stop"
|
||||
else
|
||||
echo "Stopping container ${container}"
|
||||
docker stop ${container}
|
||||
fi
|
||||
docker system prune -af --volumes || : '''
|
||||
done
|
||||
fi
|
||||
docker system prune -f --volumes || :
|
||||
docker image prune -af || :
|
||||
'''
|
||||
script{
|
||||
env.EXIT_STATUS = ''
|
||||
env.LS_RELEASE = sh(
|
||||
|
|
@ -743,7 +755,8 @@ pipeline {
|
|||
if [[ -n "${containers}" ]]; then
|
||||
docker stop ${containers}
|
||||
fi
|
||||
docker system prune -af --volumes || :
|
||||
docker system prune -f --volumes || :
|
||||
docker image prune -af || :
|
||||
'''
|
||||
}
|
||||
}
|
||||
|
|
@ -1154,12 +1167,22 @@ EOF
|
|||
}
|
||||
cleanup {
|
||||
sh '''#! /bin/bash
|
||||
echo "Performing docker system prune!!"
|
||||
containers=$(docker ps -aq)
|
||||
echo "Pruning builder!!"
|
||||
docker builder prune -f --builder container || :
|
||||
containers=$(docker ps -q)
|
||||
if [[ -n "${containers}" ]]; then
|
||||
docker stop ${containers}
|
||||
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
|
||||
for container in ${containers}; do
|
||||
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
|
||||
echo "skipping buildx container in docker stop"
|
||||
else
|
||||
echo "Stopping container ${container}"
|
||||
docker stop ${container}
|
||||
fi
|
||||
docker system prune -af --volumes || :
|
||||
done
|
||||
fi
|
||||
docker system prune -f --volumes || :
|
||||
docker image prune -af || :
|
||||
'''
|
||||
cleanWs()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ wireguard onfig file has to be mounted in /etc/wireguard/wg0.conf. e.g.:
|
|||
[](https://linuxserver.io)
|
||||
|
||||
[](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
|
||||
[](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.")
|
||||
[](https://linuxserver.io/discord "realtime support / chat with the community and the team.")
|
||||
[](https://discourse.linuxserver.io "post on our community forum.")
|
||||
[](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
|
||||
[](https://github.com/linuxserver "view the source for all of our repositories.")
|
||||
|
|
@ -34,7 +34,7 @@ The [LinuxServer.io](https://linuxserver.io) team brings you another container r
|
|||
Find us at:
|
||||
|
||||
* [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more!
|
||||
* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
|
||||
* [Discord](https://linuxserver.io/discord) - realtime support / chat with the community and the team.
|
||||
* [Discourse](https://discourse.linuxserver.io) - post on our community forum.
|
||||
* [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images.
|
||||
* [GitHub](https://github.com/linuxserver) - view the source for all of our repositories.
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@ NAME VERSION TYPE
|
|||
adduser 3.137ubuntu1 deb
|
||||
apt 2.7.14build2 deb
|
||||
apt-utils 2.7.14build2 deb
|
||||
base-files 13ubuntu10.1 deb
|
||||
base-files 13ubuntu10.2 deb
|
||||
base-passwd 3.6.3build1 deb
|
||||
bash 5.2.21-2ubuntu4 deb
|
||||
bsdutils 1:2.39.3-9ubuntu6.1 deb
|
||||
bsdutils 1:2.39.3-9ubuntu6.2 deb
|
||||
ca-certificates 20240203 deb
|
||||
catatonit 0.1.7-1 deb
|
||||
coreutils 9.4-3ubuntu6 deb
|
||||
|
|
@ -36,21 +36,21 @@ hostname 3.23+nmu2ubuntu2 deb
|
|||
init-system-helpers 1.66ubuntu1 deb
|
||||
jq 1.7.1-3build1 deb
|
||||
keyboxd 2.4.4-2ubuntu17 deb
|
||||
krb5-locales 1.20.1-6ubuntu2.2 deb
|
||||
krb5-locales 1.20.1-6ubuntu2.3 deb
|
||||
libacl1 2.3.2-1build1.1 deb
|
||||
libapt-pkg6.0t64 2.7.14build2 deb
|
||||
libassuan0 2.5.6-1build1 deb
|
||||
libattr1 1:2.5.2-1build1 deb
|
||||
libattr1 1:2.5.2-1build1.1 deb
|
||||
libaudit-common 1:3.1.2-2.1build1.1 deb
|
||||
libaudit1 1:3.1.2-2.1build1.1 deb
|
||||
libblkid1 2.39.3-9ubuntu6.1 deb
|
||||
libblkid1 2.39.3-9ubuntu6.2 deb
|
||||
libbrotli1 1.1.0-2build2 deb
|
||||
libbsd0 0.12.1-1build1 deb
|
||||
libbsd0 0.12.1-1build1.1 deb
|
||||
libbz2-1.0 1.0.8-5.1build0.1 deb
|
||||
libc-bin 2.39-0ubuntu8.3 deb
|
||||
libc6 2.39-0ubuntu8.3 deb
|
||||
libc-bin 2.39-0ubuntu8.4 deb
|
||||
libc6 2.39-0ubuntu8.4 deb
|
||||
libcap-ng0 0.8.4-2build2 deb
|
||||
libcap2 1:2.66-5ubuntu2 deb
|
||||
libcap2 1:2.66-5ubuntu2.1 deb
|
||||
libcom-err2 1.47.0-2.4~exp1ubuntu4.1 deb
|
||||
libcrypt1 1:4.4.36-4build1 deb
|
||||
libcurl4t64 8.5.0-2ubuntu10.6 deb
|
||||
|
|
@ -60,28 +60,28 @@ libext2fs2t64 1.47.0-2.4~exp1ubuntu4.1 deb
|
|||
libffi8 3.4.6-1build1 deb
|
||||
libgcc-s1 14.2.0-4ubuntu2~24.04 deb
|
||||
libgcrypt20 1.10.3-2build1 deb
|
||||
libgmp10 2:6.3.0+dfsg-2ubuntu6 deb
|
||||
libgmp10 2:6.3.0+dfsg-2ubuntu6.1 deb
|
||||
libgnutls30t64 3.8.3-1.1ubuntu3.2 deb
|
||||
libgpg-error0 1.47-3build2 deb
|
||||
libgssapi-krb5-2 1.20.1-6ubuntu2.2 deb
|
||||
libgpg-error0 1.47-3build2.1 deb
|
||||
libgssapi-krb5-2 1.20.1-6ubuntu2.3 deb
|
||||
libhogweed6t64 3.9.1-2.2build1.1 deb
|
||||
libidn2-0 2.3.7-2build1 deb
|
||||
libidn2-0 2.3.7-2build1.1 deb
|
||||
libjq1 1.7.1-3build1 deb
|
||||
libk5crypto3 1.20.1-6ubuntu2.2 deb
|
||||
libk5crypto3 1.20.1-6ubuntu2.3 deb
|
||||
libkeyutils1 1.6.3-3build1 deb
|
||||
libkmod2 31+20240202-2ubuntu7 deb
|
||||
libkrb5-3 1.20.1-6ubuntu2.2 deb
|
||||
libkrb5support0 1.20.1-6ubuntu2.2 deb
|
||||
libkmod2 31+20240202-2ubuntu7.1 deb
|
||||
libkrb5-3 1.20.1-6ubuntu2.3 deb
|
||||
libkrb5support0 1.20.1-6ubuntu2.3 deb
|
||||
libksba8 1.6.6-1build1 deb
|
||||
libldap-common 2.6.7+dfsg-1~exp1ubuntu8.1 deb
|
||||
libldap2 2.6.7+dfsg-1~exp1ubuntu8.1 deb
|
||||
liblz4-1 1.9.4-1build1.1 deb
|
||||
liblzma5 5.6.1+really5.4.5-1build0.1 deb
|
||||
libmd0 1.1.0-2build1 deb
|
||||
libmount1 2.39.3-9ubuntu6.1 deb
|
||||
libmd0 1.1.0-2build1.1 deb
|
||||
libmount1 2.39.3-9ubuntu6.2 deb
|
||||
libncursesw6 6.4+20240113-1ubuntu2 deb
|
||||
libnettle8t64 3.9.1-2.2build1.1 deb
|
||||
libnghttp2-14 1.59.0-1ubuntu0.1 deb
|
||||
libnghttp2-14 1.59.0-1ubuntu0.2 deb
|
||||
libnpth0t64 1.6-3.1build1 deb
|
||||
libonig5 6.9.9-1build1 deb
|
||||
libp11-kit0 0.25.3-4ubuntu2.1 deb
|
||||
|
|
@ -89,7 +89,7 @@ libpam-modules 1.5.3-5ubuntu5.1 deb
|
|||
libpam-modules-bin 1.5.3-5ubuntu5.1 deb
|
||||
libpam-runtime 1.5.3-5ubuntu5.1 deb
|
||||
libpam0g 1.5.3-5ubuntu5.1 deb
|
||||
libpcre2-8-0 10.42-4ubuntu2 deb
|
||||
libpcre2-8-0 10.42-4ubuntu2.1 deb
|
||||
libproc2-0 2:4.0.4-4ubuntu3.2 deb
|
||||
libpsl5t64 0.21.2-1.1build1 deb
|
||||
libreadline8t64 8.2-4build1 deb
|
||||
|
|
@ -98,50 +98,51 @@ libsasl2-2 2.1.28+dfsg1-5ubuntu3.1 deb
|
|||
libsasl2-modules 2.1.28+dfsg1-5ubuntu3.1 deb
|
||||
libsasl2-modules-db 2.1.28+dfsg1-5ubuntu3.1 deb
|
||||
libseccomp2 2.5.5-1ubuntu3.1 deb
|
||||
libselinux1 3.5-2ubuntu2 deb
|
||||
libselinux1 3.5-2ubuntu2.1 deb
|
||||
libsemanage-common 3.5-1build5 deb
|
||||
libsemanage2 3.5-1build5 deb
|
||||
libsepol2 3.5-2build1 deb
|
||||
libsmartcols1 2.39.3-9ubuntu6.1 deb
|
||||
libsqlite3-0 3.45.1-1ubuntu2 deb
|
||||
libsmartcols1 2.39.3-9ubuntu6.2 deb
|
||||
libsqlite3-0 3.45.1-1ubuntu2.1 deb
|
||||
libss2 1.47.0-2.4~exp1ubuntu4.1 deb
|
||||
libssh-4 0.10.6-2build2 deb
|
||||
libssl3t64 3.0.13-0ubuntu3.4 deb
|
||||
libstdc++6 14.2.0-4ubuntu2~24.04 deb
|
||||
libsystemd0 255.4-1ubuntu8.4 deb
|
||||
libsystemd0 255.4-1ubuntu8.5 deb
|
||||
libtasn1-6 4.19.0-3build1 deb
|
||||
libtinfo6 6.4+20240113-1ubuntu2 deb
|
||||
libudev1 255.4-1ubuntu8.4 deb
|
||||
libunistring5 1.1-2build1 deb
|
||||
libuuid1 2.39.3-9ubuntu6.1 deb
|
||||
libudev1 255.4-1ubuntu8.5 deb
|
||||
libunistring5 1.1-2build1.1 deb
|
||||
libuuid1 2.39.3-9ubuntu6.2 deb
|
||||
libxxhash0 0.8.2-2build1 deb
|
||||
libzstd1 1.5.5+dfsg2-2build1.1 deb
|
||||
locales 2.39-0ubuntu8.3 deb
|
||||
locales 2.39-0ubuntu8.4 deb
|
||||
login 1:4.13+dfsg1-4ubuntu3.2 deb
|
||||
logsave 1.47.0-2.4~exp1ubuntu4.1 deb
|
||||
mawk 1.3.4.20240123-1build1 deb
|
||||
mount 2.39.3-9ubuntu6.1 deb
|
||||
mount 2.39.3-9ubuntu6.2 deb
|
||||
ncurses-base 6.4+20240113-1ubuntu2 deb
|
||||
ncurses-bin 6.4+20240113-1ubuntu2 deb
|
||||
netcat-openbsd 1.226-1ubuntu2 deb
|
||||
openssl 3.0.13-0ubuntu3.4 deb
|
||||
passwd 1:4.13+dfsg1-4ubuntu3.2 deb
|
||||
perl-base 5.38.2-3.2build2 deb
|
||||
perl-base 5.38.2-3.2build2.1 deb
|
||||
pinentry-curses 1.2.1-3ubuntu5 deb
|
||||
plexmediaserver 1.41.3.9314-a0bfb8370 deb
|
||||
plexmediaserver 1.41.4.9463-630c9f557 deb
|
||||
procps 2:4.0.4-4ubuntu3.2 deb
|
||||
publicsuffix 20231001.0357-0.1 deb
|
||||
readline-common 8.2-4build1 deb
|
||||
sed 4.9-2build1 deb
|
||||
sensible-utils 0.0.22 deb
|
||||
systemd-dev 255.4-1ubuntu8.4 deb
|
||||
systemd-dev 255.4-1ubuntu8.5 deb
|
||||
systemd-hwe-hwdb 255.1.4 deb
|
||||
systemd-standalone-sysusers 255.4-1ubuntu8.4 deb
|
||||
systemd-standalone-sysusers 255.4-1ubuntu8.5 deb
|
||||
sysvinit-utils 3.08-6ubuntu3 deb
|
||||
tar 1.35+dfsg-3build1 deb
|
||||
tzdata 2024a-3ubuntu1.1 deb
|
||||
tzdata 2024b-0ubuntu0.24.04.1 deb
|
||||
ubuntu-keyring 2023.11.28.1 deb
|
||||
udev 255.4-1ubuntu8.4 deb
|
||||
util-linux 2.39.3-9ubuntu6.1 deb
|
||||
udev 255.4-1ubuntu8.5 deb
|
||||
unminimize 0.2.1 deb
|
||||
util-linux 2.39.3-9ubuntu6.2 deb
|
||||
wget 1.21.4-1ubuntu4.1 deb
|
||||
zlib1g 1:1.3.dfsg-3.1ubuntu2.1 deb
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue