Compare commits

...

16 Commits

Author SHA1 Message Date
LinuxServer-CI
03900b83f5 Bot Updating Package Versions 2020-09-26 00:00:13 +00:00
LinuxServer-CI
b7e314c74f Bot Updating Package Versions 2020-09-18 23:56:40 +00:00
LinuxServer-CI
51c1b6e2c2 Bot Updating Package Versions 2020-09-12 00:56:37 +01:00
LinuxServer-CI
bf5138f275 Bot Updating Package Versions 2020-09-04 23:56:15 +00:00
LinuxServer-CI
962367e300 Bot Updating Templated Files 2020-08-21 19:54:56 -04:00
LinuxServer-CI
e50f250597 Bot Updating Package Versions 2020-08-17 10:55:23 -04:00
LinuxServer-CI
2ad2df3ade Bot Updating Templated Files 2020-08-17 14:53:32 +00:00
aptalca
1d2349f031 Merge pull request #67 from divialth/curl
added php7-curl for http_proxy ENV support
2020-08-17 10:51:59 -04:00
divialth
f4aa6bc2fe Updated Changelog 2020-08-17 16:29:47 +02:00
divialth
30eed8d477 added php7-curl 2020-08-17 12:08:42 +02:00
LinuxServer-CI
d6d4a04dd2 Bot Updating Package Versions 2020-08-14 23:56:49 +00:00
LinuxServer-CI
7e5afbabf3 Bot Updating Package Versions 2020-08-07 23:58:25 +00:00
LinuxServer-CI
51b2fb0179 Bot Updating Templated Files 2020-08-07 23:56:07 +00:00
LinuxServer-CI
c3fe331b8c Bot Updating Templated Files 2020-08-07 23:54:50 +00:00
LinuxServer-CI
e3682d08bc Bot Updating Package Versions 2020-07-17 19:55:50 -04:00
LinuxServer-CI
5d9a89615f Bot Updating Package Versions 2020-06-27 00:57:08 +01:00
9 changed files with 75 additions and 27 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

@@ -15,6 +15,7 @@ RUN \
apk add --no-cache --upgrade \
curl \
php7-ctype \
php7-curl \
php7-pdo_pgsql \
php7-pdo_sqlite \
php7-tokenizer \

View File

@@ -15,6 +15,7 @@ RUN \
apk add --no-cache --upgrade \
curl \
php7-ctype \
php7-curl \
php7-pdo_pgsql \
php7-pdo_sqlite \
php7-tokenizer \

View File

@@ -15,6 +15,7 @@ RUN \
apk add --no-cache --upgrade \
curl \
php7-ctype \
php7-curl \
php7-pdo_pgsql \
php7-pdo_sqlite \
php7-tokenizer \

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 master
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=master -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

@@ -232,6 +232,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **17.08.20:** - Add php7-curl.
* **01.06.20:** - Rebasing to alpine 3.12.
* **17.01.20:** - Use nginx from baseimage.
* **19.12.19:** - Rebasing to alpine 3.11.

View File

@@ -1,6 +1,6 @@
alpine-baselayout-3.2.0-r7
alpine-keys-2.2-r0
apache2-utils-2.4.43-r0
apache2-utils-2.4.46-r0
apk-tools-2.10.5-r1
apr-1.7.0-r0
apr-util-1.6.1-r6
@@ -10,7 +10,7 @@ busybox-1.31.1-r19
ca-certificates-20191127-r4
ca-certificates-bundle-20191127-r4
coreutils-8.32-r0
curl-7.69.1-r0
curl-7.69.1-r1
db-5.3.28-r1
expat-2.2.9-r1
git-2.26.2-r0
@@ -18,12 +18,12 @@ libacl-2.2.53-r0
libattr-2.4.48-r0
libc-utils-0.7.2-r3
libcrypto1.1-1.1.1g-r0
libcurl-7.69.1-r0
libcurl-7.69.1-r1
libedit-20191231.3.1-r0
libintl-0.20.2-r0
libldap-2.4.50-r0
libmagic-5.38-r0
libpq-12.3-r2
libpq-12.4-r0
libproc-3.3.16-r0
libressl3.1-libcrypto-3.1.2-r0
libressl3.1-libssl-3.1.2-r0
@@ -31,12 +31,12 @@ libsasl-2.1.27-r6
libssl1.1-1.1.1g-r0
libtls-standalone-2.9.1-r1
libuuid-2.35.2-r0
libxml2-2.9.10-r4
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-r8
musl-utils-1.1.24-r8
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
@@ -45,23 +45,24 @@ nginx-1.18.0-r0
openssl-1.1.1g-r0
pcre-8.44-r0
pcre2-10.35-r0
php7-7.3.19-r0
php7-common-7.3.19-r0
php7-ctype-7.3.19-r0
php7-fileinfo-7.3.19-r0
php7-fpm-7.3.19-r0
php7-json-7.3.19-r0
php7-mbstring-7.3.19-r0
php7-openssl-7.3.19-r0
php7-pdo-7.3.19-r0
php7-pdo_pgsql-7.3.19-r0
php7-pdo_sqlite-7.3.19-r0
php7-session-7.3.19-r0
php7-simplexml-7.3.19-r0
php7-tokenizer-7.3.19-r0
php7-xml-7.3.19-r0
php7-xmlwriter-7.3.19-r0
php7-zip-7.3.19-r0
php7-7.3.22-r0
php7-common-7.3.22-r0
php7-ctype-7.3.22-r0
php7-curl-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_pgsql-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.4-r0

View File

@@ -49,6 +49,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "17.08.20:", desc: "Add php7-curl." }
- { date: "01.06.20:", desc: "Rebasing to alpine 3.12." }
- { date: "17.01.20:", desc: "Use nginx from baseimage." }
- { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }