added extended version (#5)

* improved readme
* improved labels
* added smoke tests for nginx + changed STOPSIGNAL + minor improvements
* added extended version with extra lua modules: headers-more-nginx-module, lua-nginx-module, lua-resty-cookie, lua-resty-core, lua-resty-dns, lua-resty-lrucache, lua-resty-memcached, lua-resty-mysql, lua-resty-redis, lua-resty-shell, lua-resty-upstream-healthcheck, lua-resty-websocket, nginx-lua-prometheus, stream-lua-nginx-module
* fixed logos
* refactoring + benchmarks

Author: fabiocicerchia

README.md

@@ -0,0 +1,9 @@
+#!/bin/bash
+npm install artillery
+docker-compose -f docker-compose.test.yml up
+echo "ARTILLERY - NGINX"
+./node_modules/.bin/artillery run test/artillery-nginx.yml 
+echo "ARTILLERY - NGINX-LUA"
+./node_modules/.bin/artillery run test/artillery-nginx-lua.yml 
+echo "ARTILLERY - OPENRESTY"
+./node_modules/.bin/artillery run test/artillery-openresty.yml 

bin/benchmark.sh

@@ -9,7 +9,7 @@ function test() {
 
     FOUND=$(docker image ls -q fabiocicerchia/nginx-lua:$DOCKER_TAG | wc -l)
     if [ $FOUND -ne 0 ]; then
-        docker run -d --name nginx_lua_test -p 8080:80 -v $PWD/test/nginx.conf:/etc/nginx/nginx.conf fabiocicerchia/nginx-lua:$DOCKER_TAG
+        docker run -d --name nginx_lua_test -p 8080:80 -v $PWD/test/nginx-lua.conf:/etc/nginx/nginx.conf fabiocicerchia/nginx-lua:$DOCKER_TAG
         COUNT=0
         until [ $COUNT -eq 20 -o "$(curl --output /dev/null --silent --head --fail http://localhost:8080; echo $?)" == "0" ]; do
             echo -n '.'; sleep 0.5;
@@ -20,6 +20,7 @@ function test() {
         docker rm -f nginx_lua_test
      else
         echo "Image not found: fabiocicerchia/nginx-lua:$DOCKER_TAG"
+        exit 1
      fi
 }
 
@@ -29,29 +30,31 @@ function runtest() {
     OS_VER=$3
     VER_TAGS=$4
     OS_TAGS=$5
+    DEFAULT=$6
 
     MAJOR=$(echo $NGINX_VER | cut -d '.' -f 1)
     MINOR=$MAJOR.$(echo $NGINX_VER | cut -d '.' -f 2)
     PATCH=$NGINX_VER
 
     test $PATCH-$OS$OS_VER
+    test $MINOR-$OS$OS_VER
+    test $MAJOR-$OS$OS_VER
 
-    if [ "$VER_TAGS$OS_TAGS" == "11" ]; then
+    if [ "$VER_TAGS$OS_TAGS$DEFAULT" == "111" ]; then
         test $MAJOR
-        test $MAJOR-$OS
-        test $MAJOR-$OS$OS_VER
         test $MINOR
         test $PATCH
+        test latest
+    fi
+
+    if [ "$VER_TAGS$OS_TAGS" == "11" ]; then
+        test $MAJOR-$OS
+        test $MAJOR-$OS$OS_VER
     fi
 
     if [ "$OS_TAGS" == "1" ]; then
         test $MINOR-$OS
         test $PATCH-$OS
-        test $MINOR-$OS$OS_VER
-    fi
-
-    if [ "$VER_TAGS$OS_TAGS" == "11" ]; then
-        test latest
     fi
 
 }
@@ -68,6 +71,8 @@ elif [ "$OS" == "fedora" ]; then VERSIONS=$FEDORA
 elif [ "$OS" == "ubuntu" ]; then VERSIONS=$UBUNTU
 fi
 
+docker images
+
 NLEN=${#NGINX[@]}
 for (( I=0; I<$NLEN; I++ )); do
     NGINX_VER="${NGINX[$I]}"

bin/test.sh

@@ -0,0 +1,20 @@
+version: '3.7'
+services:
+  nginx-lua:
+    image: fabiocicerchia/nginx-lua:latest
+    ports:
+     - 8080:80
+    volumes:
+      - ./test/nginx-lua.conf:/etc/nginx/nginx.conf
+  nginx:
+    image: nginx:latest
+    ports:
+     - 8081:80
+    volumes:
+      - ./test/nginx-non-lua.conf:/etc/nginx/nginx.conf
+  openresty:
+    image: openresty/openresty:latest
+    ports:
+     - 8082:80
+    volumes:
+      - ./test/nginx-lua.conf:/etc/nginx/nginx.conf