pm.sh - npm Package Compare versions

Comparing version 1.1.5 to 1.1.6

package.json

 {
   "name": "pm.sh",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "pm2 without the fat in 1 shellscript, unix processmanagement using simply 'ps' and 'flock' and a teaspoon of shellscript & extra features",
@@ -5,0 +5,0 @@ "main": "index.js",

README.md

@@ -5,3 +5,3 @@ <img src="doc/logo.png" width="120"/>
 
-Philosophy: #unixy, #lightweight, #nodependencies, #commandline, #minimal, #github, #bitbucket
+Philosophy: #unixy, #lightweight, #nodependencies, #docker, #commandline, #minimal, #github, #bitbucket
 Basically it's pm2 without the fat, and `ps`+`flock` wrapped in bash.
@@ -96,6 +96,39 @@
 
+## Trigger a Dockercontainer rebuild using webhooks
+
+Here's a quick way to achieve this:
+
+> Put a `Dockerfile` and this script in `webhook.sh` in your repo :
+
+    #!/bin/bash
+    set -e
+    rollback(){
+      docker rename yourcontainer.bak yourcontainer
+      docker start yourcontainer
+    }
+
+    trap rollback ERR                # rollback if any error
+
+    docker stop yourcontainer
+    docker rename yourcontainer yourcontainer.bak
+    docker build -t yourcontainer .
+    docker run -d yourcontainer 
+    docker rm -f yourcontainer.bak    
+
+    tail -f /dev/null                # do nothing until next webhook
+
+Then install the repo on your liveserver:
+
+    $ git clone [e-mail]/myusername/foo.git
+    $ cd foo
+    $ pm add $(pwd) docker.myproject bin/webhook.sh
+    $ pm start docker.myproject
+
+> Voila! Now configure 'http://yourliveserver.com:9000/pull/docker.myproject' in the `webhooks`-session of your repo.
+ 
+
 ## Why
 
-I love pm2 and other tools.
-However, I've lost a lot of time on managing problems which are actually solved in unix already.
+I love pm2, docker and other tools.
+However, I've wasted lots of time on managing problems which are actually solved in unix already.
 Instead of fiddling with upstart daemon-scripts or pm2's codebase, I longed for a unixy pm2 workflow.
@@ -117,30 +150,30 @@ Eventhough i love nodejs, in some cases shellscript/unix seems more appropriate.
 
-		# Usage:
-		#   docker build -t playterm .
-		#   docker run -it -e PROXY_PORT=8080 -e WEBHOOK_PORT=8080 -v $(pwd)/data:/data yourproject
-		FROM coderofsalvation/pm.sh-nodejs:latest
+    # Usage:
+    #   docker build -t playterm .
+    #   docker run -it -e PROXY_PORT=8080 -e WEBHOOK_PORT=8080 -v $(pwd)/data:/data yourproject
+    FROM coderofsalvation/pm.sh-nodejs:latest
 
-		MAINTAINER Coder Of Salvation <[e-mail]>
+    MAINTAINER Coder Of Salvation <[e-mail]>
 
-		ENV VERSION=v4.1.1
+    ENV VERSION=v4.1.1
 
-		RUN echo 'http://dl-3.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories
-		RUN apk upgrade --update
-		RUN apk add mongodb
+    RUN echo 'http://dl-3.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories
+    RUN apk upgrade --update
+    RUN apk add mongodb
 
-		ADD . /srv/apps/yourproject
-		VOLUME data /data
+    ADD . /srv/apps/yourproject
+    VOLUME data /data
 
-		EXPOSE 8080 80 8081 4000 4001 4002 4003
+    EXPOSE 8080 80 8081 4000 4001 4002 4003
 
-		CMD [ "sh","-c","/data/Dockerboot; cat" ]
+    CMD [ "sh","-c","/data/Dockerboot; cat" ]
 
 And put this in `data/Dockerboot`:
 
-		#!/bin/bash
-		export PROXY_PORT=8080
-		export WEBHOOK_PORT=8081
-		cp /srv/apps/playterm/lib/proxytable.js /srv/apps/proxytable.js
-		mongod &
-		/install/boot
-		su -c 'pm startall' nodejs 
+    #!/bin/bash
+    export PROXY_PORT=8080
+    export WEBHOOK_PORT=8081
+    cp /srv/apps/playterm/lib/proxytable.js /srv/apps/proxytable.js
+    mongod &
+    /install/boot
+    su -c 'pm startall' nodejs 

No alert changes

Improved metrics

Total package byte prevSize

95009

1.05%

Number of lines in readme file

177

22.92%

No dependency changes