Fix drupal to account for docker-library/drupal#32

dsl/docker-multiarch/images/drupal.groovy

@@ -21,14 +21,18 @@ for (arch in multiarch.allArches()) {
 		wrappers { colorizeOutput() }
 		steps {
 			shell(multiarch.templateArgs(meta) + '''
-sed -i "s!^FROM !FROM $prefix/!" */Dockerfile
+sed -i "s!^FROM !FROM $prefix/!" */*/Dockerfile
 
 latest="$(./generate-stackbrew-library.sh | awk '$1 == "latest:" { print $3; exit }')"
 
 for v in */; do
 	v="${v%/}"
-	docker build -t "$repo:$v" "$v"
+	docker build -t "$repo:$v-apache" "$v/apache"
+	docker build -t "$repo:$v-fpm" "$v/fpm"
+	docker tag -f "$repo:$v-apache" "$repo:$v"
 	if [ "$v" = "$latest" ]; then
+		docker tag -f "$repo:$v-apache" "$repo:apache"
+		docker tag -f "$repo:$v-fpm" "$repo:fpm"
 		docker tag -f "$repo:$v" "$repo"
 	fi
 done