feat(nginx4spa): configurable PORT (#61)

nginx4spa/.gitlab-ci.yml

@@ -25,8 +25,9 @@ Test nginx4spa:
     - docker run
       --detach
       --env VERSION=x.y.z
+      --env PORT=90
       --name nginx4spa_test
-      --publish 8888:80
+      --publish 8888:90
       --rm
       --volume ${CI_PROJECT_DIR}/nginx4spa/test:/usr/share/nginx/html
       ${CI_REGISTRY_IMAGE}/nginx4spa:${CI_COMMIT_SHA}

nginx4spa/README.md

@@ -3,17 +3,19 @@
 > Nginx image for single page application
 
 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.
+
 So :
 
 ```sh
 $ echo "VERSION=%%VERSION%%" > /www/version.txt
 $ docker run \
     --env VERSION=x.y.z \
+    --env PORT=4444 \
     --name nginx4spa_test \
-    --publish 8888:80 \
+    --publish 8888:4444 \
     --rm \
     --volume /www:/usr/share/nginx/html \
     registry.gitlab.factory.social.gouv.fr/socialgouv/docker/nginx4spa:<version>
-$ curl localhost:8080/version.txt
+$ curl localhost:8888/version.txt
 VERSION=x.y.z
 ```

nginx4spa/envsub.sh

@@ -15,11 +15,17 @@ DELIMITER=${DELIMITER:="%%"}
 # Save env variable in file
 printenv > /tmp/env-vars
 
+# Add default nginx port
+echo "PORT=${PORT:="80"}" >> /tmp/env-vars
+
 while IFS='=' read -r KEY VALUE
 do
   # In every files in the dir, replace the environment variables value
   find ${WWW_DIRECTORY} -type f -exec \
     sed -i -e "s|${DELIMITER}${KEY}${DELIMITER}|${VALUE}|g" {} \;
+  # replace in nginx.conf too
+  sed -i -e "s|${DELIMITER}${KEY}${DELIMITER}|${VALUE}|g" /etc/nginx/nginx.conf
+
 done < /tmp/env-vars
 
 rm /tmp/env-vars

nginx4spa/nginx.conf

@@ -18,7 +18,7 @@ http {
   sendfile                    on;
 
   server {
-    listen                  80;
+    listen                  %%PORT%%;
     root                    /usr/share/nginx/html;
     index                   index.html;
     server_name_in_redirect on;