Multiple Makefile improvements. Moved templates into template/

Author: grimzy

.gitignore

@@ -1 +1,2 @@
 .idea/
+generated/

Makefile

@@ -1,28 +1,55 @@
-V=5.6
 VERSION=1.0.0
-IMAGE=jestefane/php-$(V)-cli:$(VERSION)
-
 VERSIONS=5.5 5.6 7.0 7.1
+GENERATED_DIR=generated
+BUILDS_DIR=$(GENERATED_DIR)/builds
+BINS_DIR=$(GENERATED_DIR)/bins
+BIN_DIR=/usr/local/bin
 
-build:
-	@echo Building $(IMAGE)
-	docker build -t $(IMAGE) $(V)
-
-rm_image:
-	docker rmi $(IMAGE) || true
+builds: templates
+	@{ \
+	for version in $(VERSIONS); \
+	do \
+		cli=jestefane/php-dev:$$version-cli-$(VERSION); \
+		echo Building $$cli; \
+		docker build -t $$cli $(BUILDS_DIR)/$$version; \
+	done; \
+	}
 
-rebuild: rm_image build
+rm_images:
+	@{ \
+	for version in $(VERSIONS); \
+	do \
+		cli=jestefane/php-dev:$$version-cli-$(VERSION); \
+		docker rmi $$cli || true; \
+	done; \
+	}
 
+rebuild: rm_images builds
 
-templates:
-	{ \
+templates: rm_templates
+	@{ \
 	for version in $(VERSIONS); \
 	do \
+		echo Building for PHP $$version; \
 		regex=s!%%PHP_VERSION%%!$$version!g\;s!%%IMAGE_VERSION%%!$(VERSION)!g; \
-		mkdir -p $$version; \
-		cp php.ini $$version; \
-		sed $$regex Dockerfile.template > $$version/Dockerfile; \
-		sed $$regex composer.template > bins/composer-$$version; \
+		version_dir=$(BUILDS_DIR)/$$version; \
+		mkdir -p $$version_dir; \
+		sed $$regex template/Dockerfile.template > $$version_dir/Dockerfile; \
+		echo ... Dockerfile; \
+		cp template/php.ini $$version_dir; \
+		mkdir -p $(BINS_DIR); \
+		sed $$regex template/php-cli.template > $(BINS_DIR)/php-cli-$$version; \
+		echo ... php-cli bin; \
+		sed $$regex template/composer.template > $(BINS_DIR)/composer-$$version; \
+		echo ... composer bin; \
 	done; \
 	}
 
+rm_templates:
+	@echo Deleting generated templates
+	@rm -Rf $(GENERATED_DIR)
+
+cp_bins:
+	@chmod +x $(BINS_DIR)/*
+	@cp $(BINS_DIR)/* $(BIN_DIR)
+	@echo Copied bins into $(BIN_DIR)

php.ini

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+docker run --rm -it -w=/app -v $(pwd):/app -v ~/.ssh:/root/.ssh -v $HOME/.composer-docker:/composer jestefane/php-dev:%%PHP_VERSION%%-cli-%%IMAGE_VERSION%% $@