SocialGouv · revolunet · Mar 28, 2022 · Mar 24, 2022 · Mar 24, 2022 · Mar 24, 2022
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
@@ -1,17 +1,19 @@
-FROM nginx:1.21-alpine
+FROM nginxinc/nginx-unprivileged:1.21-alpine
 
 COPY ./nginx.conf /etc/nginx/nginx.conf
 COPY ./entrypoint.sh /entrypoint.sh
-COPY ./envsub.sh /envsub.sh
 COPY ./404.html /usr/share/nginx/errors/
 
 ## adjust permissions
+USER root
 RUN chown -R nginx:nginx /usr/share/nginx/html && chmod -R 755 /usr/share/nginx/html && \
         chown -R nginx:nginx /var/cache/nginx && \
         chown -R nginx:nginx /var/log/nginx && \
         chown -R nginx:nginx /etc/nginx
 
 RUN touch /var/run/nginx.pid && \
         chown -R nginx:nginx /var/run/nginx.pid
-
+
+USER 101
+
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/nginx/README.md b/nginx/README.md
@@ -3,7 +3,6 @@
 > Nginx image for static web apps
 
 - Serve static files from `/usr/share/nginx/html`
-- envsubst `%%VARIABLE%%` static files at startup (ex: builds)
 - Add some security-related headers :
 
 ```
@@ -14,31 +13,10 @@ add_header X-Content-Type-Options "nosniff";
 
 > For a single-page-applications nginx image, see [../nginx4spa](../nginx4spa)
 
-## Envsubst on startup
-
-As default, in every files in the `/usr/share/nginx/html` directory, the [`envsub.sh`](./envsub.sh) script replaces `%%KEY%%` by `VALUE` where `export KEY=VALUE` in the global env var.
-
-You can disable this by setting the `SKIP_ENVSUBST` environment variable.
-
-So :
-
-```sh
-$ echo "VERSION=%%VERSION%%" > /www/version.txt
-$ docker run \
-    --env VERSION=x.y.z \
-    --env PORT=4444 \
-    --name nginx_test \
-    --publish 8888:4444 \
-    --rm \
-    --volume /www:/usr/share/nginx/html \
-    ghcr.io/socialgouv/docker/nginx
-$ curl localhost:8888/version.txt
-VERSION=x.y.z
-```
 
 Notes:
 
-- `PORT` is optional and default to `80`
+- `PORT` is set to `8080`
 
 To override default configuration, make a local copy of `nginx.conf` and add it to docker build:
 

diff --git a/nginx/docker-compose.yml b/nginx/docker-compose.yml
@@ -3,7 +3,7 @@ services:
     build:
       context: .
     ports:
-      - target: 80
+      - target: 8080
         published: 8888
 
   #

diff --git a/nginx/entrypoint.sh b/nginx/entrypoint.sh
@@ -1,5 +1,3 @@
 #!/usr/bin/env sh
 
-source /envsub.sh
-
 exec nginx -g 'daemon off;'
diff --git a/nginx/envsub.sh b/nginx/envsub.sh
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
@@ -18,7 +18,7 @@ http {
   sendfile                    on;
 
   server {
-    listen                  %%PORT%%;
+    listen                  8080;
     root                    /usr/share/nginx/html;
     index                   index.html;
     server_name_in_redirect on;

diff --git a/nginx/tests/404.bats b/nginx/tests/404.bats
@@ -5,7 +5,7 @@ load '../../.bats/common.bats.bash'
 setup_file() {
   docker-compose run \
     --detach \
-    --publish 8889:80 \
+    --publish 8888:8080 \
     --rm \
     --volume ${BATS_TEST_DIRNAME}/fixtures:/usr/share/nginx/html \
     alpine
@@ -16,12 +16,12 @@ teardown_file() {
 }
 
 @test "nginx: should return status 404 (not a SPA)" {
-  run wget --server-response --quiet http://localhost:8889/pouet
+  run wget --server-response --quiet http://localhost:8888/pouet
   assert_output --partial "HTTP/1.1 404 Not Found"
 }
 
 @test "nginx: should return custom 404 page (not a SPA)" {
-  run wget --content-on-error --output-document - http://localhost:8889/pouet
+  run wget --content-on-error --output-document - http://localhost:8888/pouet
   assert_output --partial "CUSTOM 404 PAGE"
 }
 
diff --git a/nginx/tests/default-404-2.bats b/nginx/tests/default-404-2.bats
@@ -5,7 +5,7 @@ load '../../.bats/common.bats.bash'
 setup_file() {
   docker-compose run \
     --detach \
-    --publish 8888:80 \
+    --publish 8888:8080 \
     --rm \
     --volume ${BATS_TEST_DIRNAME}/fixtures-404:/usr/share/nginx/html \
     alpine

diff --git a/nginx/tests/default-404.bats b/nginx/tests/default-404.bats
@@ -5,7 +5,7 @@ load '../../.bats/common.bats.bash'
 setup_file() {
   docker-compose run \
     --detach \
-    --publish 8888:80 \
+    --publish 8888:8080 \
     --rm \
     --volume ${BATS_TEST_DIRNAME}/fixtures-simple:/usr/share/nginx/html \
     alpine

diff --git a/nginx/tests/envsub.bats b/nginx/tests/envsub.bats
diff --git a/nginx/tests/fixtures-envsubst/404.html b/nginx/tests/fixtures-envsubst/404.html
diff --git a/nginx/tests/fixtures-envsubst/foo/bar/bar.js b/nginx/tests/fixtures-envsubst/foo/bar/bar.js
diff --git a/nginx/tests/fixtures-envsubst/foo/bar/bar.png b/nginx/tests/fixtures-envsubst/foo/bar/bar.png
diff --git a/nginx/tests/fixtures-envsubst/index.html b/nginx/tests/fixtures-envsubst/index.html
diff --git a/nginx/tests/port.bats b/nginx/tests/port.bats
diff --git a/nginx/tests/skip-envsub.bats b/nginx/tests/skip-envsub.bats
diff --git a/nginx/tests/volume.bats b/nginx/tests/volume.bats
@@ -5,7 +5,7 @@ load '../../.bats/common.bats.bash'
 setup_file() {
   docker-compose run \
     --detach \
-    --publish 8888:80 \
+    --publish 8888:8080 \
     --rm \
     --volume ${BATS_TEST_DIRNAME}/fixtures:/usr/share/nginx/html \
     alpine

diff --git a/nginx4spa/Dockerfile b/nginx4spa/Dockerfile
@@ -1,16 +1,18 @@
-FROM nginx:1.21-alpine
+FROM nginxinc/nginx-unprivileged:1.21-alpine
 
 COPY ./nginx.conf /etc/nginx/nginx.conf
 COPY ./entrypoint.sh /entrypoint.sh
-COPY ./envsub.sh /envsub.sh
 
 ## adjust permissions
+USER root
 RUN chown -R nginx:nginx /usr/share/nginx/html && chmod -R 755 /usr/share/nginx/html && \
         chown -R nginx:nginx /var/cache/nginx && \
         chown -R nginx:nginx /var/log/nginx && \
         chown -R nginx:nginx /etc/nginx
 
 RUN touch /var/run/nginx.pid && \
         chown -R nginx:nginx /var/run/nginx.pid
-
+
+USER 101
+
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/nginx4spa/README.md b/nginx4spa/README.md
@@ -4,7 +4,6 @@
 
 - Serve static files from `/usr/share/nginx/html`
 - Catch-all routing to `/index.html` for single-page-applications with client-side routing
-- envsubst `%%VARIABLE%%` static files at startup (ex: builds)
 - Add some security-related headers :
 
 ```
