Merge pull request #57 from linuxserver/master-3.11

rebase to Alpine 3.11
This commit is contained in:
saarg 2019-12-27 12:07:23 +01:00 committed by GitHub
commit c76b5c208b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 5 deletions

View File

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

View File

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

View File

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

2
Jenkinsfile vendored
View File

@ -26,7 +26,7 @@ pipeline {
DIST_IMAGE = 'alpine'
MULTIARCH='true'
CI='true'
CI_WEB='true'
CI_WEB='false'
CI_PORT='80'
CI_SSL='false'
CI_DELAY='120'

View File

@ -17,7 +17,7 @@ repo_vars:
- DIST_IMAGE = 'alpine'
- MULTIARCH='true'
- CI='true'
- CI_WEB='true'
- CI_WEB='false'
- CI_PORT='80'
- CI_SSL='false'
- CI_DELAY='120'

View File

@ -40,6 +40,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
- { date: "18.12.19:", desc: "Add php7-imap and php7-pecl-apcu." }
- { date: "13.11.19:", desc: "Add php7-pdo_odbc." }
- { date: "24.10.19:", desc: "Add php7-pecl-imagick." }