upd ngx 1.21.1

Author: soulteary

README.md

@@ -15,6 +15,13 @@ An Nginx module for bringing the power of "echo", "sleep", "time" and more to Ng
         </tr>
     </thead>
     <tbody>
+        <tr>
+            <td>1.21.1</td>
+            <td>0.62</td>
+            <td><ul>
+                <li>docker pull soulteary/prebuilt-nginx-modules:ngx-1.21.1-echo-0.62</li>
+            </ul></td>
+        </tr>
         <tr>
             <td>1.21.0</td>
             <td>0.62</td>

docker/.env

@@ -1,5 +1,5 @@
-NGINX_VERSION=1.21.0
+NGINX_VERSION=1.21.1
 MODULE_CHECKSUM=c7457e5728c81f7013f52b61dcdb2b9eccab9e3a
 MODULE_VERSION=0.62
 MODULE_NAME=echo-nginx-module-src
-MODULE_SOURCE=https://github.com/nginx-with-docker/echo-nginx-module-src
+MODULE_SOURCE=https://github.com/nginx-with-docker/echo-nginx-module-src

make-image.sh

@@ -4,16 +4,16 @@ set -a
     . "docker/.env"
 set +a
 
-REPO_NAME="soulteary/prebuilt-nginx-modules"
-
-REPO_TAG="ngx-$NGINX_VERSION-echo-$MODULE_VERSION";
+PROJECT_NAME="echo"
+REPO_NAME="soulteary/prebuilt-nginx-modules";
+REPO_TAG="ngx-$NGINX_VERSION-$PROJECT_NAME-$MODULE_VERSION";
 
+BUILD_ARGS=$(tr '\n' ';' < "docker/.env" | sed 's/;$/\n/' | sed 's/^/ --build-arg /' | sed 's/;/ --build-arg /g')
 
 if [ -f "docker/Dockerfile.alpine" ]; then
     BUILD_NAME="$REPO_NAME:$REPO_TAG-alpine"
     if [[ "$(docker images -q $BUILD_NAME 2> /dev/null)" == "" ]]; then
         echo "Build: $BUILD_NAME";
-        BUILD_ARGS=$(tr '\n' ';' < "docker/.env" | sed 's/;$/\n/' | sed 's/^/ --build-arg /' | sed 's/;/ --build-arg /g')
         docker build $BUILD_ARGS --tag $BUILD_NAME -f docker/Dockerfile.alpine .
     fi
 fi
@@ -22,7 +22,6 @@ if [ -f "docker/Dockerfile.debian" ]; then
     BUILD_NAME="$REPO_NAME:$REPO_TAG"
     if [[ "$(docker images -q $BUILD_NAME 2> /dev/null)" == "" ]]; then
         echo "Build: $BUILD_NAME";
-        BUILD_ARGS=$(tr '\n' ';' < "docker/.env" | sed 's/;$/\n/' | sed 's/^/ --build-arg /' | sed 's/;/ --build-arg /g')
         docker build $BUILD_ARGS --tag $BUILD_NAME -f docker/Dockerfile.debian .
     fi
 fi

push-image.sh

@@ -1,23 +1,23 @@
 #!/bin/bash
 
-REPO_NAME="soulteary/prebuilt-nginx-modules";
-tag="echo";
-
 set -a
     . "docker/.env"
 set +a
 
+PROJECT_NAME="echo"
+REPO_NAME="soulteary/prebuilt-nginx-modules";
+REPO_TAG="ngx-$NGINX_VERSION-$PROJECT_NAME-$MODULE_VERSION";
 
 if [ -f "docker/Dockerfile.alpine" ]; then
-    BUILD_NAME="$REPO_NAME:$tag-$NGINX_VERSION-alpine"
+    BUILD_NAME="$REPO_NAME:$REPO_TAG-alpine"
     if [[ "$(docker images -q $BUILD_NAME 2> /dev/null)" != "" ]]; then
         echo "Push: $BUILD_NAME";
         docker push $BUILD_NAME;
     fi
 fi
 
 if [ -f "docker/Dockerfile.debian" ]; then
-    BUILD_NAME="$REPO_NAME:$tag-$NGINX_VERSION"
+    BUILD_NAME="$REPO_NAME:$REPO_TAG"
     if [[ "$(docker images -q $BUILD_NAME 2> /dev/null)" != "" ]]; then
         echo "Push: $BUILD_NAME";
         docker push $BUILD_NAME;