mirror of
https://github.com/linuxserver/docker-heimdall.git
synced 2026-03-31 17:17:07 +09:00
Compare commits
16 Commits
2.2.2-ls12
...
2.2.2-ls13
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1fdc74ecdf | ||
|
|
d049f50697 | ||
|
|
331f81a43a | ||
|
|
a23caa394d | ||
|
|
e7ec5fa84d | ||
|
|
b9b5aafd73 | ||
|
|
bd2c7742bc | ||
|
|
04021a3cec | ||
|
|
af43fa2196 | ||
|
|
befde6b719 | ||
|
|
96b7597443 | ||
|
|
69e7949136 | ||
|
|
a882969011 | ||
|
|
0c058256a7 | ||
|
|
00f4d1edd7 | ||
|
|
fa143f562a |
20
.editorconfig
Executable file
20
.editorconfig
Executable file
@@ -0,0 +1,20 @@
|
||||
# This file is globally distributed to all container image projects from
|
||||
# https://github.com/linuxserver/docker-jenkins-builder/blob/master/.editorconfig
|
||||
|
||||
# top-most EditorConfig file
|
||||
root = true
|
||||
|
||||
# Unix-style newlines with a newline ending every file
|
||||
[*]
|
||||
end_of_line = lf
|
||||
insert_final_newline = true
|
||||
# trim_trailing_whitespace may cause unintended issues and should not be globally set true
|
||||
trim_trailing_whitespace = false
|
||||
|
||||
[{Dockerfile*,**.yml}]
|
||||
indent_style = space
|
||||
indent_size = 2
|
||||
|
||||
[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}]
|
||||
indent_style = space
|
||||
indent_size = 4
|
||||
2
.github/CONTRIBUTING.md
vendored
2
.github/CONTRIBUTING.md
vendored
@@ -4,7 +4,7 @@
|
||||
|
||||
* While contributing make sure to make all your changes before creating a Pull Request, as our pipeline builds each commit after the PR is open.
|
||||
* Read, and fill the Pull Request template
|
||||
* If this is a fix for a typo in code or documentation in the README please file an issue
|
||||
* 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)
|
||||
|
||||
|
||||
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
@@ -6,7 +6,7 @@
|
||||
|
||||
<!--- Before submitting a pull request please check the following -->
|
||||
|
||||
<!--- If this is a fix for a typo in code or documentation in the README please file an issue and let us sort it out we do not need a PR -->
|
||||
<!--- 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 -->
|
||||
<!--- Ask yourself if this modification is something the whole userbase will benefit from, if this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
|
||||
<!--- That if the PR is addressing an existing issue include, closes #<issue number> , in the body of the PR commit message -->
|
||||
<!--- You have included links to any files / patches etc your PR may be using in the body of the PR commit message -->
|
||||
|
||||
2
.github/workflows/stale.yml
vendored
2
.github/workflows/stale.yml
vendored
@@ -10,7 +10,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/stale@v1
|
||||
- uses: actions/stale@v3
|
||||
with:
|
||||
stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
|
||||
stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
|
||||
|
||||
@@ -18,6 +18,7 @@ RUN \
|
||||
php7-curl \
|
||||
php7-pdo_pgsql \
|
||||
php7-pdo_sqlite \
|
||||
php7-pdo_mysql \
|
||||
php7-tokenizer \
|
||||
php7-zip \
|
||||
tar && \
|
||||
|
||||
@@ -18,6 +18,7 @@ RUN \
|
||||
php7-curl \
|
||||
php7-pdo_pgsql \
|
||||
php7-pdo_sqlite \
|
||||
php7-pdo_mysql \
|
||||
php7-tokenizer \
|
||||
php7-zip \
|
||||
tar && \
|
||||
|
||||
@@ -18,6 +18,7 @@ RUN \
|
||||
php7-curl \
|
||||
php7-pdo_pgsql \
|
||||
php7-pdo_sqlite \
|
||||
php7-pdo_mysql \
|
||||
php7-tokenizer \
|
||||
php7-zip \
|
||||
tar && \
|
||||
|
||||
12
Jenkinsfile
vendored
12
Jenkinsfile
vendored
@@ -58,7 +58,7 @@ pipeline {
|
||||
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
|
||||
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
|
||||
env.PULL_REQUEST = env.CHANGE_ID
|
||||
env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
|
||||
env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
|
||||
}
|
||||
script{
|
||||
env.LS_RELEASE_NUMBER = sh(
|
||||
@@ -270,7 +270,6 @@ pipeline {
|
||||
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
|
||||
cd ${TEMPDIR}/repo/${LS_REPO}
|
||||
git checkout -f master
|
||||
cd ${TEMPDIR}/docker-${CONTAINER_NAME}
|
||||
for i in ${TEMPLATES_TO_DELETE}; do
|
||||
git rm "${i}"
|
||||
done
|
||||
@@ -531,6 +530,15 @@ pipeline {
|
||||
apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \
|
||||
sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \
|
||||
chmod 777 /tmp/package_versions.txt'
|
||||
elif [ "${DIST_IMAGE}" == "fedora" ]; then
|
||||
docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
|
||||
rpm -qa > /tmp/package_versions.txt && \
|
||||
sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \
|
||||
chmod 777 /tmp/package_versions.txt'
|
||||
elif [ "${DIST_IMAGE}" == "arch" ]; then
|
||||
docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
|
||||
pacman -Q > /tmp/package_versions.txt && \
|
||||
chmod 777 /tmp/package_versions.txt'
|
||||
fi
|
||||
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"
|
||||
|
||||
@@ -33,7 +33,6 @@ Find us at:
|
||||
[](https://github.com/linuxserver/docker-heimdall/releases)
|
||||
[](https://github.com/linuxserver/docker-heimdall/packages)
|
||||
[](https://gitlab.com/linuxserver.io/docker-heimdall/container_registry)
|
||||
[](https://microbadger.com/images/linuxserver/heimdall "Get your own version badge on microbadger.com")
|
||||
[](https://hub.docker.com/r/linuxserver/heimdall)
|
||||
[](https://hub.docker.com/r/linuxserver/heimdall)
|
||||
[](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/)
|
||||
@@ -81,9 +80,7 @@ This image now supports password protection through htpasswd. Run the following
|
||||
|
||||
Here are some example snippets to help you get started creating a container.
|
||||
|
||||
### docker-compose ([recommended](https://docs.linuxserver.io/general/docker-compose))
|
||||
|
||||
Compatible with docker-compose v2 schemas.
|
||||
### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))
|
||||
|
||||
```yaml
|
||||
---
|
||||
@@ -104,7 +101,7 @@ services:
|
||||
restart: unless-stopped
|
||||
```
|
||||
|
||||
### docker cli
|
||||
### docker cli ([click here for more info](https://docs.docker.com/engine/reference/commandline/cli/))
|
||||
|
||||
```bash
|
||||
docker run -d \
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
alpine-baselayout-3.2.0-r7
|
||||
alpine-keys-2.2-r0
|
||||
apache2-utils-2.4.46-r1
|
||||
apk-tools-2.10.6-r0
|
||||
apache2-utils-2.4.48-r0
|
||||
apk-tools-2.10.8-r0
|
||||
apr-1.7.0-r0
|
||||
apr-util-1.6.1-r6
|
||||
argon2-libs-20190702-r1
|
||||
@@ -10,7 +10,7 @@ busybox-1.31.1-r20
|
||||
ca-certificates-20191127-r4
|
||||
ca-certificates-bundle-20191127-r4
|
||||
coreutils-8.32-r0
|
||||
curl-7.76.1-r0
|
||||
curl-7.78.0-r0
|
||||
db-5.3.28-r1
|
||||
expat-2.2.9-r1
|
||||
git-2.26.3-r0
|
||||
@@ -18,12 +18,12 @@ libacl-2.2.53-r0
|
||||
libattr-2.4.48-r0
|
||||
libc-utils-0.7.2-r3
|
||||
libcrypto1.1-1.1.1k-r0
|
||||
libcurl-7.76.1-r0
|
||||
libcurl-7.78.0-r0
|
||||
libedit-20191231.3.1-r0
|
||||
libintl-0.20.2-r0
|
||||
libldap-2.4.50-r2
|
||||
libmagic-5.38-r0
|
||||
libpq-12.6-r0
|
||||
libpq-12.8-r0
|
||||
libproc-3.3.16-r0
|
||||
libressl3.1-libcrypto-3.1.2-r0
|
||||
libressl3.1-libssl-3.1.2-r0
|
||||
@@ -31,7 +31,7 @@ libsasl-2.1.27-r6
|
||||
libssl1.1-1.1.1k-r0
|
||||
libtls-standalone-2.9.1-r1
|
||||
libuuid-2.35.2-r0
|
||||
libxml2-2.9.10-r5
|
||||
libxml2-2.9.12-r0
|
||||
libzip-1.6.1-r1
|
||||
linux-pam-1.3.1-r4
|
||||
logrotate-3.16.0-r0
|
||||
@@ -41,34 +41,36 @@ nano-4.9.3-r0
|
||||
ncurses-libs-6.2_p20200523-r0
|
||||
ncurses-terminfo-base-6.2_p20200523-r0
|
||||
nghttp2-libs-1.41.0-r0
|
||||
nginx-1.18.0-r1
|
||||
nginx-1.18.0-r3
|
||||
openssl-1.1.1k-r0
|
||||
pcre-8.44-r0
|
||||
pcre2-10.35-r0
|
||||
php7-7.3.27-r0
|
||||
php7-common-7.3.27-r0
|
||||
php7-ctype-7.3.27-r0
|
||||
php7-curl-7.3.27-r0
|
||||
php7-fileinfo-7.3.27-r0
|
||||
php7-fpm-7.3.27-r0
|
||||
php7-json-7.3.27-r0
|
||||
php7-mbstring-7.3.27-r0
|
||||
php7-openssl-7.3.27-r0
|
||||
php7-pdo-7.3.27-r0
|
||||
php7-pdo_pgsql-7.3.27-r0
|
||||
php7-pdo_sqlite-7.3.27-r0
|
||||
php7-session-7.3.27-r0
|
||||
php7-simplexml-7.3.27-r0
|
||||
php7-tokenizer-7.3.27-r0
|
||||
php7-xml-7.3.27-r0
|
||||
php7-xmlwriter-7.3.27-r0
|
||||
php7-zip-7.3.27-r0
|
||||
php7-7.3.29-r0
|
||||
php7-common-7.3.29-r0
|
||||
php7-ctype-7.3.29-r0
|
||||
php7-curl-7.3.29-r0
|
||||
php7-fileinfo-7.3.29-r0
|
||||
php7-fpm-7.3.29-r0
|
||||
php7-json-7.3.29-r0
|
||||
php7-mbstring-7.3.29-r0
|
||||
php7-mysqlnd-7.3.29-r0
|
||||
php7-openssl-7.3.29-r0
|
||||
php7-pdo-7.3.29-r0
|
||||
php7-pdo_mysql-7.3.29-r0
|
||||
php7-pdo_pgsql-7.3.29-r0
|
||||
php7-pdo_sqlite-7.3.29-r0
|
||||
php7-session-7.3.29-r0
|
||||
php7-simplexml-7.3.29-r0
|
||||
php7-tokenizer-7.3.29-r0
|
||||
php7-xml-7.3.29-r0
|
||||
php7-xmlwriter-7.3.29-r0
|
||||
php7-zip-7.3.29-r0
|
||||
popt-1.16-r7
|
||||
procps-3.3.16-r0
|
||||
readline-8.0.4-r0
|
||||
scanelf-1.2.6-r0
|
||||
shadow-4.8.1-r0
|
||||
sqlite-libs-3.32.1-r0
|
||||
sqlite-libs-3.32.1-r1
|
||||
ssl_client-1.31.1-r20
|
||||
tar-1.32-r2
|
||||
tzdata-2021a-r0
|
||||
|
||||
Reference in New Issue
Block a user