From 29cacbbe4f4c22ba3777999d96d73bf516f644b8 Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Sun, 29 Apr 2018 13:48:32 +0300
Subject: [PATCH] Improve docker build process

---
 .env              | 1 +
 docker/Dockerfile | 8 +++++---
 tools/build       | 4 ++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.env b/.env
index 21da901..287ea18 100644
--- a/.env
+++ b/.env
@@ -1,2 +1,3 @@
+PHP_BASE_IMAGE=php:7.2-cli
 PHP_IMAGE=homepage-php
 NODE_IMAGE=node:10
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 12d39b5..1f66a87 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,6 @@
-FROM php:7.2-cli
+ARG PHP_BASE_IMAGE
+
+FROM ${PHP_BASE_IMAGE}
 
 # Project folder
 RUN mkdir -p /srv/app
@@ -10,11 +12,11 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 # get composer and required tools
-RUN curl -sLO https://getcomposer.org/download/1.6.3/composer.phar \
+RUN curl -sLO https://getcomposer.org/download/1.6.4/composer.phar \
     && mv composer.phar /usr/local/bin/composer \
     && chmod +x /usr/local/bin/composer
 
 # Deployer
-RUN curl -sLO https://deployer.org/releases/v6.0.3/deployer.phar \
+RUN curl -sLO https://deployer.org/releases/v6.2.0/deployer.phar \
     && mv deployer.phar /usr/local/bin/dep \
     && chmod +x /usr/local/bin/dep
diff --git a/tools/build b/tools/build
index 70a79cc..9dc38f9 100755
--- a/tools/build
+++ b/tools/build
@@ -2,7 +2,11 @@
 
 source .env
 
+docker pull ${PHP_BASE_IMAGE}
+docker pull ${NODE_IMAGE}
+
 docker build \
     --file docker/Dockerfile \
+    --build-arg PHP_BASE_IMAGE=${PHP_BASE_IMAGE} \
     --tag ${PHP_IMAGE} \
     $PWD