@toptal/davinci-ci 7.3.2 → 7.4.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+## 7.4.1
+
+### Patch Changes
+
+- [#2380](https://github.com/toptal/davinci/pull/2380) [`262d4029`](https://github.com/toptal/davinci/commit/262d4029c66f284bd20ab4028d9a9c0fea31900a) Thanks [@sashuk](https://github.com/sashuk)!
+- move env variables replacement into entrypoint script
+
+## 7.4.0
+
+### Minor Changes
+
+- [#2368](https://github.com/toptal/davinci/pull/2368) [`676ef4fd`](https://github.com/toptal/davinci/commit/676ef4fdc68cee6766903fb811274c470bf3a5ee) Thanks [@sashuk](https://github.com/sashuk)!
+- add ability to override environment variables by reading environment files
+
 ## 7.3.2
 
 ### Patch Changes

package/README.md

@@ -85,6 +85,8 @@ The image is present on path `src/configs/docker/Dockerfile.gha-deploy` and have
 | `NGINX_CONFIG`           | Ngninx config, davinci has an example file present at `src/configs/docker/nginx-vhost.conf`              | Yes      |
 | `HTML_CDN_CACHE_TAG`     | `Cache-Tag` header for HTML documents, used for specific cache purging                                   | No       |
 
+The default entrypoint `src/configs/docker/env-runtime.entrypoint.sh` reads environment file (`.env.$DAVINCI_ENV` has to be located in the root of the dist folder) and populates the environment variables with values from the file if the overriden environment variable is not set. Variables that are provided to `docker run` command (for example, `docker run -e DAVINCI_envvar1=1`) have higher priority that variables from the envrionment file.
+
 ### IDE Tooling
 
 This package can be used directly in your IDE through these extensions

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toptal/davinci-ci",
-  "version": "7.3.2",
+  "version": "7.4.1",
   "keywords": [
     "ci",
     "docker",

package/src/configs/docker/env-runtime.entrypoint.sh

@@ -13,7 +13,25 @@
 
 # keep in sync with index.html
 VARS_PREFIX="DAVINCI_"
-INDEX_FILE="/usr/share/nginx/html/index.html"
+DIST_PATH="/usr/share/nginx/html"
+INDEX_FILE="$DIST_PATH/index.html"
+
+# import environment variables from .env.DAVINCI_ENV files if there are any
+ENV_FILE="$DIST_PATH/.env.$DAVINCI_ENV"
+if [ -f "$ENV_FILE" ]; then
+    echo "Info: $ENV_FILE exists, importing variables..."
+
+    # Store current environment variables
+    OLD_ENV="$(export -p)"
+
+    # Load env file variables
+    export $(grep -v '^#' $ENV_FILE | xargs)
+
+    # Override env variables with previous values
+    eval "$OLD_ENV"    
+else 
+    echo "Info: $ENV_FILE does not exist"
+fi
 
 VARS="$(env | grep $VARS_PREFIX | awk -F = '{print $1}')"
 

package/src/configs/docker/nginx-vhost.conf

@@ -18,4 +18,9 @@ server {
     add_header Cache-Tag "davinci,spa,index-doc,${HTML_CDN_CACHE_TAG}";
     try_files $uri /index.html;
   }
+
+  # forbid environment files download
+  location ~ ^/\.env\. {
+    deny all;
+  }
 }