Merged in feature/redis-url-entrypoint-fix (pull request #8)

Fixes REDIS_URI declaration for REDIS_URL
wgu-opensource · Feb 15, 2022 · a1f0add · a1f0add
2 parents cd3c35a + 44f096a
commit a1f0add
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/docker/bin/docker_entrypoint.sh b/docker/bin/docker_entrypoint.sh
@@ -5,7 +5,7 @@ set -eu
 declare BASE_DOMAIN="${BASE_DOMAIN:-}"
 declare ENVIRONMENT="${ENVIRONMENT:-}"
 declare DB_URI="${DB_URI:-}"
-declare REDIS_URI="${REDIS_URI:-}"
+declare REDIS_URL="${REDIS_URL:-}"
 declare ELASTICSEARCH_URI="${ELASTICSEARCH_URI:-}"
 declare OAUTH_ISSUER="${OAUTH_ISSUER:-}"
 declare OAUTH_CLIENTID="${OAUTH_CLIENTID:-}"
@@ -26,7 +26,7 @@ function validate() {
     "BASE_DOMAIN"
     "ENVIRONMENT"
     "DB_URI"
-    "REDIS_URI"
+    "REDIS_URL"
     "ELASTICSEARCH_URI"
     "OAUTH_ISSUER"
     "OAUTH_CLIENTID"
@@ -109,7 +109,7 @@ function reindex_elasticsearch() {
     echo_info "Building initial index in OSMT ElasticSearch using ${reindex_profile_string} Spring profiles..."
     java_cmd="/bin/java
       -Dspring.profiles.active=${reindex_profile_string}
-      -Dspring.redis.url=${REDIS_URI}
+      -Dspring.redis.url=${REDIS_URL}
       -Ddb.uri=${DB_URI}
       -Des.uri=${ELASTICSEARCH_URI}
       -Dspring.flyway.enabled=${MIGRATIONS_ENABLED}
@@ -124,7 +124,7 @@ function start_spring_app() {
       -Dspring.profiles.active=${ENVIRONMENT}
       -Dapp.baseDomain=${BASE_DOMAIN}
       -Dapp.frontendUrl=${FRONTEND_URL}
-      -Dspring.redis.url=redis://${REDIS_URI}
+      -Dspring.redis.url=redis://${REDIS_URL}
       -Ddb.uri=${DB_URI}
       -Des.uri=${ELASTICSEARCH_URI}
       -Dokta.oauth2.issuer=${OAUTH_ISSUER}