From 3fe2740075f486e572e7ccf969bb183c2af20dd0 Mon Sep 17 00:00:00 2001
From: Ali Mihandoost <ali.mihandoost@gmail.com>
Date: Sun, 26 Nov 2023 14:24:29 +0330
Subject: [PATCH 01/10] chore(ci): enhance and update

---
 .github/workflows/publish-container.yml | 31 ++++++++++++++++---------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/publish-container.yml b/.github/workflows/publish-container.yml
index 28c700f..ebec9f9 100644
--- a/.github/workflows/publish-container.yml
+++ b/.github/workflows/publish-container.yml
@@ -16,7 +16,6 @@ on:
       - created
 
 env:
-  REGISTRY: ghcr.io
   USER: alwatr
 
 jobs:
@@ -36,6 +35,7 @@ jobs:
           - path: nginx-cdn
           - path: nginx-pwa
           - path: nginx-ws
+          - path: nginx-json
 
     permissions:
       contents: read
@@ -68,14 +68,21 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
-          key: alwatr-${{ matrix.path }}
+          key: container/${{ matrix.path }}
 
-      - name: 🏗 Log into registry ${{env.REGISTRY}}
+      - name: 🏗 Log into docker hub registry
         if: ${{ github.event_name != 'pull_request' && steps.file_change.outputs.container_folder != 'false' }}
         uses: docker/login-action@v3.0.0
         with:
-          registry: ${{env.REGISTRY}}
-          username: ${{github.repository_owner}}
+          username: ${{env.USER}}
+          password: ${{secrets.DOCKER_HUB_TOKEN}}
+
+      - name: 🏗 Log into ghcr.io registry
+        if: ${{ github.event_name != 'pull_request' && steps.file_change.outputs.container_folder != 'false' }}
+        uses: docker/login-action@v3.0.0
+        with:
+          registry: ghcr.io
+          username: ${{env.USER}}
           password: ${{secrets.GITHUB_TOKEN}}
 
       - name: 🏗 Extract metadata
@@ -84,7 +91,9 @@ jobs:
         uses: docker/metadata-action@v5.0.0
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
-          images: name=${{env.REGISTRY}}/${{env.USER}}/${{matrix.path}},enable=true
+          images: |
+            name=ghcr.io/${{env.USER}}/${{matrix.path}},enable=true
+            name=docker.io/${{env.USER}}/${{matrix.path}},enable=true
           tags: |
             type=semver,enable=true,pattern={{major}}
             type=semver,enable=true,pattern={{major}}.{{minor}}
@@ -105,8 +114,8 @@ jobs:
             BUILD_DATE=${{github.event.repository.updated_at}}
             BUILD_REV=${{github.sha}}
 
-      - name: 🏗 Sign the image with GitHub OIDC Token
-        if: ${{ github.event_name != 'pull_request' && steps.file_change.outputs.container_folder != 'false' }}
-        env:
-          COSIGN_EXPERIMENTAL: 'true'
-        run: echo "${{steps.meta.outputs.tags}}" | xargs -I {} cosign sign --yes {}@${{steps.build_and_push.outputs.digest}}
+      # - name: 🏗 Sign the image with GitHub OIDC Token
+      #   if: ${{ github.event_name != 'pull_request' && steps.file_change.outputs.container_folder != 'false' }}
+      #   env:
+      #     COSIGN_EXPERIMENTAL: 'true'
+      #   run: echo "${{steps.meta.outputs.tags}}" | xargs -I {} cosign sign --yes {}@${{steps.build_and_push.outputs.digest}}

From 573eea6e6acca904f7ba9c05872985c1aa4be1f2 Mon Sep 17 00:00:00 2001
From: Ali Mihandoost <ali.mihandoost@gmail.com>
Date: Sun, 26 Nov 2023 14:25:51 +0330
Subject: [PATCH 02/10] feat(nginx): enhance for v2, fix version

