Bump lamassu to 2024-12-17T19-37

and remove X2GBFS_HEALTHCHECK_START_INTERVAL
mobidata-bw · Jan 3, 2025 · 44be9c1 · 44be9c1
1 parent e3d6205
commit 44be9c1
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 17 deletions.
diff --git a/.env b/.env
@@ -10,7 +10,7 @@ TZ=Europe/Berlin
 TRANSFORMER_PROXY_IMAGE=ghcr.io/mobidata-bw/ipl-proxy:2024-12-10T08-21
 TRANSFORMER_PROXY_PORT=8400
 
-LAMASSU_IMAGE=entur/lamassu:2024-09-27T11-21
+LAMASSU_IMAGE=entur/lamassu:2024-12-17T19-37
 LAMASSU_PORT=8500
 LAMASSU_ADMIN_PORT=9002
 LAMASSU_BASE_URL=http://localhost:8080/sharing

diff --git a/.env.local.example b/.env.local.example
@@ -26,15 +26,6 @@ LAMASSU_VOI_CLIENT_PASSWORD=secret
 # Credentials for sharedmobility.ch
 LAMASSU_SHAREDMOBILITY_CH_AUTHORIZATION=mail@domain
 
-
-# Initial interval when for the first time and then in which interval
-# the healtcheck is executed until the container has sucessfully started.
-# For prod (when feeds are already present/lamassu polls regularly for updated feeds)
-# this can be 1s (the default configured in docker-compose.yml)
-# If no feeds exist and Lamassu's update interval is set to multiple hours,
-# set this to a value that is high enough that all feeds have been generated once.
-# X2GBFS_HEALTHCHECK_START_INTERVAL=60s
-
 # User and password from Deer
 DEER_USER=user
 DEER_PASSWORD=password

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 - Improve rabbitmq healthcheck for better performance
 - upgrade OCPDB to 1.2.1 with BNetzA Import Fix
 - `dagster-pipeline`/`dagster-daemon`/`dagster-dagit`: upgrade to [`2024-12-03t09-35`](https://github.com/mobidata-bw/ipl-dagster-pipeline/blob/7ceecb4f622dc3a6ac9e6a3179885b4d17b62301/CHANGELOG.md#2024-12-03)
+- `lamassu`: upgraded [`lamassu`](https://github.com/entur/lamassu) to [2024-12-17T19-37](https://hub.docker.com/layers/entur/lamassu/2024-12-17T19-37/images/sha256-7fb67b8f7a7395a9ec726dda7ed411679ef900fe0c4f3ec2da636cd4da5f603a). This i.e. includes immediate update after successful feed subscription (https://github.com/entur/lamassu/pull/592). As consequence, `X2GBFS_HEALTHCHECK_START_INTERVAL` is not necessary any longer and has been removed.
 
 
 ## 2024-12-20

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -190,13 +190,6 @@ services:
     restart: unless-stopped
     healthcheck:
       test: ps aux | grep -q 'x2gbfs\.x2gbfs' || exit 1
-      # If you want to wait until all feeds have been generated
-      # before depending lamassu starts subscribing them,
-      # configure an appropriate startup_period, e.g. 60s
-      # Otherwise, lamassu might update them only after the
-      # update interval period has passed, which for test might
-      # last several hours.
-      start_interval: ${X2GBFS_HEALTHCHECK_START_INTERVAL:-1s}
       start_period: 1s
       interval: 60s