Extract LAMASSU_BASE_URL as env variable

mobidata-bw · Sep 11, 2023 · 276af2e · 276af2e
1 parent 035c0b1
commit 276af2e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.env b/.env
@@ -6,6 +6,7 @@ LAMASSU_IMAGE=mfdz/lamassu:latest
 LAMASSU_PORT=8500
 LAMASSU_ADMIN_PORT=9002
 LAMASSU_ADMIN_PASSWORD=secret
+LAMASSU_BASE_URL=http://lamassu:8080
 
 # postgis variables
 IPL_POSTGIS_IMAGE=postgis/postgis:15-3.3-alpine
@@ -29,5 +30,3 @@ DAGSTER_POSTGRES_USER=postgres_user
 DAGSTER_POSTGRES_PASSWORD=postgres_password
 DAGSTER_POSTGRES_DB=postgres_db
 
-# Pipeline variables
-IPL_LAMASSU_BASE_URL=http://lamassu:8080
diff --git a/.env.local.example b/.env.local.example
@@ -1,4 +1,5 @@
 LAMASSU_ADMIN_PASSWORD=
+LAMASSU_BASE_URL=http://10.70.172.11:8500
 IPL_POSTGRES_PASSWORD=
 DEER_USER=
 DEER_PASSWORD=

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -33,6 +33,7 @@ services:
       - ${LAMASSU_ADMIN_PORT}:9001
     environment:
       # depending on base image, JAVA_TOOL_OPTIONS must be used
+      LAMASSU_BASE_URL: ${LAMASSU_BASE_URL}
       JDK_JAVA_OPTIONS: 
         -Dspring.config.location=/etc/application-config/application.properties 
         -Dspring.profiles.active=leader
@@ -99,7 +100,7 @@ services:
       - DAGSTER_POSTGRES_USER
       - DAGSTER_POSTGRES_PASSWORD
       - DAGSTER_POSTGRES_DB
-      - IPL_LAMASSU_BASE_URL
+      - IPL_LAMASSU_BASE_URL=${LAMASSU_BASE_URL}
       - IPL_POSTGRES_HOST=ipl-db
       - IPL_POSTGRES_PORT
       - IPL_POSTGRES_DB

diff --git a/etc/lamassu/application.properties b/etc/lamassu/application.properties
@@ -43,7 +43,7 @@ org.entur.lamassu.feedproviders=file:/etc/application-config/feedproviders.yml
 org.entur.lamassu.targetGbfsVersion=2.3
 
 ## Base URL for API (needed for URL transformations)
-org.entur.lamassu.baseUrl=http://10.70.172.11:8500
+org.entur.lamassu.baseUrl=${LAMASSU_BASE_URL}
 
 ## Host / IP of internal load balancer for internal endpoints (Entur)
 org.entur.lamassu.internalLoadBalancer=http://localhost:8080