Compare commits

...

15 Commits

Author SHA1 Message Date
LinuxServer-CI
51d66e0ea6 Bot Updating Package Versions 2019-03-03 23:12:33 +00:00
LinuxServer-CI
3a00115c88 Bot Updating Templated Files 2019-03-03 18:08:43 -05:00
LinuxServer-CI
17655d12fe Bot Updating Package Versions 2019-02-24 05:28:02 +00:00
LinuxServer-CI
225302baf6 Bot Updating Templated Files 2019-02-24 05:23:29 +00:00
aptalca
9883c65f4f Merge pull request #38 from linuxserver/development-3.9
Rebasing to Alpine 3.9
2019-02-24 00:22:48 -05:00
thelamer
c4716c464d Rebasing to Alpine 3.9 2019-02-22 17:23:46 -08:00
LinuxServer-CI
d51600ca8e Bot Updating Package Versions 2019-02-04 09:02:14 +00:00
LinuxServer-CI
f0ed8c45ca Bot Updating Package Versions 2019-01-18 09:18:15 -05:00
LinuxServer-CI
c92bccc89e Bot Updating Package Versions 2019-01-15 15:33:05 +00:00
LinuxServer-CI
509bb4358d Bot Updating Templated Files 2019-01-15 15:28:57 +00:00
LinuxServer-CI
80a0db2aaf Bot Updating Package Versions 2019-01-07 08:33:19 +00:00
LinuxServer-CI
579f419f1f Bot Updating Templated Files 2019-01-07 08:29:18 +00:00
chbmb
2883d89040 Merge pull request #29 from linuxserver/dev-appkey
copy env from example, generate appkey
2019-01-04 15:11:14 +00:00
aptalca
5786b2ff61 fix artisan location 2019-01-04 08:52:49 -05:00
aptalca
292f434ca1 copy env from example, generate appkey 2019-01-04 06:24:02 -05:00
8 changed files with 168 additions and 94 deletions

View File

@@ -1,4 +1,4 @@
FROM lsiobase/alpine.nginx:3.8 FROM lsiobase/alpine.nginx:3.9
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE

View File

@@ -1,4 +1,4 @@
FROM lsiobase/alpine.nginx.arm64:3.8 FROM lsiobase/alpine.nginx.arm64:3.9
# Add qemu to build on x86_64 systems # Add qemu to build on x86_64 systems
COPY qemu-aarch64-static /usr/bin COPY qemu-aarch64-static /usr/bin

View File

@@ -1,4 +1,4 @@
FROM lsiobase/alpine.nginx.armhf:3.8 FROM lsiobase/alpine.nginx.armhf:3.9
# Add qemu to build on x86_64 systems # Add qemu to build on x86_64 systems
COPY qemu-arm-static /usr/bin COPY qemu-arm-static /usr/bin

69
Jenkinsfile vendored
View File

