chore: Remove envsubst

SocialGouv · Mar 25, 2022 · b9ddd40 · b9ddd40
1 parent b4aa630
commit b9ddd40
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 154 deletions.
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
@@ -2,7 +2,6 @@ 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

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,27 +13,6 @@ 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:
 

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/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