Skip to content

Commit 4a5d690

Browse files
authored
Merge pull request #8 from linuxserver/master-3.11
Rebasing to Alpine 3.11
2 parents c54be4d + 31738b1 commit 4a5d690

File tree

6 files changed

+6
-5
lines changed

6 files changed

+6
-5
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM lsiobase/nginx:3.10
1+
FROM lsiobase/nginx:3.11
22

33
# set version label
44
ARG BUILD_DATE

Dockerfile.aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM lsiobase/nginx:arm64v8-3.10
1+
FROM lsiobase/nginx:arm64v8-3.11
22

33
# set version label
44
ARG BUILD_DATE

Dockerfile.armhf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM lsiobase/nginx:arm32v7-3.10
1+
FROM lsiobase/nginx:arm32v7-3.11
22

33
# set version label
44
ARG BUILD_DATE

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pipeline {
2626
DIST_IMAGE = 'alpine'
2727
MULTIARCH='true'
2828
CI='true'
29-
CI_WEB='true'
29+
CI_WEB='false'
3030
CI_PORT='80'
3131
CI_SSL='false'
3232
CI_DELAY='120'

jenkins-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ repo_vars:
1818
- DIST_IMAGE = 'alpine'
1919
- MULTIARCH='true'
2020
- CI='true'
21-
- CI_WEB='true'
21+
- CI_WEB='false'
2222
- CI_PORT='80'
2323
- CI_SSL='false'
2424
- CI_DELAY='120'

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,6 @@ app_setup_block: |
4040
Upon first install go to `http://$IP:$PORT/install.php` once you have completed the setup, restart the container, login as admin and set "Use nice URLs" in the `admin/Configuration Settings` panel to `.htaccess` and tick `Use slash as namespace separator in URLs` to enable [nice URLs](https://www.dokuwiki.org/rewrite) you will find the webui at `http://$IP:$PORT/`, for more info see [{{ project_name|capitalize }}]({{ project_url }})
4141
# changelog
4242
changelogs:
43+
- { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
4344
- { date: "01.12.19:", desc: "Add php7-ldap package to support LDAP authentication." }
4445
- { date: "28.05.19:", desc: "Initial Release." }

0 commit comments

Comments
 (0)