@@ -15,31 +14,9 @@ add_header X-Content-Type-Options "nosniff";
 
 > For regular nginx image, see [../nginx](../nginx)
 
-## Envsubst on startup
-
-As default, in every files in the `/usr/share/nginx/html` directory, the [`envsub.sh`](./envsub.sh) script replaces `%%KEY%%` by `VALUE` where `export KEY=VALUE` in the global env var.
-
-You can disable this by setting the `SKIP_ENVSUBST` environment variable.
-
-So :
-
-```sh
-$ echo "VERSION=%%VERSION%%" > /www/version.txt
-$ docker run \
-    --env VERSION=x.y.z \
-    --env PORT=4444 \
-    --name nginx4spa_test \
-    --publish 8888:4444 \
-    --rm \
-    --volume /www:/usr/share/nginx/html \
-    ghcr.io/socialgouv/docker/nginx4spa
-$ curl localhost:8888/version.txt
-VERSION=x.y.z
-```
-
 Notes:
 
-- `PORT` is optional and default to `80`
+- `PORT` is set to `8080`.
 
 To override default configuration, make a local copy of `nginx.conf` and add it to docker build:
 

diff --git a/nginx4spa/docker-compose.yml b/nginx4spa/docker-compose.yml
@@ -3,7 +3,7 @@ services:
     build:
       context: .
     ports:
-      - target: 80
+      - target: 8080
         published: 8888
 
   #

diff --git a/nginx4spa/entrypoint.sh b/nginx4spa/entrypoint.sh
@@ -1,5 +1,3 @@
 #!/usr/bin/env sh
 
-source /envsub.sh
-
 exec nginx -g 'daemon off;'
diff --git a/nginx4spa/envsub.sh b/nginx4spa/envsub.sh
diff --git a/nginx4spa/nginx.conf b/nginx4spa/nginx.conf
@@ -18,7 +18,7 @@ http {
   sendfile                    on;
 
   server {
-    listen                  %%PORT%%;
+    listen                  8080;
     root                    /usr/share/nginx/html;
     index                   index.html;
     server_name_in_redirect on;