Add custom pygeoapi image build (#36)

* feat: add custom pygeoapi image build

* fix: build tippecanoe from source

* build: install tippecanoe via homebrew

Author: yejiyang

.dockerignore

@@ -0,0 +1 @@
+**/tiles/

.github/workflows/pygeoapi-image.yml

@@ -0,0 +1,64 @@
+name: Publish Pygeoapi Docker Image
+
+on:
+  push:
+    branches: [main]
+    paths:
+      - "pygeoapi/**"
+      - "data/**"
+      - ".github/workflows/pygeoapi-image.yml"
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  packages: write
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Bump repo version
+        run: |
+          VERSION=$(cat VERSION)
+          IFS='.' read -r MAJ MIN PATCH <<<"$VERSION"
+          PATCH=$((PATCH+1))
+          NEW_VERSION="$MAJ.$MIN.$PATCH"
+          echo "$NEW_VERSION" > VERSION
+          echo "VERSION=$NEW_VERSION" >> "$GITHUB_ENV"
+
+      - name: Commit version bump
+        run: |
+          git config user.name "GitHub Actions"
+          git config user.email "actions@github.com"
+          git add VERSION
+          git commit -m "chore: bump repo version to $VERSION" && git push || echo "No changes to commit"
+
+      - name: Get pygeoapi version
+        id: pgv
+        run: |
+          PYGEOAPI_VERSION=$(docker run --rm geopython/pygeoapi:latest pygeoapi --version | awk '{print $2}')
+          echo "PYGEOAPI_VERSION=$PYGEOAPI_VERSION" >> "$GITHUB_OUTPUT"
+
+      - name: Log in to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./docker/Dockerfile.pygeoapi
+          push: true
+          build-args: |
+            REPO_VERSION=${{ env.VERSION }}
+          tags: |
+            ghcr.io/${{ github.repository_owner }}/pygeoapi-w-global-tsunami-data:latest
+            ghcr.io/${{ github.repository_owner }}/pygeoapi-w-global-tsunami-data:${{ steps.pgv.outputs.PYGEOAPI_VERSION }}-${{ env.VERSION }}

README.md

@@ -37,3 +37,9 @@ A GitHub Actions workflow builds and publishes the frontend Docker image wheneve
 changes are pushed to the `frontend/` directory on the `main` branch. The image
 is pushed to the GitHub Container Registry under the tag
 `global-tsunami-risk-map-frontend`.
+
+Another workflow builds a custom `pygeoapi` image containing the data from this
+repository. Whenever files in the `data/` or `pygeoapi/` folders change, the
+workflow bumps the repository `VERSION` file and publishes a new Docker image
+named `pygeoapi-w-global-tsunami-data`. The image tag combines the upstream
+pygeoapi version with the bumped repository version.

VERSION

@@ -0,0 +1 @@
+0.1.0

docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.9"
 
 services:
   backend:
-    image: geopython/pygeoapi:latest
+    image: ${PYGEOAPI_IMAGE:-ghcr.io/yejiyang/pygeoapi-w-global-tsunami-data:latest}
     container_name: backend
     ports:
       - "5000:5000"

docker/Dockerfile.pygeoapi

@@ -0,0 +1,36 @@
+FROM geopython/pygeoapi:latest
+
+# Copy configuration
+COPY pygeoapi/pygeoapi-config.yml /pygeoapi/local.config.yml
+
+# Copy data except tiles
+COPY data/hazard /data/hazard
+COPY data/hyderabad /data/hyderabad
+COPY data/norway /data/norway
+COPY data/scripts /data/scripts
+
+# Install tippecanoe for tile generation via Homebrew
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        build-essential \
+        curl \
+        file \
+        git \
+    && git clone https://github.com/Homebrew/brew /home/linuxbrew/.linuxbrew/Homebrew \
+    && mkdir -p /home/linuxbrew/.linuxbrew/bin \
+    && ln -s ../Homebrew/bin/brew /home/linuxbrew/.linuxbrew/bin \
+    && /home/linuxbrew/.linuxbrew/bin/brew install tippecanoe \
+    && /home/linuxbrew/.linuxbrew/bin/brew cleanup \
+    && rm -rf /var/lib/apt/lists/*
+ENV PATH="/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin:$PATH"
+
+# Build version string
+ARG REPO_VERSION
+RUN PY_VER=$(python3 -c 'import pkg_resources;print(pkg_resources.get_distribution("pygeoapi").version)') \
+    && echo "${PY_VER}-${REPO_VERSION}" > /VERSION
+
+# Add init script
+COPY docker/init.sh /init.sh
+RUN chmod +x /init.sh
+
+ENTRYPOINT ["/init.sh"]

docker/init.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+set -e
+
+# Generate hazard vector tiles if missing
+if [ ! -d /data/tiles/global-hazard ]; then
+    echo "[init] Generating hazard vector tiles"
+    mkdir -p /data/tiles/global-hazard
+    tippecanoe -r1 -pk -pf \
+        --output-to-directory=/data/tiles/global-hazard/ \
+        --force --maximum-zoom=15 \
+        --extend-zooms-if-still-dropping \
+        --no-tile-compression \
+        /data/hazard/global-hazard-points.geojson
+fi
+
+exec /entrypoint.sh "$@"

k8s/deployment.yaml

@@ -202,7 +202,7 @@ spec:
     spec:
       containers:
         - name: pygeoapi
-          image: geopython/pygeoapi:latest
+          image: ghcr.io/yejiyang/pygeoapi-w-global-tsunami-data:latest
           ports:
             - containerPort: 5000
           env: