mirror of
https://github.com/linuxserver/docker-heimdall.git
synced 2026-04-02 01:36:00 +09:00
Compare commits
13 Commits
2.2.2-ls85
...
2.2.2-ls94
| Author | SHA1 | Date | |
|---|---|---|---|
|
e3682d08bc | ||
|
|
5d9a89615f | ||
|
|
2f79293858 | ||
|
|
c7ac2f2dbd | ||
|
|
2552f03f22 | ||
|
|
cb77cb7f92 | ||
|
|
25f01cf24d | ||
|
df7f460555 | ||
|
ea0e2bef9e | ||
|
|
cd40fc146e | ||
|
|
1fe37c9352 | ||
|
|
066a129894 | ||
|
|
3e179041f2 |
@@ -1,4 +1,4 @@
|
||||
FROM lsiobase/nginx:3.11
|
||||
FROM lsiobase/nginx:3.12
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM lsiobase/nginx:arm64v8-3.11
|
||||
FROM lsiobase/nginx:arm64v8-3.12
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM lsiobase/nginx:arm32v7-3.11
|
||||
FROM lsiobase/nginx:arm32v7-3.12
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
|
||||
53
Jenkinsfile
vendored
53
Jenkinsfile
vendored
@@ -138,7 +138,6 @@ pipeline {
|
||||
steps {
|
||||
script{
|
||||
env.IMAGE = env.DOCKERHUB_IMAGE
|
||||
env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
|
||||
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME
|
||||
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
|
||||
if (env.MULTIARCH == 'true') {
|
||||
@@ -159,7 +158,6 @@ pipeline {
|
||||
steps {
|
||||
script{
|
||||
env.IMAGE = env.DEV_DOCKERHUB_IMAGE
|
||||
env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
|
||||
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
|
||||
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
|
||||
if (env.MULTIARCH == 'true') {
|
||||
@@ -180,7 +178,6 @@ pipeline {
|
||||
steps {
|
||||
script{
|
||||
env.IMAGE = env.PR_DOCKERHUB_IMAGE
|
||||
env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
|
||||
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
|
||||
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
|
||||
if (env.MULTIARCH == 'true') {
|
||||
@@ -545,22 +542,15 @@ pipeline {
|
||||
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
|
||||
usernameVariable: 'DOCKERUSER',
|
||||
passwordVariable: 'DOCKERPASS'
|
||||
],
|
||||
[
|
||||
$class: 'UsernamePasswordMultiBinding',
|
||||
credentialsId: 'Quay.io-Robot',
|
||||
usernameVariable: 'QUAYUSER',
|
||||
passwordVariable: 'QUAYPASS'
|
||||
]
|
||||
]) {
|
||||
retry(5) {
|
||||
sh '''#! /bin/bash
|
||||
set -e
|
||||
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
|
||||
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
|
||||
echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
|
||||
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
|
||||
for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
|
||||
for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
|
||||
docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
|
||||
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
|
||||
docker push ${PUSHIMAGE}:latest
|
||||
@@ -569,7 +559,7 @@ pipeline {
|
||||
'''
|
||||
}
|
||||
sh '''#! /bin/bash
|
||||
for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
|
||||
for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
|
||||
docker rmi \
|
||||
${DELETEIMAGE}:${META_TAG} \
|
||||
${DELETEIMAGE}:latest || :
|
||||
@@ -591,18 +581,11 @@ pipeline {
|
||||
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
|
||||
usernameVariable: 'DOCKERUSER',
|
||||
passwordVariable: 'DOCKERPASS'
|
||||
],
|
||||
[
|
||||
$class: 'UsernamePasswordMultiBinding',
|
||||
credentialsId: 'Quay.io-Robot',
|
||||
usernameVariable: 'QUAYUSER',
|
||||
passwordVariable: 'QUAYPASS'
|
||||
]
|
||||
]) {
|
||||
retry(5) {
|
||||
sh '''#! /bin/bash
|
||||
set -e
|
||||
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
|
||||
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
|
||||
echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
|
||||
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
|
||||
@@ -636,26 +619,24 @@ pipeline {
|
||||
docker manifest push --purge ${MANIFESTIMAGE}:latest
|
||||
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
|
||||
done
|
||||
for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
|
||||
docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG}
|
||||
docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG}
|
||||
docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG}
|
||||
docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:latest
|
||||
docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG}
|
||||
docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-latest
|
||||
docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-latest
|
||||
docker push ${LEGACYIMAGE}:amd64-${META_TAG}
|
||||
docker push ${LEGACYIMAGE}:arm32v7-${META_TAG}
|
||||
docker push ${LEGACYIMAGE}:arm64v8-${META_TAG}
|
||||
docker push ${LEGACYIMAGE}:latest
|
||||
docker push ${LEGACYIMAGE}:${META_TAG}
|
||||
docker push ${LEGACYIMAGE}:arm32v7-latest
|
||||
docker push ${LEGACYIMAGE}:arm64v8-latest
|
||||
done
|
||||
docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG}
|
||||
docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG}
|
||||
docker tag ${IMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${META_TAG}
|
||||
docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:latest
|
||||
docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG}
|
||||
docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-latest
|
||||
docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-latest
|
||||
docker push ${GITHUBIMAGE}:amd64-${META_TAG}
|
||||
docker push ${GITHUBIMAGE}:arm32v7-${META_TAG}
|
||||
docker push ${GITHUBIMAGE}:arm64v8-${META_TAG}
|
||||
docker push ${GITHUBIMAGE}:latest
|
||||
docker push ${GITHUBIMAGE}:${META_TAG}
|
||||
docker push ${GITHUBIMAGE}:arm32v7-latest
|
||||
docker push ${GITHUBIMAGE}:arm64v8-latest
|
||||
'''
|
||||
}
|
||||
sh '''#! /bin/bash
|
||||
for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
|
||||
for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
|
||||
docker rmi \
|
||||
${DELETEIMAGE}:amd64-${META_TAG} \
|
||||
${DELETEIMAGE}:amd64-latest \
|
||||
|
||||
41
README.md
41
README.md
@@ -1,11 +1,11 @@
|
||||
[](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://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.")
|
||||
[](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")
|
||||
[](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://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.")
|
||||
[](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")
|
||||
|
||||
The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring:
|
||||
|
||||
@@ -25,16 +25,15 @@ Find us at:
|
||||
|
||||
# [linuxserver/heimdall](https://github.com/linuxserver/docker-heimdall)
|
||||
|
||||
[](https://github.com/linuxserver/docker-heimdall)
|
||||
[](https://github.com/linuxserver/docker-heimdall/releases)
|
||||
[](https://github.com/linuxserver/docker-heimdall/packages)
|
||||
[](https://gitlab.com/Linuxserver.io/docker-heimdall/container_registry)
|
||||
[](https://quay.io/repository/linuxserver.io/heimdall)
|
||||
[](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/)
|
||||
[](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/heimdall/latest/index.html)
|
||||
[](https://github.com/linuxserver/docker-heimdall)
|
||||
[](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/)
|
||||
[](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/heimdall/latest/index.html)
|
||||
|
||||
[Heimdall](https://heimdall.site) is a way to organise all those links to your most used web sites and web applications in a simple way.
|
||||
Simplicity is the key to Heimdall.
|
||||
@@ -123,7 +122,7 @@ Container images are configured using parameters passed at runtime (such as thos
|
||||
|
||||
## Environment variables from files (Docker secrets)
|
||||
|
||||
You can set any environment variable from a file by using a special prepend `FILE__`.
|
||||
You can set any environment variable from a file by using a special prepend `FILE__`.
|
||||
|
||||
As an example:
|
||||
|
||||
@@ -133,6 +132,11 @@ As an example:
|
||||
|
||||
Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
|
||||
|
||||
## Umask for running applications
|
||||
|
||||
For all of our images we provide the ability to override the default umask settings for services started within the containers using the optional `-e UMASK=022` setting.
|
||||
Keep in mind umask is not chmod it subtracts from permissions based on it's value it does not add. Please read up [here](https://en.wikipedia.org/wiki/Umask) before asking for support.
|
||||
|
||||
## User / Group Identifiers
|
||||
|
||||
When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
|
||||
@@ -159,7 +163,7 @@ This image now supports password protection through htpasswd. Run the following
|
||||
|
||||
|
||||
## Docker Mods
|
||||
[](https://mods.linuxserver.io/?mod=heimdall "view available mods for this container.")
|
||||
[](https://mods.linuxserver.io/?mod=heimdall "view available mods for this container.")
|
||||
|
||||
We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) can be accessed via the dynamic badge above.
|
||||
|
||||
@@ -228,6 +232,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
||||
|
||||
## Versions
|
||||
|
||||
* **01.06.20:** - Rebasing to alpine 3.12.
|
||||
* **17.01.20:** - Use nginx from baseimage.
|
||||
* **19.12.19:** - Rebasing to alpine 3.11.
|
||||
* **16.07.19:** - Save laravel.log to /config/log/heimdall.
|
||||
|
||||
@@ -1,73 +1,76 @@
|
||||
alpine-baselayout-3.2.0-r3
|
||||
alpine-keys-2.1-r2
|
||||
alpine-baselayout-3.2.0-r7
|
||||
alpine-keys-2.2-r0
|
||||
apache2-utils-2.4.43-r0
|
||||
apk-tools-2.10.5-r0
|
||||
apk-tools-2.10.5-r1
|
||||
apr-1.7.0-r0
|
||||
apr-util-1.6.1-r6
|
||||
argon2-libs-20190702-r1
|
||||
bash-5.0.11-r1
|
||||
busybox-1.31.1-r9
|
||||
ca-certificates-20191127-r1
|
||||
ca-certificates-cacert-20191127-r1
|
||||
coreutils-8.31-r0
|
||||
curl-7.67.0-r0
|
||||
bash-5.0.17-r0
|
||||
busybox-1.31.1-r19
|
||||
ca-certificates-20191127-r4
|
||||
ca-certificates-bundle-20191127-r4
|
||||
coreutils-8.32-r0
|
||||
curl-7.69.1-r0
|
||||
db-5.3.28-r1
|
||||
expat-2.2.9-r1
|
||||
git-2.24.3-r0
|
||||
git-2.26.2-r0
|
||||
libacl-2.2.53-r0
|
||||
libattr-2.4.48-r0
|
||||
libc-utils-0.7.2-r0
|
||||
libc-utils-0.7.2-r3
|
||||
libcrypto1.1-1.1.1g-r0
|
||||
libcurl-7.67.0-r0
|
||||
libedit-20191211.3.1-r0
|
||||
libldap-2.4.48-r2
|
||||
libmagic-5.37-r1
|
||||
libpq-12.2-r0
|
||||
libressl3.0-libcrypto-3.0.2-r0
|
||||
libressl3.0-libssl-3.0.2-r0
|
||||
libsasl-2.1.27-r5
|
||||
libcurl-7.69.1-r0
|
||||
libedit-20191231.3.1-r0
|
||||
libintl-0.20.2-r0
|
||||
libldap-2.4.50-r0
|
||||
libmagic-5.38-r0
|
||||
libpq-12.3-r2
|
||||
libproc-3.3.16-r0
|
||||
libressl3.1-libcrypto-3.1.2-r0
|
||||
libressl3.1-libssl-3.1.2-r0
|
||||
libsasl-2.1.27-r6
|
||||
libssl1.1-1.1.1g-r0
|
||||
libtls-standalone-2.9.1-r0
|
||||
libuuid-2.34-r1
|
||||
libxml2-2.9.10-r3
|
||||
libzip-1.5.2-r0
|
||||
linux-pam-1.3.1-r1
|
||||
logrotate-3.15.1-r0
|
||||
musl-1.1.24-r2
|
||||
musl-utils-1.1.24-r2
|
||||
nano-4.6-r0
|
||||
ncurses-libs-6.1_p20200118-r4
|
||||
ncurses-terminfo-base-6.1_p20200118-r4
|
||||
nghttp2-libs-1.40.0-r0
|
||||
nginx-1.16.1-r6
|
||||
libtls-standalone-2.9.1-r1
|
||||
libuuid-2.35.2-r0
|
||||
libxml2-2.9.10-r4
|
||||
libzip-1.6.1-r1
|
||||
linux-pam-1.3.1-r4
|
||||
logrotate-3.16.0-r0
|
||||
musl-1.1.24-r9
|
||||
musl-utils-1.1.24-r9
|
||||
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-r0
|
||||
openssl-1.1.1g-r0
|
||||
pcre-8.43-r0
|
||||
pcre2-10.34-r1
|
||||
php7-7.3.17-r0
|
||||
php7-common-7.3.17-r0
|
||||
php7-ctype-7.3.17-r0
|
||||
php7-fileinfo-7.3.17-r0
|
||||
php7-fpm-7.3.17-r0
|
||||
php7-json-7.3.17-r0
|
||||
php7-mbstring-7.3.17-r0
|
||||
php7-openssl-7.3.17-r0
|
||||
php7-pdo-7.3.17-r0
|
||||
php7-pdo_pgsql-7.3.17-r0
|
||||
php7-pdo_sqlite-7.3.17-r0
|
||||
php7-session-7.3.17-r0
|
||||
php7-simplexml-7.3.17-r0
|
||||
php7-tokenizer-7.3.17-r0
|
||||
php7-xml-7.3.17-r0
|
||||
php7-xmlwriter-7.3.17-r0
|
||||
php7-zip-7.3.17-r0
|
||||
pcre-8.44-r0
|
||||
pcre2-10.35-r0
|
||||
php7-7.3.20-r0
|
||||
php7-common-7.3.20-r0
|
||||
php7-ctype-7.3.20-r0
|
||||
php7-fileinfo-7.3.20-r0
|
||||
php7-fpm-7.3.20-r0
|
||||
php7-json-7.3.20-r0
|
||||
php7-mbstring-7.3.20-r0
|
||||
php7-openssl-7.3.20-r0
|
||||
php7-pdo-7.3.20-r0
|
||||
php7-pdo_pgsql-7.3.20-r0
|
||||
php7-pdo_sqlite-7.3.20-r0
|
||||
php7-session-7.3.20-r0
|
||||
php7-simplexml-7.3.20-r0
|
||||
php7-tokenizer-7.3.20-r0
|
||||
php7-xml-7.3.20-r0
|
||||
php7-xmlwriter-7.3.20-r0
|
||||
php7-zip-7.3.20-r0
|
||||
popt-1.16-r7
|
||||
readline-8.0.1-r0
|
||||
scanelf-1.2.4-r0
|
||||
shadow-4.7-r1
|
||||
sqlite-libs-3.30.1-r2
|
||||
ssl_client-1.31.1-r9
|
||||
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
|
||||
ssl_client-1.31.1-r19
|
||||
tar-1.32-r1
|
||||
tzdata-2020a-r0
|
||||
xz-5.2.4-r0
|
||||
xz-libs-5.2.4-r0
|
||||
xz-5.2.5-r0
|
||||
xz-libs-5.2.5-r0
|
||||
zlib-1.2.11-r3
|
||||
|
||||
@@ -49,6 +49,7 @@ app_setup_block: |
|
||||
|
||||
# changelog
|
||||
changelogs:
|
||||
- { date: "01.06.20:", desc: "Rebasing to alpine 3.12." }
|
||||
- { date: "17.01.20:", desc: "Use nginx from baseimage." }
|
||||
- { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
|
||||
- { date: "16.07.19:", desc: "Save laravel.log to /config/log/heimdall." }
|
||||
|
||||
Reference in New Issue
Block a user