Skip to content

Commit 04a2890

Browse files
authored
Merge pull request #30 from linuxserver/master-3.10
Rebasing to Alpine 3.10
2 parents 58379b9 + ce15aad commit 04a2890

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM lsiobase/alpine:3.9 as buildstage
1+
FROM lsiobase/alpine:3.10 as buildstage
22

33
# build variables
44
ARG SYNCTHING_RELEASE
@@ -35,7 +35,7 @@ echo "**** fetch source code ****" && \
3535
build syncthing
3636

3737
############## runtime stage ##############
38-
FROM lsiobase/alpine:3.9
38+
FROM lsiobase/alpine:3.10
3939

4040
# set version label
4141
ARG BUILD_DATE

Dockerfile.aarch64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM lsiobase/alpine:arm64v8-3.9 as buildstage
1+
FROM lsiobase/alpine:arm64v8-3.10 as buildstage
22

33
# build variables
44
ARG SYNCTHING_RELEASE
@@ -35,7 +35,7 @@ echo "**** fetch source code ****" && \
3535
build syncthing
3636

3737
############## runtime stage ##############
38-
FROM lsiobase/alpine:arm64v8-3.9
38+
FROM lsiobase/alpine:arm64v8-3.10
3939

4040
# set version label
4141
ARG BUILD_DATE

Dockerfile.armhf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM lsiobase/alpine:arm32v7-3.9 as buildstage
1+
FROM lsiobase/alpine:arm32v7-3.10 as buildstage
22

33
# build variables
44
ARG SYNCTHING_RELEASE
@@ -35,7 +35,7 @@ echo "**** fetch source code ****" && \
3535
build syncthing
3636

3737
############## runtime stage ##############
38-
FROM lsiobase/alpine:arm32v7-3.9
38+
FROM lsiobase/alpine:arm32v7-3.10
3939

4040
# set version label
4141
ARG BUILD_DATE

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ app_setup_nginx_reverse_proxy_block: ""
4040
# changelog
4141

4242
changelogs:
43+
- { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
4344
- { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
4445
- { date: "05.03.19:", desc: "Update Build process for v1.1.0 release." }
4546
- { date: "22.02.19:", desc: "Rebasing to alpine 3.9." }

0 commit comments

Comments
 (0)