From 38f12031b3ed216b744e222d6af12c9623ecea01 Mon Sep 17 00:00:00 2001
From: Carlos Gomes <carlos.alberto.gomes@zalando.de>
Date: Wed, 3 Feb 2021 11:06:33 +0100
Subject: [PATCH] Update to NodeJS 14 and include Deployer

---
 Dockerfile |  6 +++++-
 README.md  | 22 ++++++++++++++--------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 13faa84..0e8447f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get update \
       apt-transport-https \
   && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
   && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
-  && curl -sL https://deb.nodesource.com/setup_12.x | bash - \
+  && curl -sL https://deb.nodesource.com/setup_14.x | bash - \
   && apt-get install --no-install-recommends --no-install-suggests -y \
       nodejs \
       unzip \
@@ -27,6 +27,10 @@ RUN apt-get update \
       /usr/share/man/??_* \
   # Install composer
   && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
+  # Install Deployer - https://deployer.org/docs/getting-started.html
+  && curl -LO https://deployer.org/deployer.phar \
+  && mv deployer.phar /usr/local/bin/dep \
+  && chmod +x /usr/local/bin/dep \
   # Show versions
   && php -v \
   && echo "node: `node -v` " \
diff --git a/README.md b/README.md
index 58c0faa..80b732b 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,22 @@
-# composer-and-node-ci
+# composer-and-node-ci Docker image
 
 A docker image to be used on continuous integration projects. 
 
-It was made to use with Laravel and/or Frontend projects since it has all that is needed to build both types of projects. 
+The idea is to include everything you need to run unit tests and build frontend projects.
+
+Also, it is possible to run pure PHP or with frameworks like Laravel or CodeIgniter, Composer for dependency manager.
+
+To deploy and transfer files, [deployer](https://deployer.org) and RSync are available.
+
 
 ## This image includes: 
 
+* [NodeJS 14.x and NPM](https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions)
+* [yarn - latest](https://classic.yarnpkg.com/en/docs/install/#debian-stable)
 * PHP 7:latest
-* composer - latest
-* NodeJS 12.x and NPM
-* yarn - latest
-* openssh client
-* git
-* rsync
+* [composer - latest](https://getcomposer.org/doc/faqs/how-to-install-composer-programmatically.md)
+* [deployer](https://deployer.org) 
+* OpenSSH client
+* Git
+* RSync
 * MySql Client