From 6e0db69047eb09031dd9ef982588df424cd01ed2 Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 28 Dec 2018 17:50:23 +0100 Subject: [PATCH] Add tool: Node.js Process Manager with a built-in Load Balancer --- Dockerfiles/work/Dockerfile-5.2 | 2 ++ Dockerfiles/work/Dockerfile-5.3 | 2 ++ Dockerfiles/work/Dockerfile-5.4 | 2 ++ Dockerfiles/work/Dockerfile-5.5 | 2 ++ Dockerfiles/work/Dockerfile-5.6 | 2 ++ Dockerfiles/work/Dockerfile-7.0 | 2 ++ Dockerfiles/work/Dockerfile-7.1 | 2 ++ Dockerfiles/work/Dockerfile-7.2 | 2 ++ Dockerfiles/work/Dockerfile-7.3 | 2 ++ Dockerfiles/work/Dockerfile-7.4 | 2 ++ build/ansible/group_vars/all.yml | 5 +++++ 11 files changed, 25 insertions(+) diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index ae5d49a..fdd3255 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -205,6 +205,8 @@ RUN set -x \ && curl -qL https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \ && chmod +x /usr/local/bin/phpcbf \ \ +# pm2 + && until npm install pm2 -g; do sleep 1; done \ # sass && gem install sass \ # webpack diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 48a7ef8..babacc7 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -239,6 +239,8 @@ RUN set -x \ && curl -qL https://phar.phpunit.de/phpunit-4.phar > /usr/local/bin/phpunit 2>/dev/null \ && chmod +x /usr/local/bin/phpunit \ \ +# pm2 + && until npm install pm2 -g; do sleep 1; done \ # sass && gem install sass \ # webpack diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index c997955..20c4b58 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -265,6 +265,8 @@ RUN set -x \ && curl -qL https://phar.phpunit.de/phpunit-4.phar > /usr/local/bin/phpunit 2>/dev/null \ && chmod +x /usr/local/bin/phpunit \ \ +# pm2 + && until npm install pm2 -g; do sleep 1; done \ # sass && gem install sass \ # symfony diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index f583995..e73e2a8 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -276,6 +276,8 @@ RUN set -x \ && COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \ && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ \ +# pm2 + && until npm install pm2 -g; do sleep 1; done \ # sass && gem install sass \ # symfony diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index af38f61..1ae4985 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -289,6 +289,8 @@ RUN set -x \ && COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \ && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ \ +# pm2 + && until npm install pm2 -g; do sleep 1; done \ # sass && gem install sass \ # symfony diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 71f718a..ed450f9 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -289,6 +289,8 @@ RUN set -x \ && COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \ && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ \ +# pm2 + && until npm install pm2 -g; do sleep 1; done \ # sass && gem install sass \ # symfony diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index fc1f085..1c7fffb 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -289,6 +289,8 @@ RUN set -x \ && COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \ && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ \ +# pm2 + && until npm install pm2 -g; do sleep 1; done \ # sass && gem install sass \ # symfony diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index afbea6d..90c5577 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -289,6 +289,8 @@ RUN set -x \ && COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \ && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ \ +# pm2 + && until npm install pm2 -g; do sleep 1; done \ # sass && gem install sass \ # symfony diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 37edbc2..b564650 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -278,6 +278,8 @@ RUN set -x \ && COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \ && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ \ +# pm2 + && until npm install pm2 -g; do sleep 1; done \ # sass && gem install sass \ # symfony diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index bea2d4e..c2e052d 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -278,6 +278,8 @@ RUN set -x \ && COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \ && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ \ +# pm2 + && until npm install pm2 -g; do sleep 1; done \ # sass && gem install sass \ # symfony diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index 475a586..21cce0c 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -220,6 +220,7 @@ software_enabled: - phpcbf - phpunit - photon + - pm2 - sass - symfony - webpack @@ -595,6 +596,10 @@ software_available: command: | COMPOSER_HOME="{{ compose_home }}" composer global require "photoncms/installer" \ && ln -s {{ compose_home }}/vendor/photoncms/installer/photon /usr/local/bin/photon \ + # https://github.com/Unitech/pm2 + pm2: + all: + command: until npm install pm2 -g; do sleep 1; done sass: check: sass --version | grep -E '[.0-9]+' all: