refactor: base on alwatr/nginx (#4)

Alwatr · Nov 10, 2023 · 5640506 · 5640506
2 parents 3aeb5f6 + 474ee07
commit 5640506
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 12 deletions.
diff --git a/nginx-pwa/.dockerignore b/nginx-pwa/.dockerignore
@@ -1,2 +1,3 @@
 *
-!conf/
+!etc/nginx/
+!var/www/
diff --git a/nginx-pwa/Dockerfile b/nginx-pwa/Dockerfile
@@ -1,6 +1,7 @@
-FROM ghcr.io/alwatr/nginx-core:1.0.0
+FROM ghcr.io/alwatr/nginx-core:1.1.0
 
-COPY conf/ /etc/nginx/
+COPY etc/nginx/ /etc/nginx/
+RUN ls -RlAhF /etc/nginx/
 
 # Default environment for nginx template
 ENV NGINX_OPEN_FILE_CACHE="max=1000 inactive=1h" \
@@ -16,9 +17,9 @@ 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.base.name="ghcr.io/alwatr/nginx-core:1.0.0" \
-      org.opencontainers.image.version="1.0.0" \
-      org.opencontainers.image.ref.name="1.0.0-nginx1.25.3-alpine" \
+      org.opencontainers.image.base.name="ghcr.io/alwatr/nginx-core:1.1.0" \
+      org.opencontainers.image.version="1.1.0" \
+      org.opencontainers.image.ref.name="1.1.0-n1.25.3-a3.18-slim" \
       org.opencontainers.image.licenses="MIT" \
       org.opencontainers.image.created=${BUILD_DATE} \
       org.opencontainers.image.revision=${BUILD_REV} \

diff --git a/.../entrypoint.d/30-envsubst-on-config-js.sh → .../entrypoint.d/30-envsubst-on-config-js.sh b/.../entrypoint.d/30-envsubst-on-config-js.sh → .../entrypoint.d/30-envsubst-on-config-js.sh
diff --git a/...templates/location.d/90-pwa.conf.template → ...templates/location.d/90-pwa.conf.template b/...templates/location.d/90-pwa.conf.template → ...templates/location.d/90-pwa.conf.template
diff --git a/nginx-ws/.dockerignore b/nginx-ws/.dockerignore
@@ -1,2 +1,3 @@
 *
-!conf/
+!etc/nginx/
+!var/www/
diff --git a/nginx-ws/Dockerfile b/nginx-ws/Dockerfile
@@ -1,6 +1,7 @@
-FROM ghcr.io/alwatr/nginx-core:1.0.0
+FROM ghcr.io/alwatr/nginx-core:1.1.0
 
-COPY conf/ /etc/nginx/
+COPY etc/nginx/ /etc/nginx/
+RUN ls -RlAhF /etc/nginx/
 
 # Default environment for nginx template
 ENV NGINX_OPEN_FILE_CACHE="max=1000 inactive=1h" \
@@ -16,9 +17,9 @@ 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.base.name="ghcr.io/alwatr/nginx-core:1.0.0" \
-      org.opencontainers.image.version="1.0.0" \
-      org.opencontainers.image.ref.name="1.0.0-nginx1.25.3-alpine" \
+      org.opencontainers.image.base.name="ghcr.io/alwatr/nginx-core:1.1.0" \
+      org.opencontainers.image.version="1.1.0" \
+      org.opencontainers.image.ref.name="1.1.0-n1.25.3-a3.18-slim" \
       org.opencontainers.image.licenses="MIT" \
       org.opencontainers.image.created=${BUILD_DATE} \
       org.opencontainers.image.revision=${BUILD_REV} \

diff --git a/.../templates/location.d/90-ws.conf.template → .../templates/location.d/90-ws.conf.template b/.../templates/location.d/90-ws.conf.template → .../templates/location.d/90-ws.conf.template
diff --git a/nginx/.dockerignore b/nginx/.dockerignore
@@ -1,2 +1,3 @@
 *
 !etc/nginx/
+!var/www/