diff --git a/.env b/.env index c137a71cfb073dc2489693178ae9d00cad01053c..8dc68ded57328d604a7f0a5e99931e96d74ae293 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 aee4008b071a17ee1767e3fee6c539e8815b2c0d..d051d308f5b8715464d49f231d7d19cce88870e8 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 88b459b33ce6e86a8dc2efa7e8c4b7500cd200f2..a6acdee679b7b7f15993538f8eb3267f3877389f 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 5799758f8197112584c1b016faadb033fec7adb9..daacc4e7b103541495451622ef95639bca9d658d 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