@toptal/davinci-ci 7.1.1-alpha-dependabot-npm-and-yarn-jest-junit-16.0.0-59ea6b92.10 → 7.2.1-alpha-fx-5090-purge-cloudflare-cache-on-staff-portal-release-6dcc8dc9.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## 7.2.0
+
+### Minor Changes
+
+- [#2361](https://github.com/toptal/davinci/pull/2361) [`44dabdcc`](https://github.com/toptal/davinci/commit/44dabdcc5d4fe91dec2e4a38895c353663cc0ea5) Thanks [@augustobmoura](https://github.com/augustobmoura)!
+
+### davinci-ci
+
+- change ngninx index.html caching to CDN only
+
 ## 7.1.0
 
 ### Minor Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toptal/davinci-ci",
-  "version": "7.1.1-alpha-dependabot-npm-and-yarn-jest-junit-16.0.0-59ea6b92.10+59ea6b92",
+  "version": "7.2.1-alpha-fx-5090-purge-cloudflare-cache-on-staff-portal-release-6dcc8dc9.0+6dcc8dc9",
   "keywords": [
     "ci",
     "docker",
@@ -30,7 +30,7 @@
   "dependencies": {
     "@commitlint/cli": "^17.6.7",
     "@commitlint/config-conventional": "^17.1.0",
-    "@toptal/davinci-cli-shared": "2.3.10-alpha-dependabot-npm-and-yarn-jest-junit-16.0.0-59ea6b92.125+59ea6b92",
+    "@toptal/davinci-cli-shared": "2.3.10-alpha-fx-5090-purge-cloudflare-cache-on-staff-portal-release-6dcc8dc9.128+6dcc8dc9",
     "chalk": "^4.1.2",
     "danger": "^11.2.2",
     "markdown-table": "^2.0.0"
@@ -41,5 +41,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "59ea6b926467f271329ba4d237109b1d2cb78c6c"
+  "gitHead": "6dcc8dc99d340bf79b17a7c5a250e291c77474cf"
 }

package/src/configs/docker/Dockerfile.gha-deploy

@@ -25,7 +25,10 @@ RUN echo $VERSION > /usr/share/nginx/html/REVISION.txt
 # Copy configuration file for Nginx and replace the default one.
 ARG NGINX_CONFIG
 RUN [ -z "$NGINX_CONFIG" ] && echo "NGINX_CONFIG is required" && exit 1 || true
-COPY $NGINX_CONFIG /etc/nginx/conf.d/default.conf
+COPY $NGINX_CONFIG /etc/nginx/conf.d/default.conf.templ
+
+ARG HTML_CDN_CACHE_TAG="davinci-app"
+ENV HTML_CDN_CACHE_TAG=${HTML_CDN_CACHE_TAG}
 
 # Entry point to provide Run Time Environment Variables for the App.
 ENTRYPOINT ["/usr/local/bin/env-runtime.entrypoint.sh"]

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

@@ -44,4 +44,8 @@ if [ -n "$MISSING_VARS" ]; then
   done
 fi
 
+export HTML_CDN_CACHE_TAG="${HTML_CDN_CACHE_TAG:-"davinci-app"}"
+
+envsubst '${HTML_CDN_CACHE_TAG}' < /etc/nginx/conf.d/default.conf.templ > /etc/nginx/conf.d/default.conf
+
 exec "$@"

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

@@ -13,8 +13,9 @@ server {
   }
 
   location / {
-    # by default we are adding cache of 1 hour, this also affects CDN caching
-    add_header Cache-Control "public, max-age=3600";
+    # by default we are adding cache of 1 hour fo CDN only
+    add_header CDN-Cache-Control "public, max-age=3600";
+    add_header Cache-Tag "davinci,spa,index-doc,${HTML_CDN_CACHE_TAG}";
     try_files $uri /index.html;
   }
 }