mirror of
https://github.com/linuxserver/docker-heimdall.git
synced 2026-04-11 13:19:46 +09:00
Compare commits
18 Commits
2.2.2-ls89
...
2.2.2-ls10
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b7e314c74f | ||
|
|
51c1b6e2c2 | ||
|
|
bf5138f275 | ||
|
|
962367e300 | ||
|
|
e50f250597 | ||
|
|
2ad2df3ade | ||
|
|
1d2349f031 | ||
|
|
f4aa6bc2fe | ||
|
|
30eed8d477 | ||
|
|
d6d4a04dd2 | ||
|
|
7e5afbabf3 | ||
|
|
51b2fb0179 | ||
|
|
c3fe331b8c | ||
|
|
e3682d08bc | ||
|
|
5d9a89615f | ||
|
|
2f79293858 | ||
|
|
c7ac2f2dbd | ||
|
|
2552f03f22 |
13
.github/workflows/greetings.yml
vendored
Executable file
13
.github/workflows/greetings.yml
vendored
Executable 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
23
.github/workflows/stale.yml
vendored
Executable 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 }}
|
||||||
@@ -15,6 +15,7 @@ RUN \
|
|||||||
apk add --no-cache --upgrade \
|
apk add --no-cache --upgrade \
|
||||||
curl \
|
curl \
|
||||||
php7-ctype \
|
php7-ctype \
|
||||||
|
php7-curl \
|
||||||
php7-pdo_pgsql \
|
php7-pdo_pgsql \
|
||||||
php7-pdo_sqlite \
|
php7-pdo_sqlite \
|
||||||
php7-tokenizer \
|
php7-tokenizer \
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ RUN \
|
|||||||
apk add --no-cache --upgrade \
|
apk add --no-cache --upgrade \
|
||||||
curl \
|
curl \
|
||||||
php7-ctype \
|
php7-ctype \
|
||||||
|
php7-curl \
|
||||||
php7-pdo_pgsql \
|
php7-pdo_pgsql \
|
||||||
php7-pdo_sqlite \
|
php7-pdo_sqlite \
|
||||||
php7-tokenizer \
|
php7-tokenizer \
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ RUN \
|
|||||||
apk add --no-cache --upgrade \
|
apk add --no-cache --upgrade \
|
||||||
curl \
|
curl \
|
||||||
php7-ctype \
|
php7-ctype \
|
||||||
|
php7-curl \
|
||||||
php7-pdo_pgsql \
|
php7-pdo_pgsql \
|
||||||
php7-pdo_sqlite \
|
php7-pdo_sqlite \
|
||||||
php7-tokenizer \
|
php7-tokenizer \
|
||||||
|
|||||||
12
Jenkinsfile
vendored
12
Jenkinsfile
vendored
@@ -58,7 +58,7 @@ pipeline {
|
|||||||
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
|
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.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
|
||||||
env.PULL_REQUEST = env.CHANGE_ID
|
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{
|
script{
|
||||||
env.LS_RELEASE_NUMBER = sh(
|
env.LS_RELEASE_NUMBER = sh(
|
||||||
@@ -244,7 +244,7 @@ pipeline {
|
|||||||
cd ${TEMPDIR}/repo/${LS_REPO}
|
cd ${TEMPDIR}/repo/${LS_REPO}
|
||||||
git checkout -f master
|
git checkout -f master
|
||||||
cd ${TEMPDIR}/docker-${CONTAINER_NAME}
|
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}/
|
cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/
|
||||||
cd ${TEMPDIR}/repo/${LS_REPO}/
|
cd ${TEMPDIR}/repo/${LS_REPO}/
|
||||||
git add ${TEMPLATED_FILES}
|
git add ${TEMPLATED_FILES}
|
||||||
@@ -698,6 +698,10 @@ pipeline {
|
|||||||
]
|
]
|
||||||
]) {
|
]) {
|
||||||
sh '''#! /bin/bash
|
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=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest
|
||||||
docker pull lsiodev/readme-sync
|
docker pull lsiodev/readme-sync
|
||||||
docker run --rm=true \
|
docker run --rm=true \
|
||||||
-e DOCKERHUB_USERNAME=$DOCKERUSER \
|
-e DOCKERHUB_USERNAME=$DOCKERUSER \
|
||||||
@@ -705,7 +709,9 @@ pipeline {
|
|||||||
-e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \
|
-e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \
|
||||||
-e DOCKER_REPOSITORY=${IMAGE} \
|
-e DOCKER_REPOSITORY=${IMAGE} \
|
||||||
-e GIT_BRANCH=master \
|
-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} '''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -232,6 +232,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
|||||||
|
|
||||||
## Versions
|
## Versions
|
||||||
|
|
||||||
|
* **17.08.20:** - Add php7-curl.
|
||||||
* **01.06.20:** - Rebasing to alpine 3.12.
|
* **01.06.20:** - Rebasing to alpine 3.12.
|
||||||
* **17.01.20:** - Use nginx from baseimage.
|
* **17.01.20:** - Use nginx from baseimage.
|
||||||
* **19.12.19:** - Rebasing to alpine 3.11.
|
* **19.12.19:** - Rebasing to alpine 3.11.
|
||||||
|
|||||||
@@ -1,16 +1,16 @@
|
|||||||
alpine-baselayout-3.2.0-r7
|
alpine-baselayout-3.2.0-r7
|
||||||
alpine-keys-2.2-r0
|
alpine-keys-2.2-r0
|
||||||
apache2-utils-2.4.43-r0
|
apache2-utils-2.4.46-r0
|
||||||
apk-tools-2.10.5-r1
|
apk-tools-2.10.5-r1
|
||||||
apr-1.7.0-r0
|
apr-1.7.0-r0
|
||||||
apr-util-1.6.1-r6
|
apr-util-1.6.1-r6
|
||||||
argon2-libs-20190702-r1
|
argon2-libs-20190702-r1
|
||||||
bash-5.0.17-r0
|
bash-5.0.17-r0
|
||||||
busybox-1.31.1-r16
|
busybox-1.31.1-r19
|
||||||
ca-certificates-20191127-r2
|
ca-certificates-20191127-r4
|
||||||
ca-certificates-bundle-20191127-r2
|
ca-certificates-bundle-20191127-r4
|
||||||
coreutils-8.32-r0
|
coreutils-8.32-r0
|
||||||
curl-7.69.1-r0
|
curl-7.69.1-r1
|
||||||
db-5.3.28-r1
|
db-5.3.28-r1
|
||||||
expat-2.2.9-r1
|
expat-2.2.9-r1
|
||||||
git-2.26.2-r0
|
git-2.26.2-r0
|
||||||
@@ -18,12 +18,12 @@ libacl-2.2.53-r0
|
|||||||
libattr-2.4.48-r0
|
libattr-2.4.48-r0
|
||||||
libc-utils-0.7.2-r3
|
libc-utils-0.7.2-r3
|
||||||
libcrypto1.1-1.1.1g-r0
|
libcrypto1.1-1.1.1g-r0
|
||||||
libcurl-7.69.1-r0
|
libcurl-7.69.1-r1
|
||||||
libedit-20191231.3.1-r0
|
libedit-20191231.3.1-r0
|
||||||
libintl-0.20.2-r0
|
libintl-0.20.2-r0
|
||||||
libldap-2.4.50-r0
|
libldap-2.4.50-r0
|
||||||
libmagic-5.38-r0
|
libmagic-5.38-r0
|
||||||
libpq-12.3-r2
|
libpq-12.4-r0
|
||||||
libproc-3.3.16-r0
|
libproc-3.3.16-r0
|
||||||
libressl3.1-libcrypto-3.1.2-r0
|
libressl3.1-libcrypto-3.1.2-r0
|
||||||
libressl3.1-libssl-3.1.2-r0
|
libressl3.1-libssl-3.1.2-r0
|
||||||
@@ -35,40 +35,41 @@ libxml2-2.9.10-r4
|
|||||||
libzip-1.6.1-r1
|
libzip-1.6.1-r1
|
||||||
linux-pam-1.3.1-r4
|
linux-pam-1.3.1-r4
|
||||||
logrotate-3.16.0-r0
|
logrotate-3.16.0-r0
|
||||||
musl-1.1.24-r8
|
musl-1.1.24-r9
|
||||||
musl-utils-1.1.24-r8
|
musl-utils-1.1.24-r9
|
||||||
nano-4.9.3-r0
|
nano-4.9.3-r0
|
||||||
ncurses-libs-6.2_p20200523-r0
|
ncurses-libs-6.2_p20200523-r0
|
||||||
ncurses-terminfo-base-6.2_p20200523-r0
|
ncurses-terminfo-base-6.2_p20200523-r0
|
||||||
nghttp2-libs-1.40.0-r0
|
nghttp2-libs-1.41.0-r0
|
||||||
nginx-1.18.0-r0
|
nginx-1.18.0-r0
|
||||||
openssl-1.1.1g-r0
|
openssl-1.1.1g-r0
|
||||||
pcre-8.44-r0
|
pcre-8.44-r0
|
||||||
pcre2-10.35-r0
|
pcre2-10.35-r0
|
||||||
php7-7.3.18-r0
|
php7-7.3.22-r0
|
||||||
php7-common-7.3.18-r0
|
php7-common-7.3.22-r0
|
||||||
php7-ctype-7.3.18-r0
|
php7-ctype-7.3.22-r0
|
||||||
php7-fileinfo-7.3.18-r0
|
php7-curl-7.3.22-r0
|
||||||
php7-fpm-7.3.18-r0
|
php7-fileinfo-7.3.22-r0
|
||||||
php7-json-7.3.18-r0
|
php7-fpm-7.3.22-r0
|
||||||
php7-mbstring-7.3.18-r0
|
php7-json-7.3.22-r0
|
||||||
php7-openssl-7.3.18-r0
|
php7-mbstring-7.3.22-r0
|
||||||
php7-pdo-7.3.18-r0
|
php7-openssl-7.3.22-r0
|
||||||
php7-pdo_pgsql-7.3.18-r0
|
php7-pdo-7.3.22-r0
|
||||||
php7-pdo_sqlite-7.3.18-r0
|
php7-pdo_pgsql-7.3.22-r0
|
||||||
php7-session-7.3.18-r0
|
php7-pdo_sqlite-7.3.22-r0
|
||||||
php7-simplexml-7.3.18-r0
|
php7-session-7.3.22-r0
|
||||||
php7-tokenizer-7.3.18-r0
|
php7-simplexml-7.3.22-r0
|
||||||
php7-xml-7.3.18-r0
|
php7-tokenizer-7.3.22-r0
|
||||||
php7-xmlwriter-7.3.18-r0
|
php7-xml-7.3.22-r0
|
||||||
php7-zip-7.3.18-r0
|
php7-xmlwriter-7.3.22-r0
|
||||||
|
php7-zip-7.3.22-r0
|
||||||
popt-1.16-r7
|
popt-1.16-r7
|
||||||
procps-3.3.16-r0
|
procps-3.3.16-r0
|
||||||
readline-8.0.4-r0
|
readline-8.0.4-r0
|
||||||
scanelf-1.2.6-r0
|
scanelf-1.2.6-r0
|
||||||
shadow-4.8.1-r0
|
shadow-4.8.1-r0
|
||||||
sqlite-libs-3.32.1-r0
|
sqlite-libs-3.32.1-r0
|
||||||
ssl_client-1.31.1-r16
|
ssl_client-1.31.1-r19
|
||||||
tar-1.32-r1
|
tar-1.32-r1
|
||||||
tzdata-2020a-r0
|
tzdata-2020a-r0
|
||||||
xz-5.2.5-r0
|
xz-5.2.5-r0
|
||||||
|
|||||||
@@ -49,6 +49,7 @@ app_setup_block: |
|
|||||||
|
|
||||||
# changelog
|
# changelog
|
||||||
changelogs:
|
changelogs:
|
||||||
|
- { date: "17.08.20:", desc: "Add php7-curl." }
|
||||||
- { date: "01.06.20:", desc: "Rebasing to alpine 3.12." }
|
- { date: "01.06.20:", desc: "Rebasing to alpine 3.12." }
|
||||||
- { date: "17.01.20:", desc: "Use nginx from baseimage." }
|
- { date: "17.01.20:", desc: "Use nginx from baseimage." }
|
||||||
- { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
|
- { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
|
||||||
|
|||||||
Reference in New Issue
Block a user