Compare commits

...

16 Commits

Author SHA1 Message Date
LinuxServer-CI
5f46d297d2 Bot Updating Package Versions 2020-09-20 23:09:29 +01:00
LinuxServer-CI
1dcc15f0c5 Bot Updating Package Versions 2020-09-06 22:13:23 +00:00
LinuxServer-CI
c1d8bade4e Bot Updating Templated Files 2020-08-23 18:08:55 -04:00
LinuxServer-CI
71f44ed146 Bot Updating Package Versions 2020-08-16 18:09:47 -04:00
LinuxServer-CI
9824d5f716 Bot Updating Package Versions 2020-08-09 22:10:03 +00:00
LinuxServer-CI
5d49ae9329 Bot Updating Templated Files 2020-08-02 18:10:12 -04:00
LinuxServer-CI
5e473711bc Bot Updating Templated Files 2020-08-02 22:09:12 +00:00
LinuxServer-CI
100fc4e247 Bot Updating Package Versions 2020-07-12 22:10:13 +00:00
LinuxServer-CI
6cd6ff764a Bot Updating Package Versions 2020-06-29 00:09:42 +02:00
LinuxServer-CI
4fe20ddce8 Bot Updating Package Versions 2020-06-21 18:09:46 -04:00
LinuxServer-CI
7b411e3cf5 Bot Updating Package Versions 2020-06-14 22:11:39 +00:00
LinuxServer-CI
1c1389aead Bot Updating Package Versions 2020-06-07 22:10:13 +00:00
LinuxServer-CI
87fbfab7af Bot Updating Package Versions 2020-06-03 20:41:20 +00:00
LinuxServer-CI
eb697e7786 Bot Updating Templated Files 2020-06-03 20:38:39 +00:00
aptalca
8627298727 Merge pull request #64 from linuxserver/development-3.12
Rebasing to Alpine 3.12
2020-06-03 16:37:26 -04:00
thelamer
fd7773896d Rebasing to Alpine 3.12 2020-06-01 12:58:21 -07:00
9 changed files with 107 additions and 63 deletions

13
.github/workflows/greetings.yml vendored Executable file
View File

@@ -0,0 +1,13 @@
name: Greetings
on: [pull_request_target, issues]
jobs:
greeting:
runs-on: ubuntu-latest
steps:
- uses: actions/first-interaction@v1
with:
issue-message: 'Thanks for opening your first issue here! Be sure to follow the [issue template](https://github.com/linuxserver/docker-heimdall/.github/ISSUE_TEMPLATE.md)!'
pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-heimdall/.github/PULL_REQUEST_TEMPLATE.md)!'
repo-token: ${{ secrets.GITHUB_TOKEN }}

23
.github/workflows/stale.yml vendored Executable file
View File

@@ -0,0 +1,23 @@
name: Mark stale issues and pull requests
on:
schedule:
- cron: "30 1 * * *"
jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v1
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."
stale-issue-label: 'no-issue-activity'
stale-pr-label: 'no-pr-activity'
days-before-stale: 30
days-before-close: 365
exempt-issue-labels: 'awaiting-approval,work-in-progress'
exempt-pr-labels: 'awaiting-approval,work-in-progress'
repo-token: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -1,4 +1,4 @@
FROM lsiobase/nginx:3.11
FROM lsiobase/nginx:3.12
# set version label
ARG BUILD_DATE

View File

@@ -1,4 +1,4 @@
FROM lsiobase/nginx:arm64v8-3.11
FROM lsiobase/nginx:arm64v8-3.12
# set version label
ARG BUILD_DATE

View File

@@ -1,4 +1,4 @@
FROM lsiobase/nginx:arm32v7-3.11
FROM lsiobase/nginx:arm32v7-3.12
# set version label
ARG BUILD_DATE

12
Jenkinsfile vendored
View File

