From 7af0b2c98b825dca1ae49f22639a6bf32ac94af3 Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Sun, 18 Mar 2018 15:59:40 +0100
Subject: [PATCH 1/8] REL-0.5 Adding PHPCS/PHPCBF

---
 Dockerfiles/work/Dockerfile-5.4  | 10 ++++++++++
 Dockerfiles/work/Dockerfile-5.5  | 10 ++++++++++
 Dockerfiles/work/Dockerfile-5.6  | 10 ++++++++++
 Dockerfiles/work/Dockerfile-7.0  | 10 ++++++++++
 Dockerfiles/work/Dockerfile-7.1  | 10 ++++++++++
 Dockerfiles/work/Dockerfile-7.2  | 10 ++++++++++
 build/ansible/group_vars/all.yml | 14 ++++++++++++++
 7 files changed, 74 insertions(+)

diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4
index 8f4778c0..b7b465e0 100644
--- a/Dockerfiles/work/Dockerfile-5.4
+++ b/Dockerfiles/work/Dockerfile-5.4
@@ -187,6 +187,14 @@ RUN set -x \
 && cd / \
 && rm -rf /usr/local/src/phalcon-devtools/.git \
  \
+# phpcs
+	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar 2>/dev/null /usr/local/bin/phpcs \
+&& chmod +x /usr/local/bin/phpcs \
+ \
+# phpcbf
+	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \
+&& chmod +x /usr/local/bin/phpcbf \
+ \
 # symfony
 	&& curl https://symfony.com/installer -L -o /usr/local/bin/symfony \
 	&& chmod +x /usr/local/bin/symfony \
@@ -264,6 +272,8 @@ RUN set -x \
 	&& su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \
 	&& mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \
 	&& phalcon commands | grep -E '[.0-9]+' \
+	&& phpcs --version | grep -E 'version [.0-9]+' \
+	&& phpcbf --version | grep -E 'version [.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5
index 5d16270b..9bc6129d 100644
--- a/Dockerfiles/work/Dockerfile-5.5
+++ b/Dockerfiles/work/Dockerfile-5.5
@@ -190,6 +190,14 @@ RUN set -x \
 && cd / \
 && rm -rf /usr/local/src/phalcon-devtools/.git \
  \
+# phpcs
+	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar 2>/dev/null /usr/local/bin/phpcs \
+&& chmod +x /usr/local/bin/phpcs \
+ \
+# phpcbf
+	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \
+&& chmod +x /usr/local/bin/phpcbf \
+ \
 # symfony
 	&& curl https://symfony.com/installer -L -o /usr/local/bin/symfony \
 	&& chmod +x /usr/local/bin/symfony \
@@ -268,6 +276,8 @@ RUN set -x \
 	&& su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \
 	&& mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \
 	&& phalcon commands | grep -E '[.0-9]+' \
+	&& phpcs --version | grep -E 'version [.0-9]+' \
+	&& phpcbf --version | grep -E 'version [.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6
index 6e3b4207..e480db7c 100644
--- a/Dockerfiles/work/Dockerfile-5.6
+++ b/Dockerfiles/work/Dockerfile-5.6
@@ -190,6 +190,14 @@ RUN set -x \
 && cd / \
 && rm -rf /usr/local/src/phalcon-devtools/.git \
  \
+# phpcs
+	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar 2>/dev/null /usr/local/bin/phpcs \
+&& chmod +x /usr/local/bin/phpcs \
+ \
+# phpcbf
+	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \
+&& chmod +x /usr/local/bin/phpcbf \
+ \
 # symfony
 	&& curl https://symfony.com/installer -L -o /usr/local/bin/symfony \
 	&& chmod +x /usr/local/bin/symfony \
@@ -268,6 +276,8 @@ RUN set -x \
 	&& su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \
 	&& mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \
 	&& phalcon commands | grep -E '[.0-9]+' \
+	&& phpcs --version | grep -E 'version [.0-9]+' \
+	&& phpcbf --version | grep -E 'version [.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0
index f23dc6b5..ed58447a 100644
--- a/Dockerfiles/work/Dockerfile-7.0
+++ b/Dockerfiles/work/Dockerfile-7.0
@@ -190,6 +190,14 @@ RUN set -x \
 && cd / \
 && rm -rf /usr/local/src/phalcon-devtools/.git \
  \
+# phpcs
+	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar 2>/dev/null /usr/local/bin/phpcs \
+&& chmod +x /usr/local/bin/phpcs \
+ \
+# phpcbf
+	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \
+&& chmod +x /usr/local/bin/phpcbf \
+ \
 # symfony
 	&& curl https://symfony.com/installer -L -o /usr/local/bin/symfony \
 	&& chmod +x /usr/local/bin/symfony \
@@ -268,6 +276,8 @@ RUN set -x \
 	&& su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \
 	&& mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \
 	&& phalcon commands | grep -E '[.0-9]+' \
