Merge pull request #45 from devilbox/release-0.32

Fix mhsendmail path
2025-12-12 20:11:16 +00:00 · 2018-08-13 01:08:38 +02:00 · 2018-08-12 12:32:51 +02:00 · 2018-08-12 11:25:52 +02:00 · 2018-08-11 23:41:19 +02:00 · 2018-08-11 23:02:57 +02:00
13 changed files with 30 additions and 15 deletions
--- a/Dockerfiles/prod/data/docker-entrypoint.d/38-enable-modules.sh
+++ b/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

--- a/Dockerfiles/prod/data/docker-entrypoint.d/39-disable-modules.sh
+++ b/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

--- a/Dockerfiles/work/Dockerfile-5.2
+++ b/Dockerfiles/work/Dockerfile-5.2
@@ -83,6 +83,7 @@ RUN set -x \
 		python-pip \
 		python-wheel \
 		redis-tools \
+		rsync \
 		rubygems \
 		ruby-dev \
 		shellcheck \
@@ -149,7 +150,7 @@ RUN set -x \
 # mhsendmail
 	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
-&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmai \
+&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
 \
 # mysqldumpsecure
 	&& git clone https://github.com/cytopia/mysqldump-secure.git /usr/local/src/mysqldump-secure \
--- a/Dockerfiles/work/Dockerfile-5.3
+++ b/Dockerfiles/work/Dockerfile-5.3
@@ -83,6 +83,7 @@ RUN set -x \
 		python-pip \
 		python-wheel \
 		redis-tools \
+		rsync \
 		rubygems \
 		ruby-dev \
 		shellcheck \
@@ -169,7 +170,7 @@ RUN set -x \
 # mhsendmail
 	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
-&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmai \
+&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
 \
 # mysqldumpsecure
 	&& git clone https://github.com/cytopia/mysqldump-secure.git /usr/local/src/mysqldump-secure \
@@ -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 \
--- a/Dockerfiles/work/Dockerfile-5.4
+++ b/Dockerfiles/work/Dockerfile-5.4
@@ -83,6 +83,7 @@ RUN set -x \
 		python-pip \
 		python-wheel \
 		redis-tools \
+		rsync \
 		rubygems \
 		ruby-dev \
 		shellcheck \
@@ -179,7 +180,7 @@ RUN set -x \
 # mhsendmail
 	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
-&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmai \
+&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
 \
 # mysqldumpsecure
 	&& git clone https://github.com/cytopia/mysqldump-secure.git /usr/local/src/mysqldump-secure \
--- a/Dockerfiles/work/Dockerfile-5.5
+++ b/Dockerfiles/work/Dockerfile-5.5
@@ -83,6 +83,7 @@ RUN set -x \
 		python-pip \
 		python-wheel \
 		redis-tools \
+		rsync \
 		rubygems \
 		ruby-dev \
 		shellcheck \
@@ -182,7 +183,7 @@ RUN set -x \
 # mhsendmail
 	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
-&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmai \
+&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
 \
 # mysqldumpsecure
 	&& git clone https://github.com/cytopia/mysqldump-secure.git /usr/local/src/mysqldump-secure \
--- a/Dockerfiles/work/Dockerfile-5.6
+++ b/Dockerfiles/work/Dockerfile-5.6
@@ -83,6 +83,7 @@ RUN set -x \
 		python-pip \
 		python-wheel \
 		redis-tools \
+		rsync \
 		rubygems \
 		ruby-dev \
 		shellcheck \
@@ -182,7 +183,7 @@ RUN set -x \
 # mhsendmail
 	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
-&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmai \
+&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
 \
 # mysqldumpsecure
 	&& git clone https://github.com/cytopia/mysqldump-secure.git /usr/local/src/mysqldump-secure \
--- a/Dockerfiles/work/Dockerfile-7.0
+++ b/Dockerfiles/work/Dockerfile-7.0
@@ -83,6 +83,7 @@ RUN set -x \
 		python-pip \
 		python-wheel \
 		redis-tools \
+		rsync \
 		rubygems \
 		ruby-dev \
 		shellcheck \
@@ -182,7 +183,7 @@ RUN set -x \
 # mhsendmail
 	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
