Merge pull request matomo-org#162 from J0WI/stretch

J0WI · web-flow · commit 487bc8f8efca · 2019-07-10T23:14:17.000+02:00
Stick on stretch for now due deprecated freetype-config
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -1,4 +1,4 @@
-FROM php:7.3-%%VARIANT%%
+FROM php:7.3-%%VARIANT%%-stretch
 
 LABEL maintainer="pierre@piwik.org"
 
diff --git a/apache/Dockerfile b/apache/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.3-apache
+FROM php:7.3-apache-stretch
 
 LABEL maintainer="pierre@piwik.org"
 
diff --git a/fpm/Dockerfile b/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.3-fpm
+FROM php:7.3-fpm-stretch
 
 LABEL maintainer="pierre@piwik.org"
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM php:7.3-%%VARIANT%%`
	`1`	`+FROM php:7.3-%%VARIANT%%-stretch`
`2`	`2`
`3`	`3`	`LABEL maintainer="pierre@piwik.org"`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM php:7.3-apache`
	`1`	`+FROM php:7.3-apache-stretch`
`2`	`2`
`3`	`3`	`LABEL maintainer="pierre@piwik.org"`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM php:7.3-fpm`
	`1`	`+FROM php:7.3-fpm-stretch`
`2`	`2`
`3`	`3`	`LABEL maintainer="pierre@piwik.org"`
`4`	`4`