mirror of
https://github.com/linuxserver/docker-heimdall.git
synced 2026-04-01 01:19:24 +09:00
Compare commits
61 Commits
2.2.2-ls58
...
e2cc32fd-l
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1b6969488e | ||
|
|
ae95089cbb | ||
|
|
5cb928099f | ||
|
|
a54fc868aa | ||
|
|
4f40fd9a3a | ||
|
|
1684b93916 | ||
|
|
3bb73751ee | ||
|
|
bc92c83906 | ||
|
|
b8d51cc97d | ||
|
|
ec07bff1ac | ||
|
|
21e6d52b46 | ||
|
|
1f097316ec | ||
|
|
e735f61e57 | ||
|
|
e38599485d | ||
|
|
9b076f235e | ||
|
|
794bafaab2 | ||
|
|
597d556cd2 | ||
|
|
e79c61b3c5 | ||
|
|
2c54f91807 | ||
|
|
f3f506c7f2 | ||
|
|
8832c94540 | ||
|
|
343bb827ce | ||
|
|
41154e0438 | ||
|
|
0c66ead61e | ||
|
|
079aabfeb4 | ||
|
|
a5e53899cf | ||
|
|
5ac7422993 | ||
|
|
eab7c6495e | ||
|
|
b0f0adb148 | ||
|
|
be7d050888 | ||
|
|
c82016564c | ||
|
|
c7467f6aa5 | ||
|
|
1613da6dc9 | ||
|
|
5f363b265c | ||
|
|
bb9e50be18 | ||
|
|
b053939f72 | ||
|
|
51d66e0ea6 | ||
|
|
3a00115c88 | ||
|
|
17655d12fe | ||
|
|
225302baf6 | ||
|
|
9883c65f4f | ||
|
|
c4716c464d | ||
|
|
d51600ca8e | ||
|
|
f0ed8c45ca | ||
|
|
c92bccc89e | ||
|
|
509bb4358d | ||
|
|
80a0db2aaf | ||
|
|
579f419f1f | ||
|
|
2883d89040 | ||
|
|
fac2512f02 | ||
|
|
4b6e635375 | ||
|
|
5786b2ff61 | ||
|
|
292f434ca1 | ||
|
|
cbc08b4cdc | ||
|
|
85de02aa29 | ||
|
|
9ba53ce10e | ||
|
|
71bada833c | ||
|
|
8788a724b0 | ||
|
|
49a9390a5d | ||
|
|
a64b9e838a | ||
|
|
9659004f69 |
@@ -12,9 +12,8 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
|
||||
|
||||
RUN \
|
||||
echo "**** install runtime packages ****" && \
|
||||
apk add --no-cache --upgrade \
|
||||
apk add --no-cache \
|
||||
curl \
|
||||
nginx \
|
||||
php7-ctype \
|
||||
php7-pdo_sqlite \
|
||||
php7-tokenizer \
|
||||
@@ -24,11 +23,11 @@ RUN \
|
||||
mkdir -p \
|
||||
/heimdall && \
|
||||
if [ -z ${HEIMDALL_RELEASE+x} ]; then \
|
||||
HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \
|
||||
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
|
||||
HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/commits/master" \
|
||||
| awk '/sha/{print $4;exit}' FS='[""]'); \
|
||||
fi && \
|
||||
curl -o \
|
||||
/heimdall/heimdall.tar.gz -L \
|
||||
/heimdall/heimdall.tar.gz -L \
|
||||
"https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \
|
||||
echo "**** cleanup ****" && \
|
||||
rm -rf \
|
||||
|
||||
@@ -12,9 +12,8 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
|
||||
|
||||
RUN \
|
||||
echo "**** install runtime packages ****" && \
|
||||
apk add --no-cache --upgrade \
|
||||
apk add --no-cache \
|
||||
curl \
|
||||
nginx \
|
||||
php7-ctype \
|
||||
php7-pdo_sqlite \
|
||||
php7-tokenizer \
|
||||
@@ -24,11 +23,11 @@ RUN \
|
||||
mkdir -p \
|
||||
/heimdall && \
|
||||
if [ -z ${HEIMDALL_RELEASE+x} ]; then \
|
||||
HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \
|
||||
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
|
||||
HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/commits/master" \
|
||||
| awk '/sha/{print $4;exit}' FS='[""]'); \
|
||||
fi && \
|
||||
curl -o \
|
||||
/heimdall/heimdall.tar.gz -L \
|
||||
/heimdall/heimdall.tar.gz -L \
|
||||
"https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \
|
||||
echo "**** cleanup ****" && \
|
||||
rm -rf \
|
||||
|
||||
@@ -12,9 +12,8 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
|
||||
|
||||
RUN \
|
||||
echo "**** install runtime packages ****" && \
|
||||
apk add --no-cache --upgrade \
|
||||
apk add --no-cache \
|
||||
curl \
|
||||
nginx \
|
||||
php7-ctype \
|
||||
php7-pdo_sqlite \
|
||||
php7-tokenizer \
|
||||
@@ -24,11 +23,11 @@ RUN \
|
||||
mkdir -p \
|
||||
/heimdall && \
|
||||
if [ -z ${HEIMDALL_RELEASE+x} ]; then \
|
||||
HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \
|
||||
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
|
||||
HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/commits/master" \
|
||||
| awk '/sha/{print $4;exit}' FS='[""]'); \
|
||||
fi && \
|
||||
curl -o \
|
||||
/heimdall/heimdall.tar.gz -L \
|
||||
/heimdall/heimdall.tar.gz -L \
|
||||
"https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \
|
||||
echo "**** cleanup ****" && \
|
||||
rm -rf \
|
||||
|
||||
82
Jenkinsfile
vendored
82
Jenkinsfile
vendored
@@ -38,7 +38,7 @@ pipeline {
|
||||
script{
|
||||
env.EXIT_STATUS = ''
|
||||
env.LS_RELEASE = sh(
|
||||
script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':latest 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
|
||||
script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':development 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
|
||||
returnStdout: true).trim()
|
||||
env.LS_RELEASE_NOTES = sh(
|
||||
script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
|
||||
@@ -110,21 +110,21 @@ pipeline {
|
||||
/* ########################
|
||||
External Release Tagging
|
||||
######################## */
|
||||
// If this is a stable github release use the latest endpoint from github to determine the ext tag
|
||||
stage("Set ENV github_stable"){
|
||||
// If this is a github commit trigger determine the current commit at head
|
||||
stage("Set ENV github_commit"){
|
||||
steps{
|
||||
script{
|
||||
env.EXT_RELEASE = sh(
|
||||
script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. | .tag_name' ''',
|
||||
script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq -r '. | .sha' | cut -c1-8 ''',
|
||||
returnStdout: true).trim()
|
||||
}
|
||||
}
|
||||
}
|
||||
// If this is a stable or devel github release generate the link for the build message
|
||||
stage("Set ENV github_link"){
|
||||
// If this is a github commit trigger Set the external release link
|
||||
stage("Set ENV commit_link"){
|
||||
steps{
|
||||
script{
|
||||
env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/releases/tag/' + env.EXT_RELEASE
|
||||
env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/commit/' + env.EXT_RELEASE
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -138,10 +138,10 @@ pipeline {
|
||||
}
|
||||
}
|
||||
}
|
||||
// If this is a master build use live docker endpoints
|
||||
// If this is a development build use live docker endpoints
|
||||
stage("Set ENV live build"){
|
||||
when {
|
||||
branch "master"
|
||||
branch "development"
|
||||
environment name: 'CHANGE_ID', value: ''
|
||||
}
|
||||
steps {
|
||||
@@ -159,7 +159,7 @@ pipeline {
|
||||
// If this is a dev build use dev docker endpoints
|
||||
stage("Set ENV dev build"){
|
||||
when {
|
||||
not {branch "master"}
|
||||
not {branch "development"}
|
||||
environment name: 'CHANGE_ID', value: ''
|
||||
}
|
||||
steps {
|
||||
@@ -226,7 +226,7 @@ pipeline {
|
||||
// Use helper containers to render templated files
|
||||
stage('Update-Templates') {
|
||||
when {
|
||||
branch "master"
|
||||
branch "development"
|
||||
environment name: 'CHANGE_ID', value: ''
|
||||
expression {
|
||||
env.CONTAINER_NAME != null
|
||||
@@ -237,16 +237,16 @@ pipeline {
|
||||
set -e
|
||||
TEMPDIR=$(mktemp -d)
|
||||
docker pull linuxserver/jenkins-builder:latest
|
||||
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest
|
||||
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest
|
||||
docker pull linuxserver/doc-builder:latest
|
||||
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest
|
||||
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest
|
||||
if [ "$(md5sum ${TEMPDIR}/${LS_REPO}/Jenkinsfile | awk '{ print $1 }')" != "$(md5sum Jenkinsfile | awk '{ print $1 }')" ] || \
|
||||
[ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ] || \
|
||||
[ "$(cat ${TEMPDIR}/${LS_REPO}/LICENSE | md5sum | cut -c1-8)" != "${LICENSE_TAG}" ] || \
|
||||
[ "$(cat ${TEMPDIR}/${LS_REPO}/.github/FUNDING.yml | md5sum | cut -c1-8)" != "${FUNDING_TAG}" ]; then
|
||||
mkdir -p ${TEMPDIR}/repo
|
||||
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
|
||||
git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f master
|
||||
git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f development
|
||||
cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/repo/${LS_REPO}/
|
||||
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
|
||||
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/LICENSE ${TEMPDIR}/repo/${LS_REPO}/
|
||||
@@ -280,7 +280,7 @@ pipeline {
|
||||
// Exit the build if the Templated files were just updated
|
||||
stage('Template-exit') {
|
||||
when {
|
||||
branch "master"
|
||||
branch "development"
|
||||
environment name: 'CHANGE_ID', value: ''
|
||||
environment name: 'FILES_UPDATED', value: 'true'
|
||||
expression {
|
||||
@@ -379,7 +379,7 @@ pipeline {
|
||||
// Take the image we just built and dump package versions for comparison
|
||||
stage('Update-packages') {
|
||||
when {
|
||||
branch "master"
|
||||
branch "development"
|
||||
environment name: 'CHANGE_ID', value: ''
|
||||
environment name: 'EXIT_STATUS', value: ''
|
||||
}
|
||||
@@ -407,7 +407,7 @@ pipeline {
|
||||
echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
|
||||
if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
|
||||
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
|
||||
git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master
|
||||
git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f development
|
||||
cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
|
||||
cd ${TEMPDIR}/${LS_REPO}/
|
||||
wait
|
||||
@@ -431,7 +431,7 @@ pipeline {
|
||||
// Exit the build if the package file was just updated
|
||||
stage('PACKAGE-exit') {
|
||||
when {
|
||||
branch "master"
|
||||
branch "development"
|
||||
environment name: 'CHANGE_ID', value: ''
|
||||
environment name: 'PACKAGE_UPDATED', value: 'true'
|
||||
environment name: 'EXIT_STATUS', value: ''
|
||||
@@ -445,7 +445,7 @@ pipeline {
|
||||
// Exit the build if this is just a package check and there are no changes to push
|
||||
stage('PACKAGECHECK-exit') {
|
||||
when {
|
||||
branch "master"
|
||||
branch "development"
|
||||
environment name: 'CHANGE_ID', value: ''
|
||||
environment name: 'PACKAGE_UPDATED', value: 'false'
|
||||
environment name: 'EXIT_STATUS', value: ''
|
||||
@@ -530,12 +530,12 @@ pipeline {
|
||||
sh '''#! /bin/bash
|
||||
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
|
||||
'''
|
||||
sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:latest"
|
||||
sh "docker push ${IMAGE}:latest"
|
||||
sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:development"
|
||||
sh "docker push ${IMAGE}:development"
|
||||
sh "docker push ${IMAGE}:${META_TAG}"
|
||||
sh '''docker rmi \
|
||||
${IMAGE}:${META_TAG} \
|
||||
${IMAGE}:latest || :'''
|
||||
${IMAGE}:development || :'''
|
||||
|
||||
}
|
||||
}
|
||||
@@ -565,32 +565,32 @@ pipeline {
|
||||
docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
|
||||
docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
|
||||
fi'''
|
||||
sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-latest"
|
||||
sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-latest"
|
||||
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-latest"
|
||||
sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-development"
|
||||
sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-development"
|
||||
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-development"
|
||||
sh "docker push ${IMAGE}:amd64-${META_TAG}"
|
||||
sh "docker push ${IMAGE}:arm32v7-${META_TAG}"
|
||||
sh "docker push ${IMAGE}:arm64v8-${META_TAG}"
|
||||
sh "docker push ${IMAGE}:amd64-latest"
|
||||
sh "docker push ${IMAGE}:arm32v7-latest"
|
||||
sh "docker push ${IMAGE}:arm64v8-latest"
|
||||
sh "docker manifest push --purge ${IMAGE}:latest || :"
|
||||
sh "docker manifest create ${IMAGE}:latest ${IMAGE}:amd64-latest ${IMAGE}:arm32v7-latest ${IMAGE}:arm64v8-latest"
|
||||
sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm32v7-latest --os linux --arch arm"
|
||||
sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8"
|
||||
sh "docker push ${IMAGE}:amd64-development"
|
||||
sh "docker push ${IMAGE}:arm32v7-development"
|
||||
sh "docker push ${IMAGE}:arm64v8-development"
|
||||
sh "docker manifest push --purge ${IMAGE}:development || :"
|
||||
sh "docker manifest create ${IMAGE}:development ${IMAGE}:amd64-development ${IMAGE}:arm32v7-development ${IMAGE}:arm64v8-development"
|
||||
sh "docker manifest annotate ${IMAGE}:development ${IMAGE}:arm32v7-development --os linux --arch arm"
|
||||
sh "docker manifest annotate ${IMAGE}:development ${IMAGE}:arm64v8-development --os linux --arch arm64 --variant v8"
|
||||
sh "docker manifest push --purge ${IMAGE}:${META_TAG} || :"
|
||||
sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}"
|
||||
sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v7-${META_TAG} --os linux --arch arm"
|
||||
sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8"
|
||||
sh "docker manifest push --purge ${IMAGE}:latest"
|
||||
sh "docker manifest push --purge ${IMAGE}:development"
|
||||
sh "docker manifest push --purge ${IMAGE}:${META_TAG}"
|
||||
sh '''docker rmi \
|
||||
${IMAGE}:amd64-${META_TAG} \
|
||||
${IMAGE}:amd64-latest \
|
||||
${IMAGE}:amd64-development \
|
||||
${IMAGE}:arm32v7-${META_TAG} \
|
||||
${IMAGE}:arm32v7-latest \
|
||||
${IMAGE}:arm32v7-development \
|
||||
${IMAGE}:arm64v8-${META_TAG} \
|
||||
${IMAGE}:arm64v8-latest \
|
||||
${IMAGE}:arm64v8-development \
|
||||
lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
|
||||
lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
|
||||
}
|
||||
@@ -599,7 +599,7 @@ pipeline {
|
||||
// If this is a public release tag it in the LS Github
|
||||
stage('Github-Tag-Push-Release') {
|
||||
when {
|
||||
branch "master"
|
||||
branch "development"
|
||||
expression {
|
||||
env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
|
||||
}
|
||||
@@ -611,17 +611,17 @@ pipeline {
|
||||
sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
|
||||
-d '{"tag":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
|
||||
"object": "'${COMMIT_SHA}'",\
|
||||
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
|
||||
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to development",\
|
||||
"type": "commit",\
|
||||
"tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
|
||||
echo "Pushing New release for Tag"
|
||||
sh '''#! /bin/bash
|
||||
curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq '. |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json
|
||||
curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq '. | .commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json
|
||||
echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
|
||||
"target_commitish": "master",\
|
||||
"target_commitish": "development",\
|
||||
"name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
|
||||
"body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start
|
||||
printf '","draft": false,"prerelease": false}' >> releasebody.json
|
||||
printf '","draft": false,"prerelease": true}' >> releasebody.json
|
||||
paste -d'\\0' start releasebody.json > releasebody.json.done
|
||||
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
|
||||
}
|
||||
|
||||
20
README.md
20
README.md
@@ -52,14 +52,6 @@ The architectures supported by this image are:
|
||||
| arm64 | arm64v8-latest |
|
||||
| armhf | arm32v7-latest |
|
||||
|
||||
## Version Tags
|
||||
|
||||
This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them.
|
||||
|
||||
| Tag | Description |
|
||||
| :----: | --- |
|
||||
| latest | Stable Heimdall releases. |
|
||||
| development | Latest commit from the github master branch. |
|
||||
|
||||
## Usage
|
||||
|
||||
@@ -80,6 +72,11 @@ docker create \
|
||||
linuxserver/heimdall
|
||||
```
|
||||
|
||||
Using tags, you can switch between the stable releases of Heimdall and the master branch. No tag is required for the latest stable release.
|
||||
Add the development tag, if required, to the linuxserver/heimdall line of the run/create command in the following format, linuxserver/heimdall:development
|
||||
The development tag will be the latest commit in the master branch of Heimdall.
|
||||
HOWEVER , USE THE DEVELOPMENT TAG AT YOUR OWN PERIL !!!!!!!!!
|
||||
|
||||
|
||||
### docker-compose
|
||||
|
||||
@@ -207,15 +204,10 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
||||
|
||||
## Versions
|
||||
|
||||
* **16.07.19:** - Save laravel.log to /config/log/heimdall.
|
||||
* **15.07.19:** - Save laravel.log to /config, install heimdall during first start.
|
||||
* **28.06.19:** - Rebasing to alpine 3.10.
|
||||
* **01.04.19:** - Fix permission detect logic.
|
||||
* **26.03.19:** - Install Heimdall during container start to prevent delayed start due to overlayfs bug with recursive chown.
|
||||
* **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
|
||||
* **15.03.19:** - Clarify docker image tags in readme.
|
||||
* **22.02.19:** - Rebasing to alpine 3.9.
|
||||
* **16.01.18:** - Generate random app key in .env for new installs.
|
||||
* **20.11.18:** - Upgrade baseimage packages during build.
|
||||
* **04.11.18:** - Add php7-zip.
|
||||
* **31.10.18:** - Add queue service.
|
||||
* **17.10.18:** - Symlink avatars folder.
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
|
||||
# jenkins variables
|
||||
project_name: docker-heimdall
|
||||
external_type: github_stable
|
||||
release_type: stable
|
||||
release_tag: latest
|
||||
ls_branch: master
|
||||
external_type: github_commit
|
||||
release_type: prerelease
|
||||
release_tag: development
|
||||
ls_branch: development
|
||||
repo_vars:
|
||||
- EXT_GIT_BRANCH = 'master'
|
||||
- EXT_USER = 'linuxserver'
|
||||
|
||||
@@ -11,7 +11,7 @@ ca-certificates-20190108-r0
|
||||
ca-certificates-cacert-20190108-r0
|
||||
coreutils-8.31-r0
|
||||
curl-7.66.0-r0
|
||||
expat-2.2.7-r1
|
||||
expat-2.2.8-r0
|
||||
git-2.22.0-r0
|
||||
libacl-2.2.52-r6
|
||||
libattr-2.4.48-r0
|
||||
@@ -42,20 +42,20 @@ pcre-8.43-r0
|
||||
pcre2-10.33-r0
|
||||
php7-7.3.9-r0
|
||||
php7-common-7.3.9-r0
|
||||
php7-ctype-7.3.9-r0
|
||||
php7-ctype-7.3.10-r0
|
||||
php7-fileinfo-7.3.9-r0
|
||||
php7-fpm-7.3.9-r0
|
||||
php7-json-7.3.9-r0
|
||||
php7-mbstring-7.3.9-r0
|
||||
php7-openssl-7.3.9-r0
|
||||
php7-pdo-7.3.9-r0
|
||||
php7-pdo_sqlite-7.3.9-r0
|
||||
php7-pdo-7.3.10-r0
|
||||
php7-pdo_sqlite-7.3.10-r0
|
||||
php7-session-7.3.9-r0
|
||||
php7-simplexml-7.3.9-r0
|
||||
php7-tokenizer-7.3.9-r0
|
||||
php7-tokenizer-7.3.10-r0
|
||||
php7-xml-7.3.9-r0
|
||||
php7-xmlwriter-7.3.9-r0
|
||||
php7-zip-7.3.9-r0
|
||||
php7-zip-7.3.10-r0
|
||||
popt-1.16-r7
|
||||
readline-8.0.0-r0
|
||||
scanelf-1.2.3-r0
|
||||
|
||||
@@ -17,12 +17,6 @@ available_architectures:
|
||||
- { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
|
||||
- { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}
|
||||
|
||||
# development version
|
||||
development_versions: true
|
||||
development_versions_items:
|
||||
- { tag: "latest", desc: "Stable Heimdall releases." }
|
||||
- { tag: "development", desc: "Latest commit from the github master branch." }
|
||||
|
||||
# container parameters
|
||||
common_param_env_vars_enabled: true
|
||||
param_container_name: "{{ project_name }}"
|
||||
@@ -37,6 +31,15 @@ param_usage_include_env: true
|
||||
param_env_vars:
|
||||
- { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
|
||||
|
||||
# optional parameters
|
||||
optional_block_1: true
|
||||
optional_block_1_items:
|
||||
- |
|
||||
Using tags, you can switch between the stable releases of Heimdall and the master branch. No tag is required for the latest stable release.
|
||||
Add the development tag, if required, to the linuxserver/heimdall line of the run/create command in the following format, linuxserver/heimdall:development
|
||||
The development tag will be the latest commit in the master branch of Heimdall.
|
||||
HOWEVER , USE THE DEVELOPMENT TAG AT YOUR OWN PERIL !!!!!!!!!
|
||||
|
||||
# application setup block
|
||||
app_setup_block_enabled: true
|
||||
app_setup_block: |
|
||||
@@ -49,15 +52,10 @@ app_setup_block: |
|
||||
|
||||
# changelog
|
||||
changelogs:
|
||||
- { date: "16.07.19:", desc: "Save laravel.log to /config/log/heimdall." }
|
||||
- { date: "15.07.19:", desc: "Save laravel.log to /config, install heimdall during first start." }
|
||||
- { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
|
||||
- { date: "01.04.19:", desc: "Fix permission detect logic." }
|
||||
- { date: "26.03.19:", desc: "Install Heimdall during container start to prevent delayed start due to overlayfs bug with recursive chown." }
|
||||
- { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
|
||||
- { date: "15.03.19:", desc: "Clarify docker image tags in readme." }
|
||||
- { date: "22.02.19:", desc: "Rebasing to alpine 3.9." }
|
||||
- { date: "16.01.18:", desc: "Generate random app key in .env for new installs." }
|
||||
- { date: "20.11.18:", desc: "Upgrade baseimage packages during build." }
|
||||
- { date: "04.11.18:", desc: "Add php7-zip." }
|
||||
- { date: "31.10.18:", desc: "Add queue service." }
|
||||
- { date: "17.10.18:", desc: "Symlink avatars folder." }
|
||||
|
||||
@@ -41,12 +41,12 @@ done
|
||||
# copy .env if not exists
|
||||
[[ ! -f /config/www/.env ]] && \
|
||||
cp /var/www/localhost/heimdall/.env.example /config/www/.env && \
|
||||
echo "Creating app key. This may take a while on slower systems" && \
|
||||
echo "generating app key"
|
||||
php /var/www/localhost/heimdall/artisan key:generate
|
||||
# set queue driver to database
|
||||
sed -i 's/QUEUE_DRIVER=sync/QUEUE_DRIVER=database/' /config/www/.env
|
||||
|
||||
# permissions
|
||||
echo "Setting permissions"
|
||||
chown -R abc:abc \
|
||||
/config
|
||||
/config \
|
||||
/var/www/localhost/heimdall
|
||||
|
||||
Reference in New Issue
Block a user