-&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmai \
+&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
 \
 # mysqldumpsecure
 	&& git clone https://github.com/cytopia/mysqldump-secure.git /usr/local/src/mysqldump-secure \
--- a/Dockerfiles/work/Dockerfile-7.1
+++ b/Dockerfiles/work/Dockerfile-7.1
@@ -83,6 +83,7 @@ RUN set -x \
 		python-pip \
 		python-wheel \
 		redis-tools \
+		rsync \
 		rubygems \
 		ruby-dev \
 		shellcheck \
@@ -182,7 +183,7 @@ RUN set -x \
 # mhsendmail
 	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
-&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmai \
+&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
 \
 # mysqldumpsecure
 	&& git clone https://github.com/cytopia/mysqldump-secure.git /usr/local/src/mysqldump-secure \
--- a/Dockerfiles/work/Dockerfile-7.2
+++ b/Dockerfiles/work/Dockerfile-7.2
@@ -83,6 +83,7 @@ RUN set -x \
 		python-pip \
 		python-wheel \
 		redis-tools \
+		rsync \
 		rubygems \
 		ruby-dev \
 		shellcheck \
@@ -182,7 +183,7 @@ RUN set -x \
 # mhsendmail
 	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
-&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmai \
+&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
 \
 # mysqldumpsecure
 	&& git clone https://github.com/cytopia/mysqldump-secure.git /usr/local/src/mysqldump-secure \
--- a/Dockerfiles/work/Dockerfile-7.3
+++ b/Dockerfiles/work/Dockerfile-7.3
@@ -83,6 +83,7 @@ RUN set -x \
 		python-pip \
 		python-wheel \
 		redis-tools \
+		rsync \
 		rubygems \
 		ruby-dev \
 		shellcheck \
@@ -182,7 +183,7 @@ RUN set -x \
 # mhsendmail
 	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
-&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmai \
+&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
 \
 # mysqldumpsecure
 	&& git clone https://github.com/cytopia/mysqldump-secure.git /usr/local/src/mysqldump-secure \
--- a/build/ansible/DOCKERFILES/Dockerfile-work.j2
+++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2
@@ -98,6 +98,7 @@ RUN set -x \
 		python-pip \
 		python-wheel \
 		redis-tools \
+		rsync \
 		rubygems \
 		ruby-dev \
 		shellcheck \
--- a/build/ansible/group_vars/all.yml
+++ b/build/ansible/group_vars/all.yml
@@ -445,7 +445,7 @@ software_available:
      command: |
        wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
        && chmod +x mhsendmail_linux_amd64 \
-        && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmai \
+        && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
  mysqldumpsecure:
    check: mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+'
    all:
@@ -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
Author	SHA1	Message	Date
cytopia	cfc06a1458	Merge pull request #45 from devilbox/release-0.32 Fix mhsendmail path	2018-08-13 01:08:38 +02:00
cytopia	92eceb9ae9	Fix mhsendmail path	2018-08-12 12:32:51 +02:00
cytopia	796195dfdc	Merge pull request #44 from devilbox/release-0.31 Fix wp-cli installation	2018-08-12 11:25:52 +02:00
cytopia	3c17b4d3c1	Revert PHP 5.2 wpcli	2018-08-11 23:41:19 +02:00
cytopia	b79e4b5b1b	Fix wp-cli installation	2018-08-11 23:02:57 +02:00
cytopia	d82a529955	Merge pull request #43 from devilbox/php-modules-warning PHP modules warning	2018-08-11 23:02:29 +02:00
cytopia	c41d30c92f	Add missing return after gathering state of PHP modules to disable	2018-08-10 09:37:08 +02:00
cytopia	3ffa64ad3a	Add missing return after gathering state of additional PHP modules	2018-08-10 09:34:28 +02:00
cytopia	3a901f1699	Merge pull request #42 from devilbox/rsync Adding rsync as a standard tool to all container	2018-08-08 08:25:43 +02:00
cytopia	e4c9e70957	Generate Dockerfiles	2018-08-08 00:14:28 +02:00
cytopia	619af1207d	Adding tool: rsync	2018-08-08 00:13:14 +02:00