resolve merge conflicts

.gitignore

@@ -195,3 +195,4 @@ postgres
 /playwright-report/
 /blob-report/
 /playwright/.cache/
+volumes

README.md

@@ -37,4 +37,10 @@ Once the application is up and running you should be able to access it using the
 
 - Create config file with name config (and extension .env, .yml, .json) in `server/`, `api/` and `templates/` add config variables (for eg see config.env.example in each folder)
 - Create a `.env` file inside companion folder in root for companion config variables (for eg see .env.example file in companion folder)
-git fetch upstream
+git fetch upstream 
+- to add default env files automatically run `bash build.sh` 
+
+## Development Notes
+- If there are updates to npm dependencies for `dega-studio`, run `bash build-nocache.sh` from the project root.
+- If the script fails to update dependencies, enter the container and manually run `npm install --legacy-peer-deps`.
+

build-nocache.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Create a unique cache bust value
+CACHEBUST=$(date +%s)
+
+# Pass the cache bust value as a build argument
+docker-compose build --no-cache --build-arg CACHEBUST=$CACHEBUST dega-studio
+docker-compose up

companion/.env.example

@@ -8,4 +8,5 @@ COMPANION_DOMAIN=localhost:3020
 COMPANION_PROTOCOL=http
 COMPANION_DATADIR=/
 COMPANION_SELF_ENDPOINT=localhost:3020
+COMPANION_AWS_REGION=us-east-1 
 NODE_ENV=dev

docker-compose.yml

@@ -91,7 +91,7 @@ services:
   #######             UPLOAD SERVICES                                 #######
   ###########################################################################
   companion:
-    image: transloadit/companion
+    image: transloadit/companion:sha-e80a7f7
     ports:
       - "3020:3020"
     env_file:
@@ -461,6 +461,9 @@ services:
     build:
       context: ./studio
       dockerfile: Dockerfile
+      no_cache: true
+      args:
+        - CACHEBUST
     environment:
       - PUBLIC_URL=http://127.0.0.1:4455/.factly/dega/studio
       - REACT_APP_KAVACH_PUBLIC_URL=http://127.0.0.1:4455/.factly/kavach/web

studio/Dockerfile

@@ -2,6 +2,8 @@
 FROM node:18-alpine
 
 # set working directory
+ARG CACHEBUST=100
+
 WORKDIR /app
 
 # install app dependencies