From 2fb44953279a50a237185d925c3a500950b650c2 Mon Sep 17 00:00:00 2001
From: Tushar <codingid6@gmail.com>
Date: Mon, 10 Apr 2023 20:38:34 +0000
Subject: [PATCH] Fix start.sh and Dockerfile
---
.env | 3 ++-
docker-compose.gitpod.yaml | 1 +
packages/enketo-express/Dockerfile | 4 ++--
packages/enketo-express/start.sh | 18 +++++++-----------
4 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/.env b/.env
index c137a71..8dc68de 100644
--- a/.env
+++ b/.env
@@ -15,4 +15,5 @@ CENTRAL_USER_PASS=StrongPassword@1234
#enketo-express
ENCRYPTION_KEY=somestrongencrytionkey
-LESS_SECURE_ENCRYPTION_KEY=ssssomestrongencrytionkey
\ No newline at end of file
+LESS_SECURE_ENCRYPTION_KEY=ssssomestrongencrytionkey
+FORM_MANAGER_BASE_URI=https://enketo-manager-ratings-tech.samagra.io/
\ No newline at end of file
diff --git a/docker-compose.gitpod.yaml b/docker-compose.gitpod.yaml
index aee4008..d051d30 100644
--- a/docker-compose.gitpod.yaml
+++ b/docker-compose.gitpod.yaml
@@ -171,6 +171,7 @@ services:
REDIS_MAIN_PORT: 6379
REDIS_CACHE_HOST: redis_cache
REDIS_CACHE_PORT: 6379
+ FORM_MANAGER_BASE_URI: https://enketo-manager-ratings-tech.samagra.io/
networks:
db_net:
diff --git a/packages/enketo-express/Dockerfile b/packages/enketo-express/Dockerfile
index 88b459b..a6acdee 100644
--- a/packages/enketo-express/Dockerfile
+++ b/packages/enketo-express/Dockerfile
@@ -12,5 +12,5 @@ WORKDIR enketo-express
# TODO: builds can be made faster if we only copy files needed to do pnpm i. pnpm i will be cached or explore multistage builds
RUN pnpm i
EXPOSE 8065
-# To transfer env variables of current shell to start.sh
-CMD [".", "start.sh"]
\ No newline at end of file
+RUN chmod +x start.sh
+ENTRYPOINT ["./start.sh"]
\ No newline at end of file
diff --git a/packages/enketo-express/start.sh b/packages/enketo-express/start.sh
index 5799758..daacc4e 100644
--- a/packages/enketo-express/start.sh
+++ b/packages/enketo-express/start.sh
@@ -1,15 +1,11 @@
#!/bin/bash
-cp config/default-config.json tmp.json
-jq -r --arg ENCRYPTION_KEY $ENCRYPTION_KEY '."encryption key" |= $ENCRYPTION_KEY' tmp.json > config/default-config.json
-jq -r --arg LESS_SECURE_ENCRYPTION_KEY $LESS_SECURE_ENCRYPTION_KEY '."less secure encryption key" |= $LESS_SECURE_ENCRYPTION_KEY' config/default-config.json > config/default-config.json
-
-jq -r --arg REDIS_MAIN_HOST $REDIS_MAIN_HOST '."redis.main.host" |= $REDIS_MAIN_HOST' tmp.json > config/default-config.json
-jq -r --arg REDIS_MAIN_CACHE $REDIS_MAIN_PORT '."redis.main.port" |= $REDIS_MAIN_PORT' tmp.json > config/default-config.json
-
-jq -r --arg REDIS_CACHE_HOST $REDIS_CACHE_HOST '."redis.cache.host" |= $REDIS_CACHE_HOST' tmp.json > config/default-config.json
-jq -r --arg REDIS_CACHE_CACHE $REDIS_CACHE_PORT '."redis.cache.port" |= $REDIS_CACHE_PORT' tmp.json > config/default-config.json
-
-rm tmp.json
+echo "$(jq -r --arg ENCRYPTION_KEY $ENCRYPTION_KEY '."encryption key" |= $ENCRYPTION_KEY' config/default-config.json)" > config/default-config.json
+echo "$(jq -r --arg LESS_SECURE_ENCRYPTION_KEY $LESS_SECURE_ENCRYPTION_KEY '."less secure encryption key" |= $LESS_SECURE_ENCRYPTION_KEY' config/default-config.json)" > config/default-config.json
+echo "$(jq -r --arg REDIS_MAIN_HOST $REDIS_MAIN_HOST '.redis.main.host |= $REDIS_MAIN_HOST' config/default-config.json)" > config/default-config.json
+echo "$(jq -r --arg REDIS_MAIN_PORT $REDIS_MAIN_PORT '.redis.main.port |= $REDIS_MAIN_PORT' config/default-config.json)" > config/default-config.json
+echo "$(jq -r --arg REDIS_CACHE_HOST $REDIS_CACHE_HOST '.redis.cache.host |= $REDIS_CACHE_HOST' config/default-config.json)" > config/default-config.json
+echo "$(jq -r --arg REDIS_CACHE_PORT $REDIS_CACHE_PORT '.redis.cache.port |= $REDIS_CACHE_PORT' config/default-config.json)" > config/default-config.json
+echo "$(jq -r --arg FORM_MANAGER_BASE_URI $FORM_MANAGER_BASE_URI '.formManagerBaseURI |= $FORM_MANAGER_BASE_URI' config/default-config.json)" > config/default-config.json
node app.js
\ No newline at end of file
--
GitLab