Merge pull request #44 from devilbox/release-0.31

Fix wp-cli installation

Dockerfiles/prod/data/docker-entrypoint.d/38-enable-modules.sh

@@ -27,10 +27,11 @@ enable_modules() {
 
 		if [ -z "${mods}" ]; then
 			log "info" "\$${mod_varname} set, but empty. Not enabling any PHP modules." "${debug}"
-		else
-			log "info" "Enabling the following PHP modules: ${mods}" "${debug}"
+			return 0
 		fi
 
+		log "info" "Enabling the following PHP modules: ${mods}" "${debug}"
+
 		while read -r mod; do
 			mod="$( echo "${mod}" | xargs )" # trim
 

Dockerfiles/prod/data/docker-entrypoint.d/39-disable-modules.sh

@@ -24,10 +24,11 @@ disable_modules() {
 
 		if [ -z "${mods}" ]; then
 			log "info" "\$${mod_varname} set, but empty. Not disabling any PHP modules." "${debug}"
-		else
-			log "info" "Disabling the following PHP modules: ${mods}" "${debug}"
+			return 0
 		fi
 
+		log "info" "Disabling the following PHP modules: ${mods}" "${debug}"
+
 		while read -r mod; do
 			mod="$( echo "${mod}" | xargs )" # trim
 

Dockerfiles/work/Dockerfile-5.2

@@ -83,6 +83,7 @@ RUN set -x \
 		python-pip \
 		python-wheel \
 		redis-tools \
+		rsync \
 		rubygems \
 		ruby-dev \
 		shellcheck \

Dockerfiles/work/Dockerfile-5.3

@@ -83,6 +83,7 @@ RUN set -x \
 		python-pip \
 		python-wheel \
 		redis-tools \
+		rsync \
 		rubygems \
 		ruby-dev \
 		shellcheck \
@@ -221,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 \

Dockerfiles/work/Dockerfile-5.4

@@ -83,6 +83,7 @@ RUN set -x \
 		python-pip \
 		python-wheel \
 		redis-tools \
+		rsync \
 		rubygems \
 		ruby-dev \
 		shellcheck \

Dockerfiles/work/Dockerfile-5.5

@@ -83,6 +83,7 @@ RUN set -x \
 		python-pip \
 		python-wheel \
 		redis-tools \
+		rsync \
 		rubygems \
 		ruby-dev \
 		shellcheck \

Dockerfiles/work/Dockerfile-5.6

@@ -83,6 +83,7 @@ RUN set -x \
 		python-pip \
 		python-wheel \
 		redis-tools \
+		rsync \
 		rubygems \
 		ruby-dev \
 		shellcheck \

Dockerfiles/work/Dockerfile-7.0

@@ -83,6 +83,7 @@ RUN set -x \
 		python-pip \
 		python-wheel \
 		redis-tools \
+		rsync \
 		rubygems \
 		ruby-dev \
 		shellcheck \

Dockerfiles/work/Dockerfile-7.1

@@ -83,6 +83,7 @@ RUN set -x \
 		python-pip \
 		python-wheel \
 		redis-tools \
+		rsync \
 		rubygems \
 		ruby-dev \
 		shellcheck \

Dockerfiles/work/Dockerfile-7.2

@@ -83,6 +83,7 @@ RUN set -x \
 		python-pip \
 		python-wheel \
 		redis-tools \
+		rsync \
 		rubygems \
 		ruby-dev \
 		shellcheck \

Dockerfiles/work/Dockerfile-7.3

@@ -83,6 +83,7 @@ RUN set -x \
 		python-pip \
 		python-wheel \
 		redis-tools \
+		rsync \
 		rubygems \
 		ruby-dev \
 		shellcheck \

build/ansible/DOCKERFILES/Dockerfile-work.j2

@@ -98,6 +98,7 @@ RUN set -x \
 		python-pip \
 		python-wheel \
 		redis-tools \
+		rsync \
 		rubygems \
 		ruby-dev \
 		shellcheck \

build/ansible/group_vars/all.yml

@@ -569,6 +569,9 @@ software_available:
   wpcli:
     disabled: [5.2]
     check: wp --allow-root --version | grep -E '[.0-9]+'
+    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