+	&& phpcs --version | grep -E 'version [.0-9]+' \
+	&& phpcbf --version | grep -E 'version [.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1
index a6675a75..8d8649a4 100644
--- a/Dockerfiles/work/Dockerfile-7.1
+++ b/Dockerfiles/work/Dockerfile-7.1
@@ -190,6 +190,14 @@ RUN set -x \
 && cd / \
 && rm -rf /usr/local/src/phalcon-devtools/.git \
  \
+# phpcs
+	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar 2>/dev/null /usr/local/bin/phpcs \
+&& chmod +x /usr/local/bin/phpcs \
+ \
+# phpcbf
+	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \
+&& chmod +x /usr/local/bin/phpcbf \
+ \
 # symfony
 	&& curl https://symfony.com/installer -L -o /usr/local/bin/symfony \
 	&& chmod +x /usr/local/bin/symfony \
@@ -268,6 +276,8 @@ RUN set -x \
 	&& su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \
 	&& mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \
 	&& phalcon commands | grep -E '[.0-9]+' \
+	&& phpcs --version | grep -E 'version [.0-9]+' \
+	&& phpcbf --version | grep -E 'version [.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2
index f699f32a..c3b63451 100644
--- a/Dockerfiles/work/Dockerfile-7.2
+++ b/Dockerfiles/work/Dockerfile-7.2
@@ -190,6 +190,14 @@ RUN set -x \
 && cd / \
 && rm -rf /usr/local/src/phalcon-devtools/.git \
  \
+# phpcs
+	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar 2>/dev/null /usr/local/bin/phpcs \
+&& chmod +x /usr/local/bin/phpcs \
+ \
+# phpcbf
+	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \
+&& chmod +x /usr/local/bin/phpcbf \
+ \
 # symfony
 	&& curl https://symfony.com/installer -L -o /usr/local/bin/symfony \
 	&& chmod +x /usr/local/bin/symfony \
@@ -268,6 +276,8 @@ RUN set -x \
 	&& su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \
 	&& mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \
 	&& phalcon commands | grep -E '[.0-9]+' \
+	&& phpcs --version | grep -E 'version [.0-9]+' \
+	&& phpcbf --version | grep -E 'version [.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml
index 8536cffd..eac4d8c1 100644
--- a/build/ansible/group_vars/all.yml
+++ b/build/ansible/group_vars/all.yml
@@ -61,6 +61,8 @@ software_enabled:
   - linuxbrew
   - mysqldumpsecure
   - phalcon
+  - phpcs
+  - phpcbf
   - symfony
   - webpack
   - wpcli
@@ -289,6 +291,18 @@ software_available:
         && ln -s /usr/local/src/phalcon-devtools/phalcon.php /usr/local/bin/phalcon \
         && cd / \
         && rm -rf /usr/local/src/phalcon-devtools/.git \
+  phpcs:
+    check: phpcs --version | grep -E 'version [.0-9]+'
+    all:
+      command: |
+        curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar 2>/dev/null /usr/local/bin/phpcs \
+        && chmod +x /usr/local/bin/phpcs \
+  phpcbf:
+    check: phpcbf --version | grep -E 'version [.0-9]+'
+    all:
+      command: |
+        curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \
+        && chmod +x /usr/local/bin/phpcbf \
   symfony:
     check: symfony --version | grep -E 'version\s*[.0-9]+'
     all:

From 29baa10b854518a765399ee38c12b12ee461f450 Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Sun, 18 Mar 2018 16:19:46 +0100
Subject: [PATCH 2/8] Adding: yamllint

---
 Dockerfiles/work/Dockerfile-5.4  | 5 +++++
 Dockerfiles/work/Dockerfile-5.5  | 5 +++++
 Dockerfiles/work/Dockerfile-5.6  | 5 +++++
 Dockerfiles/work/Dockerfile-7.0  | 5 +++++
 Dockerfiles/work/Dockerfile-7.1  | 5 +++++
 Dockerfiles/work/Dockerfile-7.2  | 5 +++++
 build/ansible/group_vars/all.yml | 7 +++++++
 7 files changed, 37 insertions(+)

diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4
index b7b465e0..e3694581 100644
--- a/Dockerfiles/work/Dockerfile-5.4
+++ b/Dockerfiles/work/Dockerfile-5.4
@@ -203,6 +203,10 @@ RUN set -x \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
+# yamllint
+	&& apt update && apt install --no-install-recommends --no-install-suggests -y libyaml-dev \
+	&& pip install yamllint \
+	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libyaml-dev && rm -rf /var/lib/apt/lists/* \
 # cleanup
 	&& rm -rf /home/${MY_USER}/.*json \
 && rm -rf /home/${MY_USER}/.cache \
@@ -277,6 +281,7 @@ RUN set -x \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
+	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
 	&& true
 
 
diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5
index 9bc6129d..67b90eb2 100644
--- a/Dockerfiles/work/Dockerfile-5.5
+++ b/Dockerfiles/work/Dockerfile-5.5
@@ -206,6 +206,10 @@ RUN set -x \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
+# yamllint
+	&& apt update && apt install --no-install-recommends --no-install-suggests -y libyaml-dev \
+	&& pip install yamllint \
+	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libyaml-dev && rm -rf /var/lib/apt/lists/* \
 # cleanup
 	&& rm -rf /home/${MY_USER}/.*json \
 && rm -rf /home/${MY_USER}/.cache \
@@ -281,6 +285,7 @@ RUN set -x \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
+	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
 	&& true
 
 
diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6
index e480db7c..829fa2b8 100644
--- a/Dockerfiles/work/Dockerfile-5.6
+++ b/Dockerfiles/work/Dockerfile-5.6
@@ -206,6 +206,10 @@ RUN set -x \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
+# yamllint
+	&& apt update && apt install --no-install-recommends --no-install-suggests -y libyaml-dev \
+	&& pip install yamllint \
+	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libyaml-dev && rm -rf /var/lib/apt/lists/* \
 # cleanup
 	&& rm -rf /home/${MY_USER}/.*json \
 && rm -rf /home/${MY_USER}/.cache \
@@ -281,6 +285,7 @@ RUN set -x \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
+	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
 	&& true
 
 
diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0
index ed58447a..818a5a22 100644
--- a/Dockerfiles/work/Dockerfile-7.0
+++ b/Dockerfiles/work/Dockerfile-7.0
@@ -206,6 +206,10 @@ RUN set -x \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
+# yamllint
+	&& apt update && apt install --no-install-recommends --no-install-suggests -y libyaml-dev \
+	&& pip install yamllint \
+	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libyaml-dev && rm -rf /var/lib/apt/lists/* \
 # cleanup
 	&& rm -rf /home/${MY_USER}/.*json \
 && rm -rf /home/${MY_USER}/.cache \
@@ -281,6 +285,7 @@ RUN set -x \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
+	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
 	&& true
 
 
diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1
index 8d8649a4..43472f20 100644
--- a/Dockerfiles/work/Dockerfile-7.1
+++ b/Dockerfiles/work/Dockerfile-7.1
@@ -206,6 +206,10 @@ RUN set -x \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
+# yamllint
+	&& apt update && apt install --no-install-recommends --no-install-suggests -y libyaml-dev \
+	&& pip install yamllint \
+	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libyaml-dev && rm -rf /var/lib/apt/lists/* \
 # cleanup
 	&& rm -rf /home/${MY_USER}/.*json \
 && rm -rf /home/${MY_USER}/.cache \
@@ -281,6 +285,7 @@ RUN set -x \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
+	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
 	&& true
 
 
diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2
index c3b63451..1c4e4a06 100644
--- a/Dockerfiles/work/Dockerfile-7.2
+++ b/Dockerfiles/work/Dockerfile-7.2
@@ -206,6 +206,10 @@ RUN set -x \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
+# yamllint
+	&& apt update && apt install --no-install-recommends --no-install-suggests -y libyaml-dev \
+	&& pip install yamllint \
+	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libyaml-dev && rm -rf /var/lib/apt/lists/* \
 # cleanup
 	&& rm -rf /home/${MY_USER}/.*json \
 && rm -rf /home/${MY_USER}/.cache \
@@ -281,6 +285,7 @@ RUN set -x \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
+	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
 	&& true
 
 
diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml
index eac4d8c1..d5575fed 100644
--- a/build/ansible/group_vars/all.yml
+++ b/build/ansible/group_vars/all.yml
@@ -66,6 +66,7 @@ software_enabled:
   - symfony
   - webpack
   - wpcli
+  - yamllint
   # Cleanup needs to be last
   - cleanup
 
@@ -317,6 +318,12 @@ software_available:
     check: webpack --version | grep -E '[.0-9]+'
     all:
       command: npm install -g webpack webpack-cli
+  yamllint:
+    check: yamllint --version 2>&1 | grep -E '[.0-9]+'
+    all:
+      pre: apt update && apt install --no-install-recommends --no-install-suggests -y libyaml-dev
+      command: pip install yamllint
+      post: apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libyaml-dev && rm -rf /var/lib/apt/lists/*
   cleanup:
     all:
       command: |

From b84d05844fb3b26e0b0fcb8c43f478b4d175a886 Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Sun, 18 Mar 2018 16:20:03 +0100
Subject: [PATCH 3/8] Fix typo in bashrc

---
 Dockerfiles/work/data/bash-devilbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfiles/work/data/bash-devilbox b/Dockerfiles/work/data/bash-devilbox
index 40351aa8..394e4b76 100644
--- a/Dockerfiles/work/data/bash-devilbox
+++ b/Dockerfiles/work/data/bash-devilbox
@@ -45,7 +45,7 @@ echo "              | node             | https://nodejs.org           |"
 echo "              | npm              | https://www.npmjs.com        |"
 echo "              | phalcon-devtools | gh: phalcon/phalcon-devtools |"
 echo "              | symfony installer| gh: symfony/symfony-installer|"
-echo "              | webpack          | ghL webpack/webpack          |"
+echo "              | webpack          | gh: webpack/webpack          |"
 echo "              | wpcli            | https://wp-cli.org           |"
 echo
 echo

From 741933918b509451bc7b6db358abd0762cf42d8f Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Sun, 18 Mar 2018 16:25:44 +0100
Subject: [PATCH 4/8] Adding: sass

---
 Dockerfiles/work/Dockerfile-5.4  | 3 +++
 Dockerfiles/work/Dockerfile-5.5  | 3 +++
 Dockerfiles/work/Dockerfile-5.6  | 3 +++
 Dockerfiles/work/Dockerfile-7.0  | 3 +++
 Dockerfiles/work/Dockerfile-7.1  | 3 +++
 Dockerfiles/work/Dockerfile-7.2  | 3 +++
 build/ansible/group_vars/all.yml | 5 +++++
 7 files changed, 23 insertions(+)

diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4
index e3694581..c87a3882 100644
--- a/Dockerfiles/work/Dockerfile-5.4
+++ b/Dockerfiles/work/Dockerfile-5.4
@@ -195,6 +195,8 @@ RUN set -x \
 	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \
 && chmod +x /usr/local/bin/phpcbf \
  \
+# sass
+	&& gem install sass \
 # symfony
 	&& curl https://symfony.com/installer -L -o /usr/local/bin/symfony \
 	&& chmod +x /usr/local/bin/symfony \
@@ -278,6 +280,7 @@ RUN set -x \
 	&& phalcon commands | grep -E '[.0-9]+' \
 	&& phpcs --version | grep -E 'version [.0-9]+' \
 	&& phpcbf --version | grep -E 'version [.0-9]+' \
+	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5
index 67b90eb2..1c619831 100644
--- a/Dockerfiles/work/Dockerfile-5.5
+++ b/Dockerfiles/work/Dockerfile-5.5
@@ -198,6 +198,8 @@ RUN set -x \
 	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \
 && chmod +x /usr/local/bin/phpcbf \
  \
+# sass
+	&& gem install sass \
 # symfony
 	&& curl https://symfony.com/installer -L -o /usr/local/bin/symfony \
 	&& chmod +x /usr/local/bin/symfony \
@@ -282,6 +284,7 @@ RUN set -x \
 	&& phalcon commands | grep -E '[.0-9]+' \
 	&& phpcs --version | grep -E 'version [.0-9]+' \
 	&& phpcbf --version | grep -E 'version [.0-9]+' \
+	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6
index 829fa2b8..1533c7ef 100644
--- a/Dockerfiles/work/Dockerfile-5.6
+++ b/Dockerfiles/work/Dockerfile-5.6
@@ -198,6 +198,8 @@ RUN set -x \
 	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \
 && chmod +x /usr/local/bin/phpcbf \
  \
+# sass
+	&& gem install sass \
 # symfony
 	&& curl https://symfony.com/installer -L -o /usr/local/bin/symfony \
 	&& chmod +x /usr/local/bin/symfony \
@@ -282,6 +284,7 @@ RUN set -x \
 	&& phalcon commands | grep -E '[.0-9]+' \
 	&& phpcs --version | grep -E 'version [.0-9]+' \
 	&& phpcbf --version | grep -E 'version [.0-9]+' \
+	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0
index 818a5a22..b9acf52a 100644
--- a/Dockerfiles/work/Dockerfile-7.0
+++ b/Dockerfiles/work/Dockerfile-7.0
@@ -198,6 +198,8 @@ RUN set -x \
 	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \
 && chmod +x /usr/local/bin/phpcbf \
  \
+# sass
+	&& gem install sass \
 # symfony
 	&& curl https://symfony.com/installer -L -o /usr/local/bin/symfony \
 	&& chmod +x /usr/local/bin/symfony \
@@ -282,6 +284,7 @@ RUN set -x \
 	&& phalcon commands | grep -E '[.0-9]+' \
 	&& phpcs --version | grep -E 'version [.0-9]+' \
 	&& phpcbf --version | grep -E 'version [.0-9]+' \
+	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1
index 43472f20..31bff040 100644
--- a/Dockerfiles/work/Dockerfile-7.1
+++ b/Dockerfiles/work/Dockerfile-7.1
@@ -198,6 +198,8 @@ RUN set -x \
 	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \
 && chmod +x /usr/local/bin/phpcbf \
  \
+# sass
+	&& gem install sass \
 # symfony
 	&& curl https://symfony.com/installer -L -o /usr/local/bin/symfony \
 	&& chmod +x /usr/local/bin/symfony \
@@ -282,6 +284,7 @@ RUN set -x \
 	&& phalcon commands | grep -E '[.0-9]+' \
 	&& phpcs --version | grep -E 'version [.0-9]+' \
 	&& phpcbf --version | grep -E 'version [.0-9]+' \
+	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2
index 1c4e4a06..395d6cf0 100644
--- a/Dockerfiles/work/Dockerfile-7.2
+++ b/Dockerfiles/work/Dockerfile-7.2
@@ -198,6 +198,8 @@ RUN set -x \
 	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \
 && chmod +x /usr/local/bin/phpcbf \
  \
+# sass
+	&& gem install sass \
 # symfony
 	&& curl https://symfony.com/installer -L -o /usr/local/bin/symfony \
 	&& chmod +x /usr/local/bin/symfony \
@@ -282,6 +284,7 @@ RUN set -x \
 	&& phalcon commands | grep -E '[.0-9]+' \
 	&& phpcs --version | grep -E 'version [.0-9]+' \
 	&& phpcbf --version | grep -E 'version [.0-9]+' \
+	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml
index d5575fed..d7f1ff30 100644
--- a/build/ansible/group_vars/all.yml
+++ b/build/ansible/group_vars/all.yml
@@ -63,6 +63,7 @@ software_enabled:
   - phalcon
   - phpcs
   - phpcbf
+  - sass
   - symfony
   - webpack
   - wpcli
@@ -304,6 +305,10 @@ software_available:
       command: |
         curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \
         && chmod +x /usr/local/bin/phpcbf \
+  sass:
+    check: sass --version | grep -E '[.0-9]+'
+    all:
+      command: gem install sass
   symfony:
     check: symfony --version | grep -E 'version\s*[.0-9]+'
     all:

From cb1ff74b4da09cba30094a8ae78aba8f4a08963e Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Sun, 18 Mar 2018 16:42:20 +0100
Subject: [PATCH 5/8] Adding: Redis tools

---
 Dockerfiles/work/Dockerfile-5.4              | 1 +
 Dockerfiles/work/Dockerfile-5.5              | 1 +
 Dockerfiles/work/Dockerfile-5.6              | 1 +
 Dockerfiles/work/Dockerfile-7.0              | 1 +
 Dockerfiles/work/Dockerfile-7.1              | 1 +
 Dockerfiles/work/Dockerfile-7.2              | 1 +
 build/ansible/DOCKERFILES/Dockerfile-work.j2 | 1 +
 7 files changed, 7 insertions(+)

diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4
index c87a3882..41ae845e 100644
--- a/Dockerfiles/work/Dockerfile-5.4
+++ b/Dockerfiles/work/Dockerfile-5.4
@@ -73,6 +73,7 @@ RUN set -x \
 		nodejs \
 		postgresql-client \
 		python-pip \
+		redis-tools \
 		rubygems \
 		ruby-dev \
 		shellcheck \
diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5
index 1c619831..5269d10d 100644
--- a/Dockerfiles/work/Dockerfile-5.5
+++ b/Dockerfiles/work/Dockerfile-5.5
@@ -73,6 +73,7 @@ RUN set -x \
 		nodejs \
 		postgresql-client \
 		python-pip \
+		redis-tools \
 		rubygems \
 		ruby-dev \
 		shellcheck \
diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6
index 1533c7ef..f06cf574 100644
--- a/Dockerfiles/work/Dockerfile-5.6
+++ b/Dockerfiles/work/Dockerfile-5.6
@@ -73,6 +73,7 @@ RUN set -x \
 		nodejs \
 		postgresql-client \
 		python-pip \
+		redis-tools \
 		rubygems \
 		ruby-dev \
 		shellcheck \
diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0
index b9acf52a..0ccca65a 100644
--- a/Dockerfiles/work/Dockerfile-7.0
+++ b/Dockerfiles/work/Dockerfile-7.0
@@ -73,6 +73,7 @@ RUN set -x \
 		nodejs \
 		postgresql-client \
 		python-pip \
+		redis-tools \
 		rubygems \
 		ruby-dev \
 		shellcheck \
diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1
index 31bff040..56a6269c 100644
--- a/Dockerfiles/work/Dockerfile-7.1
+++ b/Dockerfiles/work/Dockerfile-7.1
@@ -73,6 +73,7 @@ RUN set -x \
 		nodejs \
 		postgresql-client \
 		python-pip \
+		redis-tools \
 		rubygems \
 		ruby-dev \
 		shellcheck \
diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2
index 395d6cf0..74ddee8d 100644
--- a/Dockerfiles/work/Dockerfile-7.2
+++ b/Dockerfiles/work/Dockerfile-7.2
@@ -73,6 +73,7 @@ RUN set -x \
 		nodejs \
 		postgresql-client \
 		python-pip \
+		redis-tools \
 		rubygems \
 		ruby-dev \
 		shellcheck \
diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2
index a600362b..3e4c5f28 100644
--- a/build/ansible/DOCKERFILES/Dockerfile-work.j2
+++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2
@@ -88,6 +88,7 @@ RUN set -x \
 		nodejs \
 		postgresql-client \
 		python-pip \
+		redis-tools \
 		rubygems \
 		ruby-dev \
 		shellcheck \

From 02d9e642330df30ee09855aa6168da1fb94112bb Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Sun, 18 Mar 2018 18:38:18 +0100
Subject: [PATCH 6/8] Fix curl download

---
 Dockerfiles/work/Dockerfile-5.4  | 4 ++--
 Dockerfiles/work/Dockerfile-5.5  | 4 ++--
 Dockerfiles/work/Dockerfile-5.6  | 4 ++--
 Dockerfiles/work/Dockerfile-7.0  | 4 ++--
 Dockerfiles/work/Dockerfile-7.1  | 4 ++--
 Dockerfiles/work/Dockerfile-7.2  | 4 ++--
 build/ansible/group_vars/all.yml | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4
index 41ae845e..0198c339 100644
--- a/Dockerfiles/work/Dockerfile-5.4
+++ b/Dockerfiles/work/Dockerfile-5.4
@@ -189,11 +189,11 @@ RUN set -x \
 && rm -rf /usr/local/src/phalcon-devtools/.git \
  \
 # phpcs
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar 2>/dev/null /usr/local/bin/phpcs \
+	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
 && chmod +x /usr/local/bin/phpcs \
  \
 # phpcbf
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \
+	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
 && chmod +x /usr/local/bin/phpcbf \
  \
 # sass
diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5
index 5269d10d..fb6a215e 100644
--- a/Dockerfiles/work/Dockerfile-5.5
+++ b/Dockerfiles/work/Dockerfile-5.5
@@ -192,11 +192,11 @@ RUN set -x \
 && rm -rf /usr/local/src/phalcon-devtools/.git \
  \
 # phpcs
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar 2>/dev/null /usr/local/bin/phpcs \
+	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
 && chmod +x /usr/local/bin/phpcs \
  \
 # phpcbf
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \
+	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
 && chmod +x /usr/local/bin/phpcbf \
  \
 # sass
diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6
index f06cf574..3d2acd75 100644
--- a/Dockerfiles/work/Dockerfile-5.6
+++ b/Dockerfiles/work/Dockerfile-5.6
@@ -192,11 +192,11 @@ RUN set -x \
 && rm -rf /usr/local/src/phalcon-devtools/.git \
  \
 # phpcs
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar 2>/dev/null /usr/local/bin/phpcs \
+	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
 && chmod +x /usr/local/bin/phpcs \
  \
 # phpcbf
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \
+	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
 && chmod +x /usr/local/bin/phpcbf \
  \
 # sass
diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0
index 0ccca65a..41da78cb 100644
--- a/Dockerfiles/work/Dockerfile-7.0
+++ b/Dockerfiles/work/Dockerfile-7.0
@@ -192,11 +192,11 @@ RUN set -x \
 && rm -rf /usr/local/src/phalcon-devtools/.git \
  \
 # phpcs
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar 2>/dev/null /usr/local/bin/phpcs \
+	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
 && chmod +x /usr/local/bin/phpcs \
  \
 # phpcbf
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \
+	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
 && chmod +x /usr/local/bin/phpcbf \
  \
 # sass
diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1
index 56a6269c..cd14d15f 100644
--- a/Dockerfiles/work/Dockerfile-7.1
+++ b/Dockerfiles/work/Dockerfile-7.1
@@ -192,11 +192,11 @@ RUN set -x \
 && rm -rf /usr/local/src/phalcon-devtools/.git \
  \
 # phpcs
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar 2>/dev/null /usr/local/bin/phpcs \
+	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
 && chmod +x /usr/local/bin/phpcs \
  \
 # phpcbf
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \
+	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
 && chmod +x /usr/local/bin/phpcbf \
  \
 # sass
diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2
index 74ddee8d..0ff02608 100644
--- a/Dockerfiles/work/Dockerfile-7.2
+++ b/Dockerfiles/work/Dockerfile-7.2
@@ -192,11 +192,11 @@ RUN set -x \
 && rm -rf /usr/local/src/phalcon-devtools/.git \
  \
 # phpcs
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar 2>/dev/null /usr/local/bin/phpcs \
+	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
 && chmod +x /usr/local/bin/phpcs \
  \
 # phpcbf
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \
+	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
 && chmod +x /usr/local/bin/phpcbf \
  \
 # sass
diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml
index d7f1ff30..b68fe311 100644
--- a/build/ansible/group_vars/all.yml
+++ b/build/ansible/group_vars/all.yml
@@ -297,13 +297,13 @@ software_available:
     check: phpcs --version | grep -E 'version [.0-9]+'
     all:
       command: |
-        curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar 2>/dev/null /usr/local/bin/phpcs \
+        curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
         && chmod +x /usr/local/bin/phpcs \
   phpcbf:
     check: phpcbf --version | grep -E 'version [.0-9]+'
     all:
       command: |
-        curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \
+        curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
         && chmod +x /usr/local/bin/phpcbf \
   sass:
     check: sass --version | grep -E '[.0-9]+'

From 070e7ad7e973c6a4f31250beb7c7ac2201bd933e Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Sun, 18 Mar 2018 21:20:51 +0100
Subject: [PATCH 7/8] Add Python requirements

---
 Dockerfiles/work/Dockerfile-5.4  | 4 ++--
 Dockerfiles/work/Dockerfile-5.5  | 4 ++--
 Dockerfiles/work/Dockerfile-5.6  | 4 ++--
 Dockerfiles/work/Dockerfile-7.0  | 4 ++--
 Dockerfiles/work/Dockerfile-7.1  | 4 ++--
 Dockerfiles/work/Dockerfile-7.2  | 4 ++--
 build/ansible/group_vars/all.yml | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4
index 0198c339..99881025 100644
--- a/Dockerfiles/work/Dockerfile-5.4
+++ b/Dockerfiles/work/Dockerfile-5.4
@@ -207,9 +207,9 @@ RUN set -x \
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
 # yamllint
-	&& apt update && apt install --no-install-recommends --no-install-suggests -y libyaml-dev \
+	&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev \
 	&& pip install yamllint \
-	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libyaml-dev && rm -rf /var/lib/apt/lists/* \
+	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/* \
 # cleanup
 	&& rm -rf /home/${MY_USER}/.*json \
 && rm -rf /home/${MY_USER}/.cache \
diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5
index fb6a215e..4c7079cf 100644
--- a/Dockerfiles/work/Dockerfile-5.5
+++ b/Dockerfiles/work/Dockerfile-5.5
@@ -210,9 +210,9 @@ RUN set -x \
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
 # yamllint
-	&& apt update && apt install --no-install-recommends --no-install-suggests -y libyaml-dev \
+	&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev \
 	&& pip install yamllint \
-	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libyaml-dev && rm -rf /var/lib/apt/lists/* \
+	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/* \
 # cleanup
 	&& rm -rf /home/${MY_USER}/.*json \
 && rm -rf /home/${MY_USER}/.cache \
diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6
index 3d2acd75..826e3855 100644
--- a/Dockerfiles/work/Dockerfile-5.6
+++ b/Dockerfiles/work/Dockerfile-5.6
@@ -210,9 +210,9 @@ RUN set -x \
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
 # yamllint
-	&& apt update && apt install --no-install-recommends --no-install-suggests -y libyaml-dev \
+	&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev \
 	&& pip install yamllint \
-	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libyaml-dev && rm -rf /var/lib/apt/lists/* \
+	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/* \
 # cleanup
 	&& rm -rf /home/${MY_USER}/.*json \
 && rm -rf /home/${MY_USER}/.cache \
diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0
index 41da78cb..a41aeb2b 100644
--- a/Dockerfiles/work/Dockerfile-7.0
+++ b/Dockerfiles/work/Dockerfile-7.0
@@ -210,9 +210,9 @@ RUN set -x \
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
 # yamllint
-	&& apt update && apt install --no-install-recommends --no-install-suggests -y libyaml-dev \
+	&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev \
 	&& pip install yamllint \
-	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libyaml-dev && rm -rf /var/lib/apt/lists/* \
+	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/* \
 # cleanup
 	&& rm -rf /home/${MY_USER}/.*json \
 && rm -rf /home/${MY_USER}/.cache \
diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1
index cd14d15f..06e1aafd 100644
--- a/Dockerfiles/work/Dockerfile-7.1
+++ b/Dockerfiles/work/Dockerfile-7.1
@@ -210,9 +210,9 @@ RUN set -x \
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
 # yamllint
-	&& apt update && apt install --no-install-recommends --no-install-suggests -y libyaml-dev \
+	&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev \
 	&& pip install yamllint \
-	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libyaml-dev && rm -rf /var/lib/apt/lists/* \
+	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/* \
 # cleanup
 	&& rm -rf /home/${MY_USER}/.*json \
 && rm -rf /home/${MY_USER}/.cache \
diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2
index 0ff02608..565c2b2e 100644
--- a/Dockerfiles/work/Dockerfile-7.2
+++ b/Dockerfiles/work/Dockerfile-7.2
@@ -210,9 +210,9 @@ RUN set -x \
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
 # yamllint
-	&& apt update && apt install --no-install-recommends --no-install-suggests -y libyaml-dev \
+	&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev \
 	&& pip install yamllint \
-	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libyaml-dev && rm -rf /var/lib/apt/lists/* \
+	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/* \
 # cleanup
 	&& rm -rf /home/${MY_USER}/.*json \
 && rm -rf /home/${MY_USER}/.cache \
diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml
index b68fe311..fc7fad48 100644
--- a/build/ansible/group_vars/all.yml
+++ b/build/ansible/group_vars/all.yml
@@ -326,9 +326,9 @@ software_available:
   yamllint:
     check: yamllint --version 2>&1 | grep -E '[.0-9]+'
     all:
-      pre: apt update && apt install --no-install-recommends --no-install-suggests -y libyaml-dev
+      pre: apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev
       command: pip install yamllint
-      post: apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libyaml-dev && rm -rf /var/lib/apt/lists/*
+      post: apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/*
   cleanup:
     all:
       command: |

From a6b1fa82a9c8647e82296755bf0b3a171f6c394b Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Mon, 19 Mar 2018 07:50:43 +0100
Subject: [PATCH 8/8] Fix PHP 7.2 install

---
 Dockerfiles/work/Dockerfile-5.4  | 4 ++--
 Dockerfiles/work/Dockerfile-5.5  | 4 ++--
 Dockerfiles/work/Dockerfile-5.6  | 4 ++--
 Dockerfiles/work/Dockerfile-7.0  | 4 ++--
 Dockerfiles/work/Dockerfile-7.1  | 4 ++--
 Dockerfiles/work/Dockerfile-7.2  | 4 ++--
 build/ansible/group_vars/all.yml | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4
index 99881025..c5706fc2 100644
--- a/Dockerfiles/work/Dockerfile-5.4
+++ b/Dockerfiles/work/Dockerfile-5.4
@@ -207,9 +207,9 @@ RUN set -x \
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
 # yamllint
-	&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev \
+	&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \
 	&& pip install yamllint \
-	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/* \
+	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \
 # cleanup
 	&& rm -rf /home/${MY_USER}/.*json \
 && rm -rf /home/${MY_USER}/.cache \
diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5
index 4c7079cf..c64d3edd 100644
--- a/Dockerfiles/work/Dockerfile-5.5
+++ b/Dockerfiles/work/Dockerfile-5.5
@@ -210,9 +210,9 @@ RUN set -x \
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
 # yamllint
-	&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev \
+	&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \
 	&& pip install yamllint \
-	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/* \
+	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \
 # cleanup
 	&& rm -rf /home/${MY_USER}/.*json \
 && rm -rf /home/${MY_USER}/.cache \
diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6
index 826e3855..c23ecce9 100644
--- a/Dockerfiles/work/Dockerfile-5.6
+++ b/Dockerfiles/work/Dockerfile-5.6
@@ -210,9 +210,9 @@ RUN set -x \
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
 # yamllint
-	&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev \
+	&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \
 	&& pip install yamllint \
-	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/* \
+	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \
 # cleanup
 	&& rm -rf /home/${MY_USER}/.*json \
 && rm -rf /home/${MY_USER}/.cache \
diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0
index a41aeb2b..2ff108ea 100644
--- a/Dockerfiles/work/Dockerfile-7.0
+++ b/Dockerfiles/work/Dockerfile-7.0
@@ -210,9 +210,9 @@ RUN set -x \
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
 # yamllint
-	&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev \
+	&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \
 	&& pip install yamllint \
-	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/* \
+	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \
 # cleanup
 	&& rm -rf /home/${MY_USER}/.*json \
 && rm -rf /home/${MY_USER}/.cache \
diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1
index 06e1aafd..1853520c 100644
--- a/Dockerfiles/work/Dockerfile-7.1
+++ b/Dockerfiles/work/Dockerfile-7.1
@@ -210,9 +210,9 @@ RUN set -x \
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
 # yamllint
-	&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev \
+	&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \
 	&& pip install yamllint \
-	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/* \
+	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \
 # cleanup
 	&& rm -rf /home/${MY_USER}/.*json \
 && rm -rf /home/${MY_USER}/.cache \
diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2
index 565c2b2e..e67d69ca 100644
--- a/Dockerfiles/work/Dockerfile-7.2
+++ b/Dockerfiles/work/Dockerfile-7.2
@@ -210,9 +210,9 @@ RUN set -x \
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
 # yamllint
-	&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev \
+	&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \
 	&& pip install yamllint \
-	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/* \
+	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \
 # cleanup
 	&& rm -rf /home/${MY_USER}/.*json \
 && rm -rf /home/${MY_USER}/.cache \
diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml
index fc7fad48..253eca16 100644
--- a/build/ansible/group_vars/all.yml
+++ b/build/ansible/group_vars/all.yml
@@ -326,9 +326,9 @@ software_available:
   yamllint:
     check: yamllint --version 2>&1 | grep -E '[.0-9]+'
     all:
-      pre: apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev
+      pre: apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev
       command: pip install yamllint
-      post: apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/*
+      post: apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/*
   cleanup:
     all:
       command: |