Merge pull request #166 from linuxserver/master-3.12

rebasing to alpine 3.12

Dockerfile

@@ -1,4 +1,4 @@
-FROM lsiobase/alpine:3.11 as buildstage
+FROM lsiobase/alpine:3.12 as buildstage
 ############## build stage ##############
 
 # package versions
@@ -103,7 +103,7 @@ RUN \
 	perl-xml-writer \
 	pkgconf \
 	pngquant \
-	python \
+	python2 \
 	sdl-dev \
 	tar \
 	uriparser-dev \
@@ -221,7 +221,7 @@ RUN \
  make DESTDIR=/tmp/comskip-build install
 
 ############## runtime stage ##############
-FROM lsiobase/alpine:3.11
+FROM lsiobase/alpine:3.12
 
 # set version label
 ARG BUILD_DATE
@@ -312,7 +312,7 @@ RUN \
 	perl-xml-twig \
 	perl-xml-writer \
 	py3-requests \
-	python \
+	python2 \
 	tar \
 	uriparser \
 	wget \

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM lsiobase/alpine:arm64v8-3.11 as buildstage
+FROM lsiobase/alpine:arm64v8-3.12 as buildstage
 ############## build stage ##############
 
 # package versions
@@ -102,7 +102,7 @@ RUN \
 	perl-xml-writer \
 	pkgconf \
 	pngquant \
-	python \
+	python2 \
 	sdl-dev \
 	tar \
 	uriparser-dev \
@@ -219,7 +219,7 @@ RUN \
  make DESTDIR=/tmp/comskip-build install
 
 ############## runtime stage ##############
-FROM lsiobase/alpine:arm64v8-3.11
+FROM lsiobase/alpine:arm64v8-3.12
 
 # set version label
 ARG BUILD_DATE
@@ -307,7 +307,7 @@ RUN \
 	perl-xml-twig \
 	perl-xml-writer \
 	py3-requests \
-	python \
+	python2 \
 	tar \
 	uriparser \
 	wget \

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM lsiobase/alpine:arm32v7-3.11 as buildstage
+FROM lsiobase/alpine:arm32v7-3.12 as buildstage
 ############## build stage ##############
 
 # package versions
@@ -102,7 +102,7 @@ RUN \
 	perl-xml-writer \
 	pkgconf \
 	pngquant \
-	python \
+	python2 \
 	sdl-dev \
 	tar \
 	uriparser-dev \
@@ -219,7 +219,7 @@ RUN \
  make DESTDIR=/tmp/comskip-build install
 
 ############## runtime stage ##############
-FROM lsiobase/alpine:arm32v7-3.11
+FROM lsiobase/alpine:arm32v7-3.12
 
 # set version label
 ARG BUILD_DATE
@@ -307,7 +307,7 @@ RUN \
 	perl-xml-twig \
 	perl-xml-writer \
 	py3-requests \
-	python \
+	python2 \
 	tar \
 	uriparser \
 	wget \

README.md

@@ -304,6 +304,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **02.06.20:** - Update to Alpine 3.12.
 * **27.12.19:** - Add requests and perl-json-xs package.
 * **27.12.19:** - Update to Alpine 3.11.
 * **02.10.19:** - Improve permission fixing on render & dvb devices.

readme-vars.yml

@@ -126,6 +126,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "02.06.20:", desc: "Update to Alpine 3.12." }
   - { date: "27.12.19:", desc: "Add requests and perl-json-xs package." }
   - { date: "27.12.19:", desc: "Update to Alpine 3.11." }
   - { date: "02.10.19:", desc: "Improve permission fixing on render & dvb devices." }