@@ -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/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md'
env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml'
}
script{
env.LS_RELEASE_NUMBER = sh(
@@ -244,7 +244,7 @@ pipeline {
cd ${TEMPDIR}/repo/${LS_REPO}
git checkout -f development
cd ${TEMPDIR}/docker-${CONTAINER_NAME}
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/
cd ${TEMPDIR}/repo/${LS_REPO}/
git add ${TEMPLATED_FILES}
@@ -698,6 +698,10 @@ pipeline {
]
]) {
sh '''#! /bin/bash
set -e
TEMPDIR=$(mktemp -d)
docker pull 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 lsiodev/readme-sync
docker run --rm=true \
-e DOCKERHUB_USERNAME=$DOCKERUSER \
@@ -705,7 +709,9 @@ pipeline {
-e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \
-e DOCKER_REPOSITORY=${IMAGE} \
-e GIT_BRANCH=master \
lsiodev/readme-sync bash -c 'node sync' '''
-v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \
lsiodev/readme-sync bash -c 'node sync'
rm -Rf ${TEMPDIR} '''
}
}
}

View File

@@ -33,7 +33,7 @@ Find us at:
[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/heimdall)
[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/heimdall)
[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-heimdall%2Fjob%2Fdevelopment%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/development/)
[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Flsio-ci.ams3.digitaloceanspaces.com%2Flspipepr%2Fheimdall%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/heimdall/latest/index.html)
[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Flsio-ci.ams3.digitaloceanspaces.com%2Flinuxserver%2Fheimdall%2Flatest%2Fci-status.yml)](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.
@@ -229,6 +229,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **01.06.20:** - Rebasing to alpine 3.12.
* **19.12.19:** - Rebasing to alpine 3.11.
* **15.07.19:** - Save laravel.log to /config, install heimdall during first start.
* **28.06.19:** - Rebasing to alpine 3.10.

View File

@@ -1,71 +1,71 @@
alpine-baselayout-3.2.0-r3
alpine-keys-2.1-r2
apache2-utils-2.4.43-r0
apk-tools-2.10.5-r0
alpine-baselayout-3.2.0-r7
alpine-keys-2.2-r0
apache2-utils-2.4.46-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-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
libintl-0.20.1-r2
libmagic-5.37-r1
libcurl-7.69.1-r1
libedit-20191231.3.1-r0
libintl-0.20.2-r0
libmagic-5.38-r0
libproc-3.3.16-r0
libressl3.0-libcrypto-3.0.2-r0
libressl3.0-libssl-3.0.2-r0
libressl3.1-libcrypto-3.1.2-r0
libressl3.1-libssl-3.1.2-r0
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-r5
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.18-r0
php7-common-7.3.18-r0
php7-ctype-7.3.18-r0
php7-fileinfo-7.3.18-r0
php7-fpm-7.3.18-r0
php7-json-7.3.18-r0
php7-mbstring-7.3.18-r0
php7-openssl-7.3.18-r0
php7-pdo-7.3.18-r0
php7-pdo_sqlite-7.3.18-r0
php7-session-7.3.18-r0
php7-simplexml-7.3.18-r0
php7-tokenizer-7.3.18-r0
php7-xml-7.3.18-r0
php7-xmlwriter-7.3.18-r0
php7-zip-7.3.18-r0
pcre-8.44-r0
pcre2-10.35-r0
php7-7.3.22-r0
php7-common-7.3.22-r0
php7-ctype-7.3.22-r0
php7-fileinfo-7.3.22-r0
php7-fpm-7.3.22-r0
php7-json-7.3.22-r0
php7-mbstring-7.3.22-r0
php7-openssl-7.3.22-r0
php7-pdo-7.3.22-r0
php7-pdo_sqlite-7.3.22-r0
php7-session-7.3.22-r0
php7-simplexml-7.3.22-r0
php7-tokenizer-7.3.22-r0
php7-xml-7.3.22-r0
php7-xmlwriter-7.3.22-r0
php7-zip-7.3.22-r0
popt-1.16-r7
procps-3.3.16-r0
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
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

View File

@@ -52,6 +52,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "01.06.20:", desc: "Rebasing to alpine 3.12." }
- { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
- { 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." }