Fix wrong alpine-php5 dependency

mblaschke · mblaschke · commit 0bcf4b50f819 · 2017-04-10T20:26:14.000+02:00
diff --git a/docker/php-apache-dev/alpine-php5/Dockerfile b/docker/php-apache-dev/alpine-php5/Dockerfile
@@ -3,7 +3,7 @@
 #    -- automatically generated  --
 #+++++++++++++++++++++++++++++++++++++++
 
-FROM webdevops/php-dev:alpine
+FROM webdevops/php-dev:alpine-php5
 
 ENV WEB_DOCUMENT_ROOT=/app \
     WEB_DOCUMENT_INDEX=index.php \
diff --git a/docker/php-apache-dev/alpine-php5/Dockerfile.jinja2 b/docker/php-apache-dev/alpine-php5/Dockerfile.jinja2
@@ -1,4 +1,4 @@
-{{ docker.from("php-dev", "alpine") }}
+{{ docker.from("php-dev", "alpine-php5") }}
 
 {{ environment.web() }}
 {{ environment.webPhp() }}
diff --git a/docker/php-apache/alpine-php5/Dockerfile b/docker/php-apache/alpine-php5/Dockerfile
@@ -3,7 +3,7 @@
 #    -- automatically generated  --
 #+++++++++++++++++++++++++++++++++++++++
 
-FROM webdevops/php:alpine
+FROM webdevops/php:alpine-php5
 
 ENV WEB_DOCUMENT_ROOT=/app \
     WEB_DOCUMENT_INDEX=index.php \
diff --git a/docker/php-apache/alpine-php5/Dockerfile.jinja2 b/docker/php-apache/alpine-php5/Dockerfile.jinja2
@@ -1,4 +1,4 @@
-{{ docker.from("php", "alpine") }}
+{{ docker.from("php", "alpine-php5") }}
 
 {{ environment.web() }}
 {{ environment.webPhp() }}
diff --git a/docker/php-dev/alpine-php5/Dockerfile b/docker/php-dev/alpine-php5/Dockerfile
@@ -3,7 +3,7 @@
 #    -- automatically generated  --
 #+++++++++++++++++++++++++++++++++++++++
 
-FROM webdevops/php:alpine
+FROM webdevops/php:alpine-php5
 
 COPY conf/ /opt/docker/
 
diff --git a/docker/php-dev/alpine-php5/Dockerfile.jinja2 b/docker/php-dev/alpine-php5/Dockerfile.jinja2
@@ -1,4 +1,4 @@
-{{ docker.from("php", "alpine") }}
+{{ docker.from("php", "alpine-php5") }}
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
diff --git a/docker/php-nginx-dev/alpine-php5/Dockerfile b/docker/php-nginx-dev/alpine-php5/Dockerfile
@@ -3,7 +3,7 @@
 #    -- automatically generated  --
 #+++++++++++++++++++++++++++++++++++++++
 
-FROM webdevops/php-dev:alpine
+FROM webdevops/php-dev:alpine-php5
 
 ENV WEB_DOCUMENT_ROOT=/app \
     WEB_DOCUMENT_INDEX=index.php \
diff --git a/docker/php-nginx-dev/alpine-php5/Dockerfile.jinja2 b/docker/php-nginx-dev/alpine-php5/Dockerfile.jinja2
@@ -1,4 +1,4 @@
-{{ docker.from("php-dev", "alpine") }}
+{{ docker.from("php-dev", "alpine-php5") }}
 
 {{ environment.web() }}
 {{ environment.webPhp() }}
diff --git a/docker/php-nginx/alpine-php5/Dockerfile b/docker/php-nginx/alpine-php5/Dockerfile
@@ -3,7 +3,7 @@
 #    -- automatically generated  --
 #+++++++++++++++++++++++++++++++++++++++
 
-FROM webdevops/php:alpine
+FROM webdevops/php:alpine-php5
 
 ENV WEB_DOCUMENT_ROOT=/app \
     WEB_DOCUMENT_INDEX=index.php \
diff --git a/docker/php-nginx/alpine-php5/Dockerfile.jinja2 b/docker/php-nginx/alpine-php5/Dockerfile.jinja2
@@ -1,4 +1,4 @@
-{{ docker.from("php", "alpine") }}
+{{ docker.from("php", "alpine-php5") }}
 
 {{ environment.web() }}
 {{ environment.webPhp() }}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{{ docker.from("php-dev", "alpine") }}`
	`1`	`+{{ docker.from("php-dev", "alpine-php5") }}`
`2`	`2`
`3`	`3`	`{{ environment.web() }}`
`4`	`4`	`{{ environment.webPhp() }}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{{ docker.from("php", "alpine") }}`
	`1`	`+{{ docker.from("php", "alpine-php5") }}`
`2`	`2`
`3`	`3`	`{{ environment.web() }}`
`4`	`4`	`{{ environment.webPhp() }}`