Merge branch 'develop' into AB#32128_remove_deprecated_endpoints

Author: ahjyrkia

.github/workflows/dev-pipeline.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: develop
       - name: Change permissions
@@ -21,3 +21,8 @@ jobs:
           DOCKER_USER: ${{ secrets.DOCKER_USER }}
           DOCKER_AUTH: ${{ secrets.DOCKER_AUTH }}
           DOCKER_TAG: dev
+          PARKANDRIDE_URL: ${{ secrets.PARKANDRIDE_URL }}
+          TICKET_SALES_URL: ${{ secrets.TICKET_SALES_URL }}
+          HSL_OTP_URL: ${{ secrets.HSL_OTP_URL }}
+          FINLAND_OTP_URL: ${{ secrets.FINLAND_OTP_URL }}
+          WALTTI_OTP_URL: ${{ secrets.WALTTI_OTP_URL }}

.github/workflows/prod-pipeline.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: master
       - name: Change permissions
@@ -21,3 +21,8 @@ jobs:
           DOCKER_USER: ${{ secrets.DOCKER_USER }}
           DOCKER_AUTH: ${{ secrets.DOCKER_AUTH }}
           DOCKER_TAG: prod
+          PARKANDRIDE_URL: ${{ secrets.PARKANDRIDE_URL }}
+          TICKET_SALES_URL: ${{ secrets.TICKET_SALES_URL }}
+          HSL_OTP_URL: ${{ secrets.HSL_OTP_URL }}
+          FINLAND_OTP_URL: ${{ secrets.FINLAND_OTP_URL }}
+          WALTTI_OTP_URL: ${{ secrets.WALTTI_OTP_URL }}

.github/workflows/scripts/build_and_push_image.sh

@@ -44,7 +44,10 @@ echo Building $DOCKER_IMAGE
 docker build --tag=$DOCKER_IMAGE -f Dockerfile .
 
 echo Running $DOCKER_IMAGE
-docker run --rm -p 8080:8080 --env DOWNLOAD_RETRY_COUNT=1 -h hsl-map-server --name hsl-map-server $DOCKER_IMAGE &
+docker run --rm -p 8080:8080 --env DOWNLOAD_RETRY_COUNT=1 \
+--env PARKANDRIDE_URL=$PARKANDRIDE_URL --env TICKET_SALES_URL=$TICKET_SALES_URL \
+--env HSL_OTP_URL=$HSL_OTP_URL --env FINLAND_OTP_URL=$FINLAND_OTP_URL --env WALTTI_OTP_URL=$WALTTI_OTP_URL \
+-h hsl-map-server --name hsl-map-server $DOCKER_IMAGE &
 sleep 90
 
 test http://localhost:8080/map/v2/hsl-map/14/9326/4739.png 50000