@@ -41,7 +41,7 @@ pipeline {
script: '''curl -s https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases | jq -r 'first(.[] | select(.prerelease == true)) | .tag_name' ''', script: '''curl -s https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases | jq -r 'first(.[] | select(.prerelease == true)) | .tag_name' ''',
returnStdout: true).trim() returnStdout: true).trim()
env.LS_RELEASE_NOTES = sh( env.LS_RELEASE_NOTES = sh(
script: '''git log -1 --pretty=%B | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''', 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' ''',
returnStdout: true).trim() returnStdout: true).trim()
env.GITHUB_DATE = sh( env.GITHUB_DATE = sh(
script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''', script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''',
@@ -82,14 +82,10 @@ pipeline {
script{ script{
env.PACKAGE_TAG = sh( env.PACKAGE_TAG = sh(
script: '''#!/bin/bash script: '''#!/bin/bash
http_code=$(curl --write-out %{http_code} -s -o /dev/null \ if [ -e package_versions.txt ] ; then
https://raw.githubusercontent.com/${LS_USER}/${LS_REPO}/development/package_versions.txt) cat package_versions.txt | md5sum | cut -c1-8
if [[ "${http_code}" -ne 200 ]] ; then
echo none
else else
curl -s \ echo none
https://raw.githubusercontent.com/${LS_USER}/${LS_REPO}/development/package_versions.txt \
| md5sum | cut -c1-8
fi''', fi''',
returnStdout: true).trim() returnStdout: true).trim()
} }
@@ -121,7 +117,7 @@ pipeline {
steps{ steps{
script{ script{
env.EXT_RELEASE_CLEAN = sh( env.EXT_RELEASE_CLEAN = sh(
script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:]//g' ''', script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''',
returnStdout: true).trim() returnStdout: true).trim()
} }
} }
@@ -213,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(
@@ -287,6 +292,9 @@ pipeline {
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
sh "docker tag ${IMAGE}:arm32v6-${META_TAG} lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}" sh "docker tag ${IMAGE}:arm32v6-${META_TAG} lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}"
sh "docker push lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}" sh "docker push lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}"
sh '''docker rmi \
${IMAGE}:arm32v6-${META_TAG} \
lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} '''
} }
} }
} }
@@ -313,6 +321,9 @@ pipeline {
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
sh '''docker rmi \
${IMAGE}:arm64v8-${META_TAG} \
lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} '''
} }
} }
} }
@@ -342,20 +353,25 @@ pipeline {
chmod 777 /tmp/package_versions.txt' chmod 777 /tmp/package_versions.txt'
elif [ "${DIST_IMAGE}" == "ubuntu" ]; then elif [ "${DIST_IMAGE}" == "ubuntu" ]; then
docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
apt -qq list --installed | awk "{print \$1,\$2}" > /tmp/package_versions.txt && \ apt list -qq --installed > /tmp/package_versions.txt && \
chmod 777 /tmp/package_versions.txt' chmod 777 /tmp/package_versions.txt'
fi fi
if [ "$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )" != "${PACKAGE_TAG}" ]; then 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"
if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO} git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f development git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f development
cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/ cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
cd ${TEMPDIR}/${LS_REPO}/ cd ${TEMPDIR}/${LS_REPO}/
git --git-dir ${TEMPDIR}/${LS_REPO}/.git add package_versions.txt wait
git --git-dir ${TEMPDIR}/${LS_REPO}/.git commit -m 'Bot Updating Package Versions' git add package_versions.txt
git --git-dir ${TEMPDIR}/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all git commit -m 'Bot Updating Package Versions'
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}
echo "Package tag updated, stopping build process"
else else
echo "false" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} echo "false" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}
echo "Package tag is same as previous continue with build process"
fi fi
rm -Rf ${TEMPDIR}''' rm -Rf ${TEMPDIR}'''
script{ script{
@@ -469,6 +485,10 @@ pipeline {
sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:development" sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:development"
sh "docker push ${IMAGE}:development" sh "docker push ${IMAGE}:development"
sh "docker push ${IMAGE}:${META_TAG}" sh "docker push ${IMAGE}:${META_TAG}"
sh '''docker rmi \
${IMAGE}:${META_TAG} \
${IMAGE}:development '''
} }
} }
} }
@@ -516,6 +536,15 @@ pipeline {
sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8" sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8"
sh "docker manifest push --purge ${IMAGE}:development" sh "docker manifest push --purge ${IMAGE}:development"
sh "docker manifest push --purge ${IMAGE}:${META_TAG}" sh "docker manifest push --purge ${IMAGE}:${META_TAG}"
sh '''docker rmi \
${IMAGE}:amd64-${META_TAG} \
${IMAGE}:amd64-development \
${IMAGE}:arm32v6-${META_TAG} \
${IMAGE}:arm32v6-development \
${IMAGE}:arm64v8-${META_TAG} \
${IMAGE}:arm64v8-development \
lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} \
lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} '''
} }
} }
} }
@@ -576,6 +605,18 @@ pipeline {
} }
} }
} }
// If this is a Pull request send the CI link as a comment on it
stage('Pull Request Comment') {
when {
not {environment name: 'CHANGE_ID', value: ''}
environment name: 'CI', value: 'true'
environment name: 'EXIT_STATUS', value: ''
}
steps {
sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/issues/${PULL_REQUEST}/comments \
-d '{"body": "I am a bot, here are the test results for this PR '${CI_URL}'"}' '''
}
}
} }
/* ###################### /* ######################
Send status to Discord Send status to Discord

View File

@@ -14,18 +14,14 @@ 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! * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more!
* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018). * [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018).
# PSA: Changes are happening
From August 2018 onwards, Linuxserver are in the midst of switching to a new CI platform which will enable us to build and release multiple architectures under a single repo. To this end, existing images for `arm64` and `armhf` builds are being deprecated. They are replaced by a manifest file in each container which automatically pulls the correct image for your architecture. You'll also be able to pull based on a specific architecture tag.
TLDR: Multi-arch support is changing from multiple repos to one repo per container image.
# [linuxserver/heimdall](https://github.com/linuxserver/docker-heimdall) # [linuxserver/heimdall](https://github.com/linuxserver/docker-heimdall)
[![](https://img.shields.io/discord/354974912613449730.svg?logo=discord&label=LSIO%20Discord&style=flat-square)](https://discord.gg/YWrKVTn) [![](https://img.shields.io/discord/354974912613449730.svg?logo=discord&label=LSIO%20Discord&style=flat-square)](https://discord.gg/YWrKVTn)
[![](https://images.microbadger.com/badges/version/linuxserver/heimdall.svg)](https://microbadger.com/images/linuxserver/heimdall "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/version/linuxserver/heimdall.svg)](https://microbadger.com/images/linuxserver/heimdall "Get your own version badge on microbadger.com")
[![](https://images.microbadger.com/badges/image/linuxserver/heimdall.svg)](https://microbadger.com/images/linuxserver/heimdall "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/image/linuxserver/heimdall.svg)](https://microbadger.com/images/linuxserver/heimdall "Get your own version badge on microbadger.com")
![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/heimdall.svg) ![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/heimdall.svg)
![Docker Stars](https://img.shields.io/docker/stars/linuxserver/heimdall.svg) ![Docker Stars](https://img.shields.io/docker/stars/linuxserver/heimdall.svg)
[![Build Status](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Pipeline-Builders/docker-heimdall/master)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/)
[![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/heimdall/latest/badge.svg)](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.
@@ -35,7 +31,9 @@ Why not use it as your browser start page? It even has the ability to include a
## Supported Architectures ## Supported Architectures
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) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
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:
@@ -45,6 +43,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.
@@ -54,8 +53,8 @@ Here are some example snippets to help you get started creating a container.
``` ```
docker create \ docker create \
--name=heimdall \ --name=heimdall \
-e PUID=1001 \ -e PUID=1000 \
-e PGID=1001 \ -e PGID=1000 \
-e TZ=Europe/London \ -e TZ=Europe/London \
-p 80:80 \ -p 80:80 \
-p 443:443 \ -p 443:443 \
@@ -82,15 +81,14 @@ services:
image: linuxserver/heimdall image: linuxserver/heimdall
container_name: heimdall container_name: heimdall
environment: environment:
- PUID=1001 - PUID=1000
- PGID=1001 - PGID=1000
- TZ=Europe/London - TZ=Europe/London
volumes: volumes:
- </path/to/appdata/config>:/config - </path/to/appdata/config>:/config
ports: ports:
- 80:80 - 80:80
- 443:443 - 443:443
mem_limit: 4096m
restart: unless-stopped restart: unless-stopped
``` ```
@@ -102,8 +100,8 @@ Container images are configured using parameters passed at runtime (such as thos
| :----: | --- | | :----: | --- |
| `-p 80` | http gui | | `-p 80` | http gui |
| `-p 443` | https gui | | `-p 443` | https gui |
| `-e PUID=1001` | for UserID - see below for explanation | | `-e PUID=1000` | for UserID - see below for explanation |
| `-e PGID=1001` | for GroupID - see below for explanation | | `-e PGID=1000` | for GroupID - see below for explanation |
| `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London | | `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London |
| `-v /config` | Contains all relevant configuration files. | | `-v /config` | Contains all relevant configuration files. |
@@ -113,13 +111,14 @@ When using volumes (`-v` flags) permissions issues can arise between the host OS
Ensure any volume directories on the host are owned by the same user you specify and any permissions issues will vanish like magic. Ensure any volume directories on the host are owned by the same user you specify and any permissions issues will vanish like magic.
In this instance `PUID=1001` and `PGID=1001`, to find yours use `id user` as below: In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below:
``` ```
$ id username $ id username
uid=1001(dockeruser) gid=1001(dockergroup) groups=1001(dockergroup) uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
``` ```
&nbsp; &nbsp;
## Application Setup ## Application Setup
@@ -141,8 +140,39 @@ 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 Taisun auto-updater (especially useful if you don't remember the original parameters)
* Pull the latest image at its tag and replace it with the same env variables in one shot:
```
docker run --rm \
-v /var/run/docker.sock:/var/run/docker.sock taisun/updater \
--oneshot heimdall
```
* You can also remove the old dangling images: `docker image prune`
### Via Docker Compose
* Update all images: `docker-compose pull`
* or update a single image: `docker-compose pull heimdall`
* Let compose update all containers as necessary: `docker-compose up -d`
* or update a single container: `docker-compose up -d heimdall`
* You can also remove the old dangling images: `docker image prune`
## Versions ## Versions
* **22.02.19:** - Rebasing to alpine 3.9.
* **04.11.18:** - Add php7-zip. * **04.11.18:** - Add php7-zip.
* **31.10.18:** - Add queue service. * **31.10.18:** - Add queue service.
* **17.10.18:** - Symlink avatars folder. * **17.10.18:** - Symlink avatars folder.

View File

@@ -1,68 +1,69 @@
musl musl-1.1.19-r10 musl musl-1.1.20-r3
busybox busybox-1.28.4-r2 busybox busybox-1.29.3-r10
alpine-baselayout alpine-baselayout-3.1.0-r0 alpine-baselayout alpine-baselayout-3.1.0-r3
alpine-keys alpine-keys-2.1-r1 alpine-keys alpine-keys-2.1-r1
libressl2.7-libcrypto libressl2.7-libcrypto-2.7.4-r0 libcrypto1.1 libcrypto1.1-1.1.1a-r1
libressl2.7-libssl libressl2.7-libssl-2.7.4-r0 libssl1.1 libssl1.1-1.1.1a-r1
libressl2.7-libtls libressl2.7-libtls-2.7.4-r0 ca-certificates-cacert ca-certificates-cacert-20190108-r0
ssl_client ssl_client-1.28.4-r2 libtls-standalone libtls-standalone-2.7.4-r6
ssl_client ssl_client-1.29.3-r10
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.3-r1
scanelf scanelf-1.2.3-r0 scanelf scanelf-1.2.3-r0
musl-utils musl-utils-1.1.19-r10 musl-utils musl-utils-1.1.20-r3
libc-utils libc-utils-0.7.1-r0 libc-utils libc-utils-0.7.1-r0
xz-libs xz-libs-5.2.4-r0 xz-libs xz-libs-5.2.4-r0
xz xz-5.2.4-r0 xz xz-5.2.4-r0
ca-certificates ca-certificates-20171114-r3 ca-certificates ca-certificates-20190108-r0
ncurses-terminfo-base ncurses-terminfo-base-6.1_p20180818-r1 ncurses-terminfo-base ncurses-terminfo-base-6.1_p20190105-r0
ncurses-terminfo ncurses-terminfo-6.1_p20180818-r1 ncurses-terminfo ncurses-terminfo-6.1_p20190105-r0
ncurses-libs ncurses-libs-6.1_p20180818-r1 ncurses-libs ncurses-libs-6.1_p20190105-r0
readline readline-7.0.003-r0 readline readline-7.0.003-r1
bash bash-4.4.19-r1 bash bash-4.4.19-r1
libattr libattr-2.4.47-r7 libattr libattr-2.4.47-r7
libacl libacl-2.2.52-r5 libacl libacl-2.2.52-r5
coreutils coreutils-8.29-r2 coreutils coreutils-8.30-r0
linux-pam linux-pam-1.3.0-r0 linux-pam linux-pam-1.3.0-r0
shadow shadow-4.5-r0 shadow shadow-4.5-r0
tzdata tzdata-2018f-r0 tzdata tzdata-2018i-r0
libuuid libuuid-2.32-r0 libuuid libuuid-2.33-r0
apr apr-1.6.3-r1 apr apr-1.6.5-r0
expat expat-2.2.5-r0 expat expat-2.2.6-r0
apr-util apr-util-1.6.1-r2 apr-util apr-util-1.6.1-r5
apache2-utils apache2-utils-2.4.35-r0 apache2-utils apache2-utils-2.4.38-r2
nghttp2-libs nghttp2-libs-1.32.0-r0 nghttp2-libs nghttp2-libs-1.35.1-r0
libssh2 libssh2-1.8.0-r3 libssh2 libssh2-1.8.0-r4
libcurl libcurl-7.61.1-r1 libcurl libcurl-7.64.0-r1
pcre2 pcre2-10.31-r0 pcre2 pcre2-10.32-r1
git git-2.18.1-r0 git git-2.20.1-r0
libressl2.7-libcrypto libressl2.7-libcrypto-2.7.5-r0
libressl2.7-libssl libressl2.7-libssl-2.7.5-r0
popt popt-1.16-r7 popt popt-1.16-r7
logrotate logrotate-3.14.0-r0 logrotate logrotate-3.15.0-r0
libmagic libmagic-5.32-r0 libmagic libmagic-5.35-r0
nano nano-2.9.8-r0 nano nano-3.2-r0
pcre pcre-8.42-r0 pcre pcre-8.42-r1
nginx nginx-1.14.2-r0 nginx nginx-1.14.2-r0
libcrypto1.0 libcrypto1.0-1.0.2q-r0 openssl openssl-1.1.1a-r1
libssl1.0 libssl1.0-1.0.2q-r0 php7-common php7-common-7.2.14-r0
openssl openssl-1.0.2q-r0 libedit libedit-20181209.3.1-r0
php7-common php7-common-7.2.13-r0 libxml2 libxml2-2.9.9-r1
libedit libedit-20170329.3.1-r3 php7 php7-7.2.14-r0
libxml2 libxml2-2.9.8-r1 php7-fileinfo php7-fileinfo-7.2.14-r0
php7 php7-7.2.13-r0 php7-fpm php7-fpm-7.2.14-r0
php7-fileinfo php7-fileinfo-7.2.13-r0 php7-json php7-json-7.2.14-r0
php7-fpm php7-fpm-7.2.13-r0 php7-mbstring php7-mbstring-7.2.14-r0
php7-json php7-json-7.2.13-r0 php7-openssl php7-openssl-7.2.14-r0
php7-mbstring php7-mbstring-7.2.13-r0 php7-session php7-session-7.2.14-r0
php7-openssl php7-openssl-7.2.13-r0 php7-simplexml php7-simplexml-7.2.14-r0
php7-session php7-session-7.2.13-r0 php7-xml php7-xml-7.2.14-r0
php7-simplexml php7-simplexml-7.2.13-r0 php7-xmlwriter php7-xmlwriter-7.2.14-r0
php7-xml php7-xml-7.2.13-r0 curl curl-7.64.0-r1
php7-xmlwriter php7-xmlwriter-7.2.13-r0 php7-ctype php7-ctype-7.2.14-r0
curl curl-7.61.1-r1 php7-pdo php7-pdo-7.2.14-r0
php7-ctype php7-ctype-7.2.13-r0 sqlite-libs sqlite-libs-3.26.0-r3
php7-pdo php7-pdo-7.2.13-r0 php7-pdo_sqlite php7-pdo_sqlite-7.2.14-r0
sqlite-libs sqlite-libs-3.25.3-r0 php7-tokenizer php7-tokenizer-7.2.14-r0
php7-pdo_sqlite php7-pdo_sqlite-7.2.13-r0 libzip libzip-1.5.1-r2
php7-tokenizer php7-tokenizer-7.2.13-r0 php7-zip php7-zip-7.2.14-r0
libzip libzip-1.5.1-r1 tar tar-1.32-r0
php7-zip php7-zip-7.2.13-r0
tar tar-1.30-r0

View File

@@ -52,6 +52,7 @@ app_setup_block: |
# changelog # changelog
changelogs: changelogs:
- { date: "22.02.19:", desc: "Rebasing to alpine 3.9." }
- { date: "04.11.18:", desc: "Add php7-zip." } - { date: "04.11.18:", desc: "Add php7-zip." }
- { date: "31.10.18:", desc: "Add queue service." } - { date: "31.10.18:", desc: "Add queue service." }
- { date: "17.10.18:", desc: "Symlink avatars folder." } - { date: "17.10.18:", desc: "Symlink avatars folder." }

View File

@@ -4,12 +4,6 @@
mkdir -p \ mkdir -p \
/config/www/{backgrounds,icons,avatars,SupportedApps} /config/www/{backgrounds,icons,avatars,SupportedApps}
# copy .env if not exists
[[ ! -f /config/www/.env ]] && \
cp /var/www/localhost/heimdall/.env /config/www/.env
# set queue driver to database
sed -i 's/QUEUE_DRIVER=sync/QUEUE_DRIVER=database/' /config/www/.env
# create symlinks # create symlinks
symlinks=( \ symlinks=( \
@@ -26,6 +20,13 @@ do
[[ ! -L "$i" ]] && ln -s /config/www/"$(basename "$i")" "$i" [[ ! -L "$i" ]] && ln -s /config/www/"$(basename "$i")" "$i"
done done
# copy .env if not exists
[[ ! -f /config/www/.env ]] && \
cp /var/www/localhost/heimdall/.env.example /config/www/.env && \
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 # permissions
chown -R abc:abc \ chown -R abc:abc \
/config \ /config \