From b79e4b5b1b3fc206d7f57f046b116ec7938ba870 Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Sat, 11 Aug 2018 23:00:52 +0200
Subject: [PATCH] Fix wp-cli installation

---
 Dockerfiles/work/Dockerfile-5.2  | 4 ++++
 Dockerfiles/work/Dockerfile-5.3  | 2 +-
 build/ansible/group_vars/all.yml | 7 ++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2
index 2394e15..d95f47e 100644
--- a/Dockerfiles/work/Dockerfile-5.2
+++ b/Dockerfiles/work/Dockerfile-5.2
@@ -186,6 +186,9 @@ RUN set -x \
 	&& gem install sass \
 # webpack
 	&& npm install -g webpack webpack-cli \
+# wpcli
+	&& curl https://github.com/wp-cli/wp-cli/releases/download/v1.5.1/wp-cli-1.5.1.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 python-setuptools libyaml-dev \
 	&& pip install yamllint \
@@ -261,6 +264,7 @@ RUN set -x \
 	&& phpcbf --version | grep -E 'version [.0-9]+' \
 	&& sass --version | grep -E '[.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.3 b/Dockerfiles/work/Dockerfile-5.3
index 5c8b19f..b40f228 100644
--- a/Dockerfiles/work/Dockerfile-5.3
+++ b/Dockerfiles/work/Dockerfile-5.3
@@ -222,7 +222,7 @@ RUN set -x \
 # webpack
 	&& npm install -g webpack webpack-cli \
 # wpcli
-	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
+	&& curl https://github.com/wp-cli/wp-cli/releases/download/v1.5.1/wp-cli-1.5.1.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 python-setuptools libyaml-dev \
diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml
index b601582..92496e5 100644
--- a/build/ansible/group_vars/all.yml
+++ b/build/ansible/group_vars/all.yml
@@ -567,8 +567,13 @@ software_available:
       command: curl https://symfony.com/installer -L -o /usr/local/bin/symfony
       post: chmod +x /usr/local/bin/symfony
   wpcli:
-    disabled: [5.2]
     check: wp --allow-root --version | grep -E '[.0-9]+'
+    5.2:
+      command: curl https://github.com/wp-cli/wp-cli/releases/download/v1.5.1/wp-cli-1.5.1.phar -L -o /usr/local/bin/wp
+      post: chmod +x /usr/local/bin/wp
+    5.3:
+      command: curl https://github.com/wp-cli/wp-cli/releases/download/v1.5.1/wp-cli-1.5.1.phar -L -o /usr/local/bin/wp
+      post: chmod +x /usr/local/bin/wp
     all:
       command: curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp
       post: chmod +x /usr/local/bin/wp