Skip to content
This repository was archived by the owner on Jan 6, 2021. It is now read-only.

Commit 85724c3

Browse files
authored
Merge pull request #332 from linuxserver/master-3.10
Rebasing to Alpine 3.10
2 parents dc99f2b + 20d4e96 commit 85724c3

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM lsiobase/nginx:3.9
1+
FROM lsiobase/nginx:3.10
22

33
# set version label
44
ARG BUILD_DATE

Dockerfile.aarch64

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM lsiobase/nginx:arm64v8-3.9
1+
FROM lsiobase/nginx:arm64v8-3.10
22

33
# set version label
44
ARG BUILD_DATE

Dockerfile.armhf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM lsiobase/nginx:arm32v7-3.9
1+
FROM lsiobase/nginx:arm32v7-3.10
22

33
# set version label
44
ARG BUILD_DATE

readme-vars.yml

+1
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ app_setup_nginx_reverse_proxy_block: ""
126126

127127
# changelog
128128
changelogs:
129+
- { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
129130
- { date: "19.06.19:", desc: "Set resolver to docker dns in ssl.conf." }
130131
- { date: "29.05.19:", desc: "Compensate for changes to the reverse-proxy-confs repo." }
131132
- { date: "26.05.19:", desc: "Remove botocore/urllib patch." }

0 commit comments

Comments
 (0)