mirror of
https://github.com/linuxserver/docker-heimdall.git
synced 2026-04-03 02:01:34 +09:00
Compare commits
19 Commits
developmen
...
developmen
| Author | SHA1 | Date | |
|---|---|---|---|
|
ad5b8d1055 | ||
|
|
634e06c925 | ||
|
|
e94c72db59 | ||
|
|
dc94aaeb18 | ||
|
|
91094b3d8a | ||
|
|
3b56747736 | ||
|
|
9d0cd0cccb | ||
|
|
dba06dc313 | ||
|
|
f871f9cffb | ||
|
|
cc172f5532 | ||
|
|
f2ab9d7bd4 | ||
|
|
0f518fb2ff | ||
|
|
238962b372 | ||
|
|
6e6011ca83 | ||
|
|
780c98979a | ||
|
|
a0f68066c2 | ||
|
|
dfabf2eede | ||
|
|
9c28a7f738 | ||
|
|
04488583cd |
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-heimdall\n\n" >> $GITHUB_STEP_SUMMARY
|
||||
if grep -q "^heimdall_development" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
|
||||
if grep -q "^heimdall_development_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
|
||||
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
|
||||
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`heimdall_development_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY
|
||||
elif grep -q "^heimdall_development" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
|
||||
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
|
||||
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`heimdall_development\`; 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 -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/linuxserver/Heimdall/commits/2.x" | jq -r '. | .sha' | cut -c1-8)
|
||||
echo "Type is \`github_commit\`" >> $GITHUB_STEP_SUMMARY
|
||||
if grep -q "^heimdall_development_${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
|
||||
|
||||
41
Jenkinsfile
vendored
41
Jenkinsfile
vendored
@@ -59,11 +59,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
|
||||
done
|
||||
fi
|
||||
docker system prune -af --volumes || : '''
|
||||
docker system prune -f --volumes || :
|
||||
docker image prune -af || :
|
||||
'''
|
||||
script{
|
||||
env.EXIT_STATUS = ''
|
||||
env.LS_RELEASE = sh(
|
||||
@@ -751,7 +763,8 @@ pipeline {
|
||||
if [[ -n "${containers}" ]]; then
|
||||
docker stop ${containers}
|
||||
fi
|
||||
docker system prune -af --volumes || :
|
||||
docker system prune -f --volumes || :
|
||||
docker image prune -af || :
|
||||
'''
|
||||
}
|
||||
}
|
||||
@@ -777,7 +790,7 @@ pipeline {
|
||||
docker run --rm \
|
||||
-v /var/run/docker.sock:/var/run/docker.sock:ro \
|
||||
-v ${TEMPDIR}:/tmp \
|
||||
ghcr.io/anchore/syft:latest \
|
||||
ghcr.io/anchore/syft:v1.26.1 \
|
||||
${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt
|
||||
NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
|
||||
echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
|
||||
@@ -1162,12 +1175,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
|
||||
done
|
||||
fi
|
||||
docker system prune -af --volumes || :
|
||||
docker system prune -f --volumes || :
|
||||
docker image prune -af || :
|
||||
'''
|
||||
cleanWs()
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
[](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.")
|
||||
@@ -20,7 +20,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.
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
NAME VERSION TYPE
|
||||
Hidden Input 1, 0, 0, 0 dotnet
|
||||
Hidden Input 1, 0, 0, 0 binary
|
||||
alpine-baselayout 3.6.5-r0 apk
|
||||
alpine-baselayout-data 3.6.5-r0 apk
|
||||
alpine-keys 2.4-r1 apk
|
||||
alpine-release 3.20.3-r0 apk
|
||||
alpine-release 3.20.6-r0 apk
|
||||
apache2-utils 2.4.62-r0 apk
|
||||
apk-tools 2.14.4-r1 apk
|
||||
apr 1.7.5-r0 apk
|
||||
@@ -19,19 +19,19 @@ brotli-libs 1.1.0-r2 apk
|
||||
busybox 1.36.1-r29 apk
|
||||
busybox-binsh 1.36.1-r29 apk
|
||||
c-ares 1.33.1-r0 apk
|
||||
ca-certificates 20240705-r0 apk
|
||||
ca-certificates-bundle 20240705-r0 apk
|
||||
ca-certificates 20241121-r1 apk
|
||||
ca-certificates-bundle 20241121-r1 apk
|
||||
carbonphp/carbon-doctrine-types 2.1.0 php-composer
|
||||
catatonit 0.2.0-r0 apk
|
||||
clue/stream-filter v1.7.0 php-composer
|
||||
composer 2.8.4 binary
|
||||
composer 2.8.9 binary
|
||||
composer/class-map-generator 1.1.0 php-composer
|
||||
composer/pcre 3.1.1 php-composer
|
||||
coreutils 9.5-r1 apk
|
||||
coreutils-env 9.5-r1 apk
|
||||
coreutils-fmt 9.5-r1 apk
|
||||
coreutils-sha512sum 9.5-r1 apk
|
||||
curl 8.11.1-r0 apk
|
||||
coreutils 9.5-r2 apk
|
||||
coreutils-env 9.5-r2 apk
|
||||
coreutils-fmt 9.5-r2 apk
|
||||
coreutils-sha512sum 9.5-r2 apk
|
||||
curl 8.12.1-r0 apk
|
||||
dflydev/dot-access-data v3.0.2 php-composer
|
||||
doctrine/cache 2.2.0 php-composer
|
||||
doctrine/dbal 3.8.2 php-composer
|
||||
@@ -46,8 +46,9 @@ fakerphp/faker v1.23.1 php-composer
|
||||
filp/whoops 2.15.4 php-composer
|
||||
findutils 4.9.0-r5 apk
|
||||
fruitcake/php-cors v1.3.0 php-composer
|
||||
git 2.45.2-r0 apk
|
||||
git-init-template 2.45.2-r0 apk
|
||||
git 2.45.3-r0 apk
|
||||
git-init-template 2.45.3-r0 apk
|
||||
gmp 6.3.0-r1 apk
|
||||
graham-campbell/bounded-cache v2.2.0 php-composer
|
||||
graham-campbell/github v12.4.0 php-composer
|
||||
graham-campbell/manager v5.1.0 php-composer
|
||||
@@ -78,31 +79,31 @@ libacl 2.3.2-r0 apk
|
||||
libattr 2.5.2-r0 apk
|
||||
libbsd 0.12.2-r0 apk
|
||||
libbz2 1.0.8-r6 apk
|
||||
libcrypto3 3.3.2-r1 apk
|
||||
libcurl 8.11.1-r0 apk
|
||||
libcrypto3 3.3.3-r0 apk
|
||||
libcurl 8.12.1-r0 apk
|
||||
libedit 20240517.3.1-r0 apk
|
||||
libexpat 2.6.4-r0 apk
|
||||
libgcc 13.2.1_git20240309-r0 apk
|
||||
libexpat 2.7.0-r0 apk
|
||||
libgcc 13.2.1_git20240309-r1 apk
|
||||
libidn2 2.3.7-r0 apk
|
||||
libintl 0.22.5-r0 apk
|
||||
libmd 1.1.0-r0 apk
|
||||
libncursesw 6.4_p20240420-r2 apk
|
||||
libpq 16.6-r0 apk
|
||||
libpq 16.9-r0 apk
|
||||
libproc2 4.0.4-r0 apk
|
||||
libpsl 0.21.5-r1 apk
|
||||
libssl3 3.3.2-r1 apk
|
||||
libstdc++ 13.2.1_git20240309-r0 apk
|
||||
libssl3 3.3.3-r0 apk
|
||||
libstdc++ 13.2.1_git20240309-r1 apk
|
||||
libunistring 1.2-r0 apk
|
||||
libuuid 2.40.1-r1 apk
|
||||
libxml2 2.12.7-r0 apk
|
||||
libxml2 2.12.10-r0 apk
|
||||
libzip 1.10.1-r0 apk
|
||||
linux-pam 1.6.0-r0 apk
|
||||
logrotate 3.21.0-r1 apk
|
||||
mockery/mockery 1.6.7 php-composer
|
||||
monolog/monolog 3.5.0 php-composer
|
||||
mtdowling/jmespath.php 2.7.0 php-composer
|
||||
musl 1.2.5-r0 apk
|
||||
musl-utils 1.2.5-r0 apk
|
||||
musl 1.2.5-r1 apk
|
||||
musl-utils 1.2.5-r1 apk
|
||||
myclabs/deep-copy 1.11.1 php-composer
|
||||
nano 8.0-r0 apk
|
||||
ncurses-terminfo-base 6.4_p20240420-r2 apk
|
||||
@@ -111,12 +112,12 @@ netcat-openbsd 1.226-r0 apk
|
||||
nette/schema v1.3.0 php-composer
|
||||
nette/utils v4.0.4 php-composer
|
||||
nghttp2-libs 1.62.1-r0 apk
|
||||
nginx 1.26.2-r0 apk
|
||||
nginx 1.26.3-r0 apk
|
||||
nikic/php-parser v5.0.0 php-composer
|
||||
nunomaduro/collision v6.4.0 php-composer
|
||||
nunomaduro/termwind v1.15.1 php-composer
|
||||
oniguruma 6.9.9-r0 apk
|
||||
openssl 3.3.2-r1 apk
|
||||
openssl 3.3.3-r0 apk
|
||||
pcre 8.45-r3 apk
|
||||
pcre2 10.43-r0 apk
|
||||
phar-io/manifest 2.0.3 php-composer
|
||||
@@ -129,30 +130,30 @@ php-http/message 1.16.0 php-composer
|
||||
php-http/message-factory 1.1.0 php-composer
|
||||
php-http/multipart-stream-builder 1.3.0 php-composer
|
||||
php-http/promise 1.3.0 php-composer
|
||||
php83 8.3.14-r0 apk
|
||||
php83-common 8.3.14-r0 apk
|
||||
php83-ctype 8.3.14-r0 apk
|
||||
php83-curl 8.3.14-r0 apk
|
||||
php83-dom 8.3.14-r0 apk
|
||||
php83-fileinfo 8.3.14-r0 apk
|
||||
php83-fpm 8.3.14-r0 apk
|
||||
php83-iconv 8.3.14-r0 apk
|
||||
php83-intl 8.3.14-r0 apk
|
||||
php83-mbstring 8.3.14-r0 apk
|
||||
php83-mysqlnd 8.3.14-r0 apk
|
||||
php83-opcache 8.3.14-r0 apk
|
||||
php83-openssl 8.3.14-r0 apk
|
||||
php83-pdo 8.3.14-r0 apk
|
||||
php83-pdo_mysql 8.3.14-r0 apk
|
||||
php83-pdo_pgsql 8.3.14-r0 apk
|
||||
php83-pdo_sqlite 8.3.14-r0 apk
|
||||
php83-phar 8.3.14-r0 apk
|
||||
php83-session 8.3.14-r0 apk
|
||||
php83-simplexml 8.3.14-r0 apk
|
||||
php83-tokenizer 8.3.14-r0 apk
|
||||
php83-xml 8.3.14-r0 apk
|
||||
php83-xmlwriter 8.3.14-r0 apk
|
||||
php83-zip 8.3.14-r0 apk
|
||||
php83 8.3.15-r0 apk
|
||||
php83-common 8.3.15-r0 apk
|
||||
php83-ctype 8.3.15-r0 apk
|
||||
php83-curl 8.3.15-r0 apk
|
||||
php83-dom 8.3.15-r0 apk
|
||||
php83-fileinfo 8.3.15-r0 apk
|
||||
php83-fpm 8.3.15-r0 apk
|
||||
php83-iconv 8.3.15-r0 apk
|
||||
php83-intl 8.3.15-r0 apk
|
||||
php83-mbstring 8.3.15-r0 apk
|
||||
php83-mysqlnd 8.3.15-r0 apk
|
||||
php83-opcache 8.3.15-r0 apk
|
||||
php83-openssl 8.3.15-r0 apk
|
||||
php83-pdo 8.3.15-r0 apk
|
||||
php83-pdo_mysql 8.3.15-r0 apk
|
||||
php83-pdo_pgsql 8.3.15-r0 apk
|
||||
php83-pdo_sqlite 8.3.15-r0 apk
|
||||
php83-phar 8.3.15-r0 apk
|
||||
php83-session 8.3.15-r0 apk
|
||||
php83-simplexml 8.3.15-r0 apk
|
||||
php83-tokenizer 8.3.15-r0 apk
|
||||
php83-xml 8.3.15-r0 apk
|
||||
php83-xmlwriter 8.3.15-r0 apk
|
||||
php83-zip 8.3.15-r0 apk
|
||||
phpdocumentor/reflection-common 2.2.0 php-composer
|
||||
phpdocumentor/type-resolver 1.8.0 php-composer
|
||||
phpoption/phpoption 1.9.2 php-composer
|
||||
@@ -202,7 +203,7 @@ spatie/backtrace 1.5.3 php-composer
|
||||
spatie/flare-client-php 1.4.4 php-composer
|
||||
spatie/ignition 1.12.0 php-composer
|
||||
spatie/laravel-ignition 2.4.2 php-composer
|
||||
sqlite-libs 3.45.3-r1 apk
|
||||
sqlite-libs 3.45.3-r2 apk
|
||||
squizlabs/php_codesniffer 3.9.0 php-composer
|
||||
ssl_client 1.36.1-r29 apk
|
||||
symfony/cache v6.4.3 php-composer
|
||||
@@ -241,11 +242,11 @@ symfony/var-exporter v7.0.3 php-composer
|
||||
symfony/yaml v6.4.3 php-composer
|
||||
theseer/tokenizer 1.2.2 php-composer
|
||||
tijsverkoyen/css-to-inline-styles v2.2.7 php-composer
|
||||
tzdata 2024b-r0 apk
|
||||
tzdata 2025b-r0 apk
|
||||
utmps-libs 0.1.2.2-r1 apk
|
||||
vlucas/phpdotenv v5.6.0 php-composer
|
||||
voku/portable-ascii 2.0.1 php-composer
|
||||
webmozart/assert 1.11.0 php-composer
|
||||
xz-libs 5.6.2-r0 apk
|
||||
xz-libs 5.6.2-r1 apk
|
||||
zlib 1.3.1-r1 apk
|
||||
zstd-libs 1.5.6-r0 apk
|
||||
|
||||
@@ -59,6 +59,7 @@ init_diagram: |
|
||||
init-heimdall-config -> init-config-end
|
||||
init-os-end -> init-crontab-config
|
||||
init-mods-end -> init-custom-files
|
||||
init-adduser -> init-device-perms
|
||||
base -> init-envfile
|
||||
init-os-end -> init-folders
|
||||
init-nginx-end -> init-heimdall-config
|
||||
@@ -74,6 +75,7 @@ init_diagram: |
|
||||
init-permissions -> init-nginx-end
|
||||
base -> init-os-end
|
||||
init-adduser -> init-os-end
|
||||
init-device-perms -> init-os-end
|
||||
init-envfile -> init-os-end
|
||||
init-migrations -> init-os-end
|
||||
init-keygen -> init-permissions
|
||||
|
||||
Reference in New Issue
Block a user