[pull] master from hsldevcom:master

.github/workflows/dev-pipeline.yml

@@ -0,0 +1,59 @@
+name: Process master push or pr
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [24.x]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v6
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Install dependencies
+        run: yarn
+      - name: Run tests
+        run: yarn test
+  docker-push:
+    if: github.ref == 'refs/heads/master'
+    needs:
+      - test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+      - name: Build docker image from master and push it
+        run: ./.github/workflows/scripts/build_and_push_dev.sh
+        env:
+          DOCKER_USER: ${{ secrets.DOCKER_USER }}
+          DOCKER_AUTH: ${{ secrets.DOCKER_AUTH }}
+          DOCKER_BASE_TAG: latest
+  generate-sbom:
+    if: github.ref == 'refs/heads/master'
+    needs:
+      - test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+      - name: Enable Corepack
+        run: corepack enable
+      - name: Install Yarn
+        run: corepack prepare yarn@4.13.0 --activate
+      - name: Generate SBOM
+        run: yarn dlx -q @cyclonedx/yarn-plugin-cyclonedx@2.0.0 --output-file ${{ github.repository }}-${{ github.sha }}.json
+
+      - name: Save SBOM artifact
+        uses: actions/upload-artifact@v7
+        with:
+          name: sbom-artifact
+          path: ${{ github.repository }}-${{ github.sha }}.json

.github/workflows/prod-pipeline.yml

@@ -0,0 +1,28 @@
+name: Build prod from release
+on:
+  release:
+    types:
+      - published
+jobs:
+  prod-push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+      - name: Check Tag
+        id: check-tag
+        run: |
+          if [[ ${GITHUB_REF##*/} =~ ^202[0-9][0-1][0-9][0-3][0-9] ]]; then
+              echo "match=true" >> $GITHUB_OUTPUT
+          else
+              echo invalid release tag
+              exit 1
+          fi
+      - name: Push latest image as prod
+        if: steps.check-tag.outputs.match == 'true'
+        run: ./.github/workflows/scripts/push_prod.sh
+        env:
+          DOCKER_USER: ${{ secrets.DOCKER_USER }}
+          DOCKER_AUTH: ${{ secrets.DOCKER_AUTH }}
+          DOCKER_BASE_TAG: prod
+          DOCKER_DEV_TAG: latest

.github/workflows/scripts/build_and_push_dev.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+set -e
+
+DOCKER_IMAGE="hsldevcom/digitransit-proxy"
+DOCKER_TAG=${DOCKER_BASE_TAG:-latest}
+
+COMMIT_HASH=$(git rev-parse --short "$GITHUB_SHA")
+
+DOCKER_TAG_LONG=$DOCKER_TAG-$(date +"%Y-%m-%dT%H.%M.%S")-$COMMIT_HASH
+DOCKER_IMAGE_TAG=$DOCKER_IMAGE:$DOCKER_TAG
+DOCKER_IMAGE_TAG_LONG=$DOCKER_IMAGE:$DOCKER_TAG_LONG
+
+# Build image
+echo "Building digitransit-proxy"
+docker build --tag=$DOCKER_IMAGE_TAG_LONG .
+
+docker login -u $DOCKER_USER -p $DOCKER_AUTH
+echo "Pushing $DOCKER_TAG image"
+docker push $DOCKER_IMAGE_TAG_LONG
+docker tag $DOCKER_IMAGE_TAG_LONG $DOCKER_IMAGE_TAG
+docker push $DOCKER_IMAGE_TAG
+
+echo Build completed

.github/workflows/scripts/push_prod.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+set -e
+
+DOCKER_IMAGE="hsldevcom/digitransit-proxy"
+DOCKER_TAG=${DOCKER_BASE_TAG:-prod}
+DOCKER_DEV_TAG=${DOCKER_DEV_TAG:-latest}
+
+COMMIT_HASH=$(git rev-parse --short "$GITHUB_SHA")
+
+DOCKER_TAG_LONG=$DOCKER_TAG-$(date +"%Y-%m-%dT%H.%M.%S")-$COMMIT_HASH
+DOCKER_IMAGE_TAG=$DOCKER_IMAGE:$DOCKER_TAG
+DOCKER_IMAGE_TAG_LONG=$DOCKER_IMAGE:$DOCKER_TAG_LONG
+DOCKER_IMAGE_DEV=$DOCKER_IMAGE:$DOCKER_DEV_TAG
+
+docker login -u $DOCKER_USER -p $DOCKER_AUTH
+
+echo "processing prod release"
+docker pull $DOCKER_IMAGE_DEV
+docker tag $DOCKER_IMAGE_DEV $DOCKER_IMAGE_TAG
+docker tag $DOCKER_IMAGE_DEV $DOCKER_IMAGE_TAG_LONG
+docker push $DOCKER_IMAGE_TAG
+docker push $DOCKER_IMAGE_TAG_LONG
+
+echo Build completed

.gitignore

@@ -1,2 +1,4 @@
-
+.pnp.cjs
+.pnp.loader.mjs
+.yarn
 node_modules

Dockerfile

@@ -1,4 +1,4 @@
-FROM nginx:1.16-alpine
+FROM nginx:1.26-alpine
 MAINTAINER Reittiopas version: 0.1
 ENV INSTALL_DIR="/opt/nginx"
 
@@ -16,6 +16,9 @@ RUN rm /var/log/nginx/* && chmod -R a+rwX ${INSTALL_DIR} /etc/nginx/ /var/log/ng
 RUN ln -sf /dev/stdout /var/log/nginx/access.log
 RUN ln -sf /dev/stderr /var/log/nginx/error.log
 
+# Install apache2-utils for htpasswd
+RUN apk add --no-cache apache2-utils
+
 EXPOSE 8080
 
 ADD run.sh /usr/local/bin/

README.md

@@ -1,6 +1,6 @@
 # digitransit-proxy
 
-[![Build Status](https://travis-ci.org/HSLdevcom/digitransit-proxy.svg?branch=master)](https://travis-ci.org/HSLdevcom/digitransit-proxy)
+[![Build](https://github.com/hsldevcom/digitransit-proxy/workflows/Process%20master%20push%20or%20pr/badge.svg?branch=master)](https://github.com/HSLdevcom/digitransit-proxy/actions)
 
 # Local testing in Docker
 Requires docker + node

basicsettings.conf

@@ -0,0 +1,4 @@
+proxy_redirect     off;
+proxy_set_header   X-Real-IP $remote_addr;
+proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+proxy_set_header   X-Forwarded-Host $host;