BREAKING CHANGE: WORKDIR changed to /data
---
 nginx/.dockerignore |  2 +-
 nginx/Dockerfile    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nginx/.dockerignore b/nginx/.dockerignore
index 41d1e72..eb786ee 100644
--- a/nginx/.dockerignore
+++ b/nginx/.dockerignore
@@ -1,3 +1,3 @@
 *
 !etc/nginx/
-!var/www/
+!data/
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index 87c73a2..d906307 100644
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -1,23 +1,23 @@
 FROM docker.io/library/nginx:1.25.3-alpine3.18-slim
 
-RUN rm -rfv /docker-entrypoint* /etc/nginx/conf.d/* /etc/nginx/nginx.conf /var/www/html /usr/share/nginx/html
+RUN rm -rfv /docker-entrypoint* /etc/nginx/conf.d/* /etc/nginx/nginx.conf /var/www/html /usr/share/nginx/html /data
 COPY etc/nginx/ /etc/nginx/
 RUN chmod a+rx /etc/nginx/entrypoint.sh /etc/nginx/entrypoint.d/*.sh
 RUN ls -RlAhF /etc/nginx/
 
 EXPOSE 80
 STOPSIGNAL SIGQUIT
-WORKDIR /var/www/html/
+WORKDIR /data
 ENTRYPOINT ["/etc/nginx/entrypoint.sh"]
 CMD ["nginx", "-g", "daemon off;"]
 
 ARG BUILD_REV
 ARG BUILD_DATE
 LABEL org.opencontainers.image.title="alwatr/nginx" \
-      org.opencontainers.image.description="NGINX web server slim (light), packaged by Alwatr." \
+      org.opencontainers.image.description="The slim (lightweight) version of the NGINX web server, packaged by Alwatr." \
       org.opencontainers.image.base.name="docker.io/library/nginx:1.25.3-alpine3.18-slim" \
-      org.opencontainers.image.version="1.1.1-n1.25.3" \
-      org.opencontainers.image.ref.name="1.1.1-n1.25.3-a3.18-slim" \
+      org.opencontainers.image.version="1.25.3" \
+      org.opencontainers.image.ref.name="1.25.3-alpine3.18-slim" \
       org.opencontainers.image.licenses="MIT" \
       org.opencontainers.image.created=${BUILD_DATE} \
       org.opencontainers.image.revision=${BUILD_REV} \

From eb717f72c5ae5d02d13629e6b5e1a4adfd3dbd58 Mon Sep 17 00:00:00 2001
From: Ali Mihandoost <ali.mihandoost@gmail.com>
Date: Sun, 26 Nov 2023 14:27:40 +0330
Subject: [PATCH 03/10] feat(nginx-core): enhance and update workdir and
 document root

BREAKING CHANGE: WORKDIR and default NGINX_DOCUMENT_ROOT changed to /data
---
 nginx-core/.dockerignore                     |  2 +-
 nginx-core/Dockerfile                        | 18 +++++----
 nginx-core/{var/www => data}/_error.html     |  2 +-
 nginx-core/{var/www/html => data}/index.html | 40 ++++++++++----------
 4 files changed, 32 insertions(+), 30 deletions(-)
 rename nginx-core/{var/www => data}/_error.html (96%)
 rename nginx-core/{var/www/html => data}/index.html (82%)

diff --git a/nginx-core/.dockerignore b/nginx-core/.dockerignore
index 41d1e72..eb786ee 100644
--- a/nginx-core/.dockerignore
+++ b/nginx-core/.dockerignore
@@ -1,3 +1,3 @@
 *
 !etc/nginx/
-!var/www/
+!data/
diff --git a/nginx-core/Dockerfile b/nginx-core/Dockerfile
index b35478f..69c225a 100644
--- a/nginx-core/Dockerfile
+++ b/nginx-core/Dockerfile
@@ -1,11 +1,13 @@
-FROM ghcr.io/alwatr/nginx:1.1.1
+FROM ghcr.io/alwatr/nginx:2.0.0
 
 RUN apk add --no-cache curl
 HEALTHCHECK --interval=30s --timeout=3s --start-period=1s --retries=3 CMD curl -fso /dev/null http://localhost/server-info || exit 1
 
+WORKDIR /data
+
 COPY etc/nginx/ /etc/nginx/
-COPY var/www/ /var/www/
-RUN ls -RlAhF /etc/nginx/
+COPY data/ .
+RUN ls -RlahF /etc/nginx /data
 
 # Default environment for nginx template
 ENV NGINX_ACCESS_LOG="/var/log/nginx/access.log json" \
@@ -14,7 +16,7 @@ ENV NGINX_ACCESS_LOG="/var/log/nginx/access.log json" \
     NGINX_LIMIT_REQ_ERROR=503 \
     NGINX_LIMIT_REQ_LOG=notice \
     NGINX_AUTOINDEX=off \
-    NGINX_DOCUMENT_ROOT=/var/www/html \
+    NGINX_DOCUMENT_ROOT=/data \
     NGINX_FORCE_DOMAIN="" \
     NGINX_FORCE_DOMAIN_STATUS=302 \
     NGINX_FORCE_REDIRECT_STATUS=302 \
@@ -40,10 +42,10 @@ ENV NGINX_CLIENT_MAX_BODY_SIZE=10m \
 ARG BUILD_REV
 ARG BUILD_DATE
 LABEL org.opencontainers.image.title="alwatr/nginx-core" \
-      org.opencontainers.image.description="High-performance, accelerated NGINX, optimized for serving static content. Enhanced and accelerated by Alwatr." \
-      org.opencontainers.image.base.name="ghcr.io/alwatr/nginx:1.1.1" \
-      org.opencontainers.image.version="1.1.1-n1.25.3" \
-      org.opencontainers.image.ref.name="1.1.1-n1.25.3-a3.18-slim" \
+      org.opencontainers.image.description="HThis is a high-performance version of NGINX, which has been enhanced by Alwatr for the purpose of serving static content efficiently." \
+      org.opencontainers.image.base.name="ghcr.io/alwatr/nginx:2.0.0" \
+      org.opencontainers.image.version="2.0.0-nginx1.25.3" \
+      org.opencontainers.image.ref.name="2.0.0-nginx1.25.3-alpine3.18-slim" \
       org.opencontainers.image.licenses="MIT" \
       org.opencontainers.image.created=${BUILD_DATE} \
       org.opencontainers.image.revision=${BUILD_REV} \
diff --git a/nginx-core/var/www/_error.html b/nginx-core/data/_error.html
similarity index 96%
rename from nginx-core/var/www/_error.html
rename to nginx-core/data/_error.html
index 367f4f0..d5779da 100644
--- a/nginx-core/var/www/_error.html
+++ b/nginx-core/data/_error.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8"/>
   <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
   <!--# if expr="$status = 502" -->
-  <meta http-equiv="refresh" content="2">
+  <meta http-equiv="refresh" content="2"/>
   <!--# endif -->
   <title>Error!</title>
   <style>
diff --git a/nginx-core/var/www/html/index.html b/nginx-core/data/index.html
similarity index 82%
rename from nginx-core/var/www/html/index.html
rename to nginx-core/data/index.html
index 40eb39d..b2bdb48 100644
--- a/nginx-core/var/www/html/index.html
+++ b/nginx-core/data/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>..:: Alwatr Accelerated Web Server ::..</title>
+    <title>Alwatr Nginx</title>
     <style>
       :root {
         --primary-color: #63459e;
@@ -16,24 +16,24 @@
         font-size: 16px;
       }
 
-    body {
-      margin: 0;
-      font-family: system-ui,
-        -apple-system,
-        BlinkMacSystemFont,
-        'Segoe UI',
-        'Roboto',
-        'Oxygen',
-        'Ubuntu',
-        'Cantarell',
-        'Open Sans',
-        'Helvetica Neue',
-        'Arial',
-        sans-serif,
-        'Apple Color Emoji',
-        'Segoe UI Emoji',
-        'Segoe UI Symbol';
-    }
+      body {
+        margin: 0;
+        font-family: system-ui,
+          -apple-system,
+          BlinkMacSystemFont,
+          'Segoe UI',
+          'Roboto',
+          'Oxygen',
+          'Ubuntu',
+          'Cantarell',
+          'Open Sans',
+          'Helvetica Neue',
+          'Arial',
+          sans-serif,
+          'Apple Color Emoji',
+          'Segoe UI Emoji',
+          'Segoe UI Symbol';
+      }
 
       body::before {
         content: '';
@@ -115,7 +115,7 @@
   </head>
   <body>
     <div class="board">
-      <h1>Hello World</h1>
+      <h1>Alwatr Nginx</h1>
     </div>
   </body>
 </html>

From 73f44413cebe52acaaac01d84abd2d455df0df02 Mon Sep 17 00:00:00 2001
From: Ali Mihandoost <ali.mihandoost@gmail.com>
Date: Sun, 26 Nov 2023 14:29:30 +0330
Subject: [PATCH 04/10] feat(nginx-core): enhance handle errors

BREAKING CHANGE: /_error.html serve from default document_root and check prev /error.html removed
---
 .../location.d/10-error-page.conf.template          | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/nginx-core/etc/nginx/templates/location.d/10-error-page.conf.template b/nginx-core/etc/nginx/templates/location.d/10-error-page.conf.template
index 2448c9a..2904be3 100644
--- a/nginx-core/etc/nginx/templates/location.d/10-error-page.conf.template
+++ b/nginx-core/etc/nginx/templates/location.d/10-error-page.conf.template
@@ -1,18 +1,7 @@
-error_page 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 421 422 423 424 425 426 428 429 431 451 500 501 502 503 504 505 506 507 508 510 511 @errorPage;
-
-location @errorPage {
-  try_files /error.html /_error.html;
-}
-
-location = /error.html {
-  ssi on;
-  internal;
-  auth_basic off;
-}
+error_page 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 421 422 423 424 425 426 428 429 431 451 500 501 502 503 504 505 506 507 508 510 511 /_error.html;
 
 location = /_error.html {
   ssi on;
   internal;
   auth_basic off;
-  root /var/www;
 }

From a314235b3966ac70f2b21e4e0b901841787e8ba4 Mon Sep 17 00:00:00 2001
From: Ali Mihandoost <ali.mihandoost@gmail.com>
Date: Sun, 26 Nov 2023 14:29:59 +0330
Subject: [PATCH 05/10] feat(nginx-cdn): update to nginx-core v2

BREAKING CHANGE: WORKDIR and default NGINX_DOCUMENT_ROOT changed to /data
---
 nginx-cdn/.dockerignore |  3 ++-
 nginx-cdn/Dockerfile    | 14 +++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/nginx-cdn/.dockerignore b/nginx-cdn/.dockerignore
index 41d1e72..8a1ad10 100644
--- a/nginx-cdn/.dockerignore
+++ b/nginx-cdn/.dockerignore
@@ -1,3 +1,4 @@
 *
 !etc/nginx/
-!var/www/
+!data/
+
diff --git a/nginx-cdn/Dockerfile b/nginx-cdn/Dockerfile
index 5fc5086..748f369 100644
--- a/nginx-cdn/Dockerfile
+++ b/nginx-cdn/Dockerfile
@@ -1,4 +1,8 @@
-FROM ghcr.io/alwatr/nginx-core:1.1.1
+FROM ghcr.io/alwatr/nginx-core:2.0.0
+
+# COPY etc/nginx/ /etc/nginx/
+# COPY data/ .
+# RUN ls -RlahF /etc/nginx /data
 
 # Default environment for nginx template
 ENV NGINX_CLIENT_MAX_BODY_SIZE=1k \
@@ -20,10 +24,10 @@ ENV NGINX_CLIENT_MAX_BODY_SIZE=1k \
 ARG BUILD_REV
 ARG BUILD_DATE
 LABEL org.opencontainers.image.title="alwatr/nginx-cdn" \
-      org.opencontainers.image.description="High-performance, accelerated NGINX, optimized for CDN. Enhanced and accelerated by Alwatr." \
-      org.opencontainers.image.base.name="ghcr.io/alwatr/nginx-core:1.1.1" \
-      org.opencontainers.image.version="1.1.1" \
-      org.opencontainers.image.ref.name="1.1.1-n1.25.3-a3.18-slim" \
+      org.opencontainers.image.description="This is a high-performance version of NGINX, which has been enhanced by Alwatr for the purpose of serving static content efficiently." \
+      org.opencontainers.image.base.name="ghcr.io/alwatr/nginx-core:2.0.0" \
+      org.opencontainers.image.version="2.0.0" \
+      org.opencontainers.image.ref.name="2.0.0-nginx1.25.3-alpine3.18-slim" \
       org.opencontainers.image.licenses="MIT" \
       org.opencontainers.image.created=${BUILD_DATE} \
       org.opencontainers.image.revision=${BUILD_REV} \

From 7fefcd08389c21bcb4d59c875f937bd6b1e3c42c Mon Sep 17 00:00:00 2001
From: Ali Mihandoost <ali.mihandoost@gmail.com>
Date: Sun, 26 Nov 2023 14:35:01 +0330
Subject: [PATCH 06/10] feat(nginx-pwa): update to nginx-core v2

BREAKING CHANGE: WORKDIR and default NGINX_DOCUMENT_ROOT changed to /data
---
 nginx-pwa/.dockerignore | 2 +-
 nginx-pwa/Dockerfile    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/nginx-pwa/.dockerignore b/nginx-pwa/.dockerignore
index 41d1e72..eb786ee 100644
--- a/nginx-pwa/.dockerignore
+++ b/nginx-pwa/.dockerignore
@@ -1,3 +1,3 @@
 *
 !etc/nginx/
-!var/www/
+!data/
diff --git a/nginx-pwa/Dockerfile b/nginx-pwa/Dockerfile
index dd37422..30fbfa2 100644
--- a/nginx-pwa/Dockerfile
+++ b/nginx-pwa/Dockerfile
@@ -1,7 +1,8 @@
 FROM ghcr.io/alwatr/nginx-core:1.1.1
 
 COPY etc/nginx/ /etc/nginx/
-RUN ls -RlAhF /etc/nginx/
+# COPY data/ .
+RUN ls -RlahF /etc/nginx /data
 
 # Default environment for nginx template
 ENV NGINX_CLIENT_MAX_BODY_SIZE=1k \
@@ -23,10 +24,10 @@ ENV NGINX_CLIENT_MAX_BODY_SIZE=1k \
 ARG BUILD_REV
 ARG BUILD_DATE
 LABEL org.opencontainers.image.title="alwatr/nginx-pwa" \
-      org.opencontainers.image.description="High-performance, accelerated NGINX, optimized for serving progressive web applications. Enhanced and accelerated by Alwatr." \
+      org.opencontainers.image.description="This is a high-performance version of NGINX, which has been enhanced by Alwatr for the purpose of serving PWA efficiently." \
       org.opencontainers.image.base.name="ghcr.io/alwatr/nginx-core:1.1.1" \
       org.opencontainers.image.version="1.1.1" \
-      org.opencontainers.image.ref.name="1.1.1-n1.25.3-a3.18-slim" \
+      org.opencontainers.image.ref.name="2.0.0-nginx1.25.3-alpine3.18-slim" \
       org.opencontainers.image.licenses="MIT" \
       org.opencontainers.image.created=${BUILD_DATE} \
       org.opencontainers.image.revision=${BUILD_REV} \

From 4f2b487b57086a18b3c6951ca9e7399baf65599d Mon Sep 17 00:00:00 2001
From: Ali Mihandoost <ali.mihandoost@gmail.com>
Date: Sun, 26 Nov 2023 14:35:41 +0330
Subject: [PATCH 07/10] feat(nginx-pwa): enhance 30-envsubst-on-config-js.sh

---
 .../entrypoint.d/30-envsubst-on-config-js.sh  | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/nginx-pwa/etc/nginx/entrypoint.d/30-envsubst-on-config-js.sh b/nginx-pwa/etc/nginx/entrypoint.d/30-envsubst-on-config-js.sh
index 228c52d..483a1fc 100755
--- a/nginx-pwa/etc/nginx/entrypoint.d/30-envsubst-on-config-js.sh
+++ b/nginx-pwa/etc/nginx/entrypoint.d/30-envsubst-on-config-js.sh
@@ -5,20 +5,23 @@ set -e
 
 ME=$(basename $0)
 
-config_js_envsubst() {
-  local config_js_path="${NGINX_ENVSUBST_CONFIG_JS_PATH:-/var/www/html/config.js}"
+configJsEnvsubst() {
+  local configJsPath="$NGINX_CONFIG_JS_PATH"
+  if [ -z "$configJsPath" ] || [ ! -f "$configJsPath" ]
+  then
+    return 0
+  fi
 
-  local defined_envs=$(printf '${%s} ' $(env | cut -d= -f1))
-  [ -f "$config_js_path" ] || return 0
-  if [ ! -w "$config_js_path" ]; then
-    echo >&3 "$ME: ERROR: $config_js_path exists, but is not writable"
+  local definedEnvs=$(printf '${%s} ' $(env | cut -d= -f1))
+  if [ ! -w "$configJsPath" ]; then
+    echo >&3 "$ME: ERROR: $configJsPath exists, but is not writable"
     return 0
   fi
-  echo >&3 "$ME: Running envsubst on $config_js_path"
-  envsubst "$defined_envs" < "$config_js_path" > "${config_js_path}.tmp"
-  mv -f "${config_js_path}.tmp" "$config_js_path"
+  echo >&3 "$ME: Running envsubst on $configJsPath"
+  envsubst "$definedEnvs" < "$configJsPath" > "${configJsPath}.tmp"
+  mv -f "${configJsPath}.tmp" "$configJsPath"
 }
 
-config_js_envsubst
+configJsEnvsubst
 
 exit 0

From 12fe33ac499c23c61b7580ba6873b90d2739a7f5 Mon Sep 17 00:00:00 2001
From: Ali Mihandoost <ali.mihandoost@gmail.com>
Date: Sun, 26 Nov 2023 14:36:02 +0330
Subject: [PATCH 08/10] feat(nginx-pwa): update to nginx-core v2

BREAKING CHANGE: WORKDIR and default NGINX_DOCUMENT_ROOT changed to /data
---
 nginx-pwa/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nginx-pwa/Dockerfile b/nginx-pwa/Dockerfile
index 30fbfa2..4193c97 100644
--- a/nginx-pwa/Dockerfile
+++ b/nginx-pwa/Dockerfile
@@ -19,7 +19,8 @@ ENV NGINX_CLIENT_MAX_BODY_SIZE=1k \
     NGINX_EXPIRES_DEFAULT=epoch \
     NGINX_LIMIT_REQ_RATE=400 \
     NGINX_LIMIT_REQ_BURST=1000 \
-    NGINX_DISABLE_SYMLINKS=if_not_owner
+    NGINX_DISABLE_SYMLINKS=if_not_owner \
+    NGINX_CONFIG_JS_PATH=/data/config.js
 
 ARG BUILD_REV
 ARG BUILD_DATE

From bfc0c5c6f222f60f1652d21427c6f6f8665f1eb1 Mon Sep 17 00:00:00 2001
From: Ali Mihandoost <ali.mihandoost@gmail.com>
Date: Sun, 26 Nov 2023 14:36:18 +0330
Subject: [PATCH 09/10] feat(nginx-ws): update to nginx-core v2

BREAKING CHANGE: WORKDIR and default NGINX_DOCUMENT_ROOT changed to /data
---
 nginx-ws/.dockerignore | 2 +-
 nginx-ws/Dockerfile    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/nginx-ws/.dockerignore b/nginx-ws/.dockerignore
index 41d1e72..eb786ee 100644
--- a/nginx-ws/.dockerignore
+++ b/nginx-ws/.dockerignore
@@ -1,3 +1,3 @@
 *
 !etc/nginx/
-!var/www/
+!data/
diff --git a/nginx-ws/Dockerfile b/nginx-ws/Dockerfile
index 3049411..9440e2e 100644
--- a/nginx-ws/Dockerfile
+++ b/nginx-ws/Dockerfile
@@ -1,7 +1,8 @@
 FROM ghcr.io/alwatr/nginx-core:1.1.1
 
 COPY etc/nginx/ /etc/nginx/
-RUN ls -RlAhF /etc/nginx/
+# COPY data/ .
+RUN ls -RlahF /etc/nginx /data
 
 # Default environment for nginx template
 ENV NGINX_CLIENT_MAX_BODY_SIZE=1k \
@@ -23,10 +24,10 @@ ENV NGINX_CLIENT_MAX_BODY_SIZE=1k \
 ARG BUILD_REV
 ARG BUILD_DATE
 LABEL org.opencontainers.image.title="alwatr/nginx-ws" \
-      org.opencontainers.image.description="High-performance, accelerated NGINX, optimized for serving static website. Enhanced and accelerated by Alwatr." \
+      org.opencontainers.image.description="This is a high-performance version of NGINX, which has been enhanced by Alwatr for the purpose of serving static website content efficiently." \
       org.opencontainers.image.base.name="ghcr.io/alwatr/nginx-core:1.1.1" \
       org.opencontainers.image.version="1.1.1" \
-      org.opencontainers.image.ref.name="1.1.1-n1.25.3-a3.18-slim" \
+      org.opencontainers.image.ref.name="2.0.0-nginx1.25.3-alpine3.18-slim" \
       org.opencontainers.image.licenses="MIT" \
       org.opencontainers.image.created=${BUILD_DATE} \
       org.opencontainers.image.revision=${BUILD_REV} \

From 36b21a708576fe7507511a3d77d06b3ab3b1800a Mon Sep 17 00:00:00 2001
From: Ali Mihandoost <ali.mihandoost@gmail.com>
Date: Sun, 26 Nov 2023 14:38:20 +0330
Subject: [PATCH 10/10] docs(readme): update

---
 README.md | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index d89ab11..4989518 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,16 @@
 # Alwatr Accelerated Web Server
 
-High-performance, accelerated NGINX, optimized for serving static content. Enhanced and accelerated by Alwatr.
+This is a high-performance version of NGINX, which has been enhanced by Alwatr for the purpose of serving static content efficiently.
 
 ## Usage
 
-The right way of using the alwatr nginx is behind kubernetes ingress or simple edge reverse-proxy, then don't config edge stuff like gzip compression, ssl, etc or even config domain or multiple websites.
+The recommended method for using the Alwatr Nginx is to place it behind a Kubernetes ingress or a simple edge reverse-proxy like Traefik. In this setup, there's no need to configure edge features such as gzip compression, SSL, etc., or even set up a domain or multiple websites.
 
 ```Dockerfile
 FROM ghcr.io/alwatr/nginx:1
 ```
 
-### Serve Progressive Web App
-
-The right way of using the alwatr nginx is behind kubernetes ingress or simple edge reverse-proxy, then don't config edge stuff like gzip compression, ssl, etc or even config domain or multiple websites.
+### Serve Progressive Web Apps
 
 ```Dockerfile
 ARG NODE_VERSION=lts