From 627531c59286c7f7bf263e9bb921c46488e5b48f Mon Sep 17 00:00:00 2001
From: Antonios Pavlakis <antonios.pavlakis@staysafeapp.com>
Date: Mon, 22 Oct 2018 10:22:16 +0100
Subject: [PATCH] Add git, zip and unzip

Also removes composer to be installed as a seaparate image directly in the application
---
 .gitignore            | 1 +
 docker/php/Dockerfile | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 264687b..025e187 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 docker/.data
+.idea/
\ No newline at end of file
diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
index 4998619..1e93d3c 100644
--- a/docker/php/Dockerfile
+++ b/docker/php/Dockerfile
@@ -1,9 +1,12 @@
+<<<<<<< Updated upstream
 FROM composer:1.7.2 as composer
 FROM php:7.2.10-fpm
-
-COPY --from=composer /usr/bin/composer /usr/bin/composer
+=======
+FROM php:7.2.11-fpm
+>>>>>>> Stashed changes
 
 RUN apt-get update && apt-get install -y \
+    git zip unzip \
     && docker-php-ext-install -j$(nproc) pdo pdo_mysql \
     && docker-php-source delete