From 1f48632d1dc2b59c85c5468e71929a854fc0c6fd Mon Sep 17 00:00:00 2001
From: Damien Carcel <damien.carcel@akeneo.com>
Date: Tue, 13 Jun 2017 13:02:02 +0200
Subject: [PATCH 1/2] Issue 226: Add SSH client

---
 php/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/Dockerfile b/php/Dockerfile
index b304ae7..913aa38 100644
--- a/php/Dockerfile
+++ b/php/Dockerfile
@@ -7,7 +7,7 @@ ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && \
     apt-get --no-install-recommends --no-install-suggests --yes --quiet install \
         ca-certificates bash-completion less curl wget sudo \
-        mysql-client mongodb-clients vim git imagemagick perceptualdiff && \
+        mysql-client mongodb-clients ssh-client vim git imagemagick perceptualdiff && \
     apt-get clean && apt-get --yes --quiet autoremove --purge && \
     rm -rf  /var/lib/apt/lists/* /tmp/* /var/tmp/* \
             /usr/share/doc/* /usr/share/groff/* /usr/share/info/* /usr/share/linda/* \

From bd7d13728297225f01586472c794b09e4880501a Mon Sep 17 00:00:00 2001
From: Damien Carcel <damien.carcel@akeneo.com>
Date: Tue, 13 Jun 2017 13:32:15 +0200
Subject: [PATCH 2/2] Issue-132: Add CONTRIBUTING.md and GitHub templates

---
 .github/ISSUE_TEMPLATE.md        | 11 +++++++++++
 .github/PULL_REQUEST_TEMPLATE.md | 23 +++++++++++++++++++++++
 CONTRIBUTING.md                  | 10 ++++++++++
 README.md                        |  2 +-
 4 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 .github/ISSUE_TEMPLATE.md
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md
 create mode 100644 CONTRIBUTING.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..b385122
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,11 @@
+| Q                      | A
+| ---------------------- | -----
+| Bug report?            | yes/no
+| Feature request?       | yes/no
+| BC Break report?       | yes/no
+| RFC?                   | yes/no
+| Affected image and tag | carcel/image:tag
+
+<!--
+- Please replace this comment by the description of your issue.
+-->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..1812ed4
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,23 @@
+## Description
+
+<!--
+- Please fill in this template according to the PR you're about to submit.
+- Replace this comment by a description of what your PR is solving.
+- Bug fixes must be submitted against the lowest branch where they apply
+  (lowest branches are regularly merged to upper ones so they get the fixes too):
+  for example apply on `php-5.6` branch, it will then be merged in `php-7.0`, and so on up to `master`.
+- Documentation must be submitted against the master branch (it is not present in other branches to ease its maintenance).
+-->
+
+## Definition Of Done
+
+| Q                                 | A
+| --------------------------------- | ---
+| Added tests                       | Todo
+| Changelog updated                 | Todo
+| Documentation                     | -
+| Fixed tickets                     | #... <!-- #-prefixed issue number(s), if any -->
+
+`Todo`: Pending / Work in progress
+`OK`: Done / Validated
+`-`: Not needed
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..5c7500a
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,10 @@
+# Contributing
+
+These Dockerfiles are not only made for my personal use, but for anybody who likes to develop on Akeneo or Symfony applications with Docker.
+
+I gladly accept any contributions: fixing typos, glitches, bugs, technical enhancements and new features.
+
+For technical enhancements and new features, please first have a look at [current issues](https://github.com/damien-carcel/Dockerfiles/issues).
+There may already be one, with details and ideas on how to implement it. You are welcome to pick it and propose a pull request if you'd like.
+
+If it does not already exist, please first open an issue to describe and discuss what you want to do, it will ease the merge of your pull request.
diff --git a/README.md b/README.md
index ab2aef6..b54027c 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # My Dockerfiles
 
-This repository contains my own docker images I use for Akeneo and other Symfony development. Feel free to use/adapt them if they fit your needs.
+This repository contains the Dockerfiles I use for Akeneo and other Symfony development. Feel free to use/adapt them if they fit your needs.
 
 | [Master][Master] | [php-7.1][php-7.1] | [php-7.0][php-7.0] | [php-5.6][php-5.6] |
 |:----------------:|:----------:|:----------:|:----------:|