@toptal/davinci-ci 7.4.4-alpha-fx-5435-monorepo-commands-0774222d.2 → 7.4.4

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 7.4.4
+
+### Patch Changes
+
+- [#2432](https://github.com/toptal/davinci/pull/2432) [`e97dea95`](https://github.com/toptal/davinci/commit/e97dea95e34f896732a26843a64177b6ba7307b1) Thanks [@dkezele-t](https://github.com/dkezele-t)!
+- rework Dockerfile
+
 ## 7.4.3
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toptal/davinci-ci",
-  "version": "7.4.4-alpha-fx-5435-monorepo-commands-0774222d.2+0774222d",
+  "version": "7.4.4",
   "keywords": [
     "ci",
     "docker",
@@ -30,7 +30,7 @@
   "dependencies": {
     "@commitlint/cli": "^17.6.7",
     "@commitlint/config-conventional": "^17.1.0",
-    "@toptal/davinci-cli-shared": "2.5.1-alpha-fx-5435-monorepo-commands-0774222d.9+0774222d",
+    "@toptal/davinci-cli-shared": "^2.5.0",
     "chalk": "^4.1.2",
     "danger": "^11.2.2",
     "markdown-table": "^2.0.0"
@@ -40,6 +40,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "gitHead": "0774222ddf02b514f6737a7ce94b67ac4498b3ac"
+  }
 }

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

@@ -1,5 +1,6 @@
 # Create the image with Nginx environment.
-FROM nginx:alpine
+
+FROM us-central1-docker.pkg.dev/toptal-hub/docker-registry/nginx:alpine
 
 # Copy results from the dist folder to the image.
 ARG DIST_FOLDER

package/src/configs/docker/Dockerfile.storybook

@@ -1,5 +1,5 @@
 # Create the image with Nginx environment.
-FROM nginx:alpine
+FROM us-central1-docker.pkg.dev/toptal-hub/docker-registry/nginx:alpine
 
 # Copy results from the dist folder to the image.
 ARG DIST_FOLDER

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

@@ -28,8 +28,8 @@ if [ -f "$ENV_FILE" ]; then
     export $(grep -v '^#' $ENV_FILE | xargs)
 
     # Override env variables with previous values
-    eval "$OLD_ENV"    
-else 
+    eval "$OLD_ENV"
+else
     echo "Info: $ENV_FILE does not exist"
 fi
 
@@ -62,8 +62,11 @@ 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
+if [ -f /etc/nginx/conf.d/default.conf.templ ]; then
+  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
+else
+  echo "Info: /etc/nginx/conf.d/default.conf.templ does not exist"
+fi
 
 exec "$@"