mirror of
https://github.com/linuxserver/docker-heimdall.git
synced 2026-04-26 10:56:44 +09:00
Compare commits
3 Commits
2.1.13-pkg
...
2.1.13-pkg
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
04fe5275d9 | ||
|
|
9b7d2285b7 | ||
|
|
3bfdf1b530 |
9
Jenkinsfile
vendored
9
Jenkinsfile
vendored
@@ -209,6 +209,15 @@ pipeline {
|
|||||||
else
|
else
|
||||||
echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
|
echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
|
||||||
fi
|
fi
|
||||||
|
mkdir -p ${TEMPDIR}/gitbook
|
||||||
|
git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation
|
||||||
|
if [ "${BRANCH_NAME}" = "master" ] && [ ! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md ] || [ "$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" ]; then
|
||||||
|
cp ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/
|
||||||
|
cd ${TEMPDIR}/gitbook/docker-documentation/
|
||||||
|
git add images/docker-${CONTAINER_NAME}.md
|
||||||
|
git commit -m 'Bot Updating Templated Files'
|
||||||
|
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all
|
||||||
|
fi
|
||||||
rm -Rf ${TEMPDIR}'''
|
rm -Rf ${TEMPDIR}'''
|
||||||
script{
|
script{
|
||||||
env.FILES_UPDATED = sh(
|
env.FILES_UPDATED = sh(
|
||||||
|
|||||||
25
README.md
25
README.md
@@ -26,6 +26,8 @@ TLDR: Multi-arch support is changing from multiple repos to one repo per contain
|
|||||||
[](https://microbadger.com/images/linuxserver/heimdall "Get your own version badge on microbadger.com")
|
[](https://microbadger.com/images/linuxserver/heimdall "Get your own version badge on microbadger.com")
|
||||||

|

|
||||||

|

|
||||||
|
[](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.
|
[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.
|
Simplicity is the key to Heimdall.
|
||||||
@@ -37,6 +39,8 @@ Why not use it as your browser start page? It even has the ability to include a
|
|||||||
|
|
||||||
Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list).
|
Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list).
|
||||||
|
|
||||||
|
Simply pulling `linuxserver/heimdall` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
|
||||||
|
|
||||||
The architectures supported by this image are:
|
The architectures supported by this image are:
|
||||||
|
|
||||||
| Architecture | Tag |
|
| Architecture | Tag |
|
||||||
@@ -45,6 +49,7 @@ The architectures supported by this image are:
|
|||||||
| arm64 | arm64v8-latest |
|
| arm64 | arm64v8-latest |
|
||||||
| armhf | arm32v6-latest |
|
| armhf | arm32v6-latest |
|
||||||
|
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
Here are some example snippets to help you get started creating a container.
|
Here are some example snippets to help you get started creating a container.
|
||||||
@@ -120,6 +125,7 @@ In this instance `PUID=1001` and `PGID=1001`, to find yours use `id user` as bel
|
|||||||
uid=1001(dockeruser) gid=1001(dockergroup) groups=1001(dockergroup)
|
uid=1001(dockeruser) gid=1001(dockergroup) groups=1001(dockergroup)
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## Application Setup
|
## Application Setup
|
||||||
|
|
||||||
@@ -141,6 +147,25 @@ This image now supports password protection through htpasswd. Run the following
|
|||||||
* image version number
|
* image version number
|
||||||
* `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/heimdall`
|
* `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/heimdall`
|
||||||
|
|
||||||
|
## Updating Info
|
||||||
|
|
||||||
|
Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
|
||||||
|
|
||||||
|
Below are the instructions for updating containers:
|
||||||
|
|
||||||
|
### Via Docker Run/Create
|
||||||
|
* Update the image: `docker pull linuxserver/heimdall`
|
||||||
|
* Stop the running container: `docker stop heimdall`
|
||||||
|
* Delete the container: `docker rm heimdall`
|
||||||
|
* Recreate a new container with the same docker create parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
|
||||||
|
* Start the new container: `docker start heimdall`
|
||||||
|
* You can also remove the old dangling images: `docker image prune`
|
||||||
|
|
||||||
|
### Via Docker Compose
|
||||||
|
* Update the image: `docker-compose pull linuxserver/heimdall`
|
||||||
|
* Let compose update containers as necessary: `docker-compose up -d`
|
||||||
|
* You can also remove the old dangling images: `docker image prune`
|
||||||
|
|
||||||
## Versions
|
## Versions
|
||||||
|
|
||||||
* **16.01.18:** - Generate random app key in .env for new installs.
|
* **16.01.18:** - Generate random app key in .env for new installs.
|
||||||
|
|||||||
@@ -2,9 +2,6 @@ musl musl-1.1.19-r10
|
|||||||
busybox busybox-1.28.4-r3
|
busybox busybox-1.28.4-r3
|
||||||
alpine-baselayout alpine-baselayout-3.1.0-r0
|
alpine-baselayout alpine-baselayout-3.1.0-r0
|
||||||
alpine-keys alpine-keys-2.1-r1
|
alpine-keys alpine-keys-2.1-r1
|
||||||
libressl2.7-libcrypto libressl2.7-libcrypto-2.7.4-r0
|
|
||||||
libressl2.7-libssl libressl2.7-libssl-2.7.4-r0
|
|
||||||
libressl2.7-libtls libressl2.7-libtls-2.7.4-r0
|
|
||||||
ssl_client ssl_client-1.28.4-r3
|
ssl_client ssl_client-1.28.4-r3
|
||||||
zlib zlib-1.2.11-r1
|
zlib zlib-1.2.11-r1
|
||||||
apk-tools apk-tools-2.10.1-r0
|
apk-tools apk-tools-2.10.1-r0
|
||||||
@@ -29,7 +26,7 @@ libuuid libuuid-2.32-r0
|
|||||||
apr apr-1.6.3-r1
|
apr apr-1.6.3-r1
|
||||||
expat expat-2.2.5-r0
|
expat expat-2.2.5-r0
|
||||||
apr-util apr-util-1.6.1-r3
|
apr-util apr-util-1.6.1-r3
|
||||||
apache2-utils apache2-utils-2.4.38-r1
|
apache2-utils apache2-utils-2.4.38-r3
|
||||||
nghttp2-libs nghttp2-libs-1.32.0-r0
|
nghttp2-libs nghttp2-libs-1.32.0-r0
|
||||||
libssh2 libssh2-1.8.0-r3
|
libssh2 libssh2-1.8.0-r3
|
||||||
libcurl libcurl-7.61.1-r1
|
libcurl libcurl-7.61.1-r1
|
||||||
@@ -57,6 +54,9 @@ php7-session php7-session-7.2.13-r0
|
|||||||
php7-simplexml php7-simplexml-7.2.13-r0
|
php7-simplexml php7-simplexml-7.2.13-r0
|
||||||
php7-xml php7-xml-7.2.13-r0
|
php7-xml php7-xml-7.2.13-r0
|
||||||
php7-xmlwriter php7-xmlwriter-7.2.13-r0
|
php7-xmlwriter php7-xmlwriter-7.2.13-r0
|
||||||
|
libressl2.7-libcrypto libressl2.7-libcrypto-2.7.5-r0
|
||||||
|
libressl2.7-libssl libressl2.7-libssl-2.7.5-r0
|
||||||
|
libressl2.7-libtls libressl2.7-libtls-2.7.5-r0
|
||||||
curl curl-7.61.1-r1
|
curl curl-7.61.1-r1
|
||||||
php7-ctype php7-ctype-7.2.13-r0
|
php7-ctype php7-ctype-7.2.13-r0
|
||||||
php7-pdo php7-pdo-7.2.13-r0
|
php7-pdo php7-pdo-7.2.13-r0
|
||||||
|
|||||||
Reference in New Issue
Block a user