Fix long_name escaping in maps.

.dockerignore

@@ -1 +1,2 @@
-mariadb/
+mariadb/
+docker-compose.yml

.github/workflows/deploy-amd64.yaml

@@ -0,0 +1,50 @@
+name: Build and Push AMD64
+on:
+  workflow_dispatch:  # Only triggered manually
+jobs:
+  build-and-push-amd64:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0  # Fetch all history for proper versioning
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Calculate version
+        id: version
+        run: |
+          # Get the latest git tag
+          LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0")
+          echo "Latest tag: $LATEST_TAG"
+
+          # Get current commit hash
+          COMMIT_HASH=$(git rev-parse --short HEAD)
+          echo "Commit hash: $COMMIT_HASH"
+
+          # Create version string
+          VERSION="${LATEST_TAG}-${COMMIT_HASH}"
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+          echo "latest_tag=${LATEST_TAG}" >> $GITHUB_OUTPUT
+          echo "commit_hash=${COMMIT_HASH}" >> $GITHUB_OUTPUT
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push AMD64 Docker image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          platforms: linux/amd64
+          push: true
+          provenance: false
+          tags: |
+            ghcr.io/agessaman/meshinfo-lite:latest-amd64
+            ghcr.io/agessaman/meshinfo-lite:${{ steps.version.outputs.version }}-amd64
+            ghcr.io/agessaman/meshinfo-lite:${{ steps.version.outputs.latest_tag }}-amd64 

.github/workflows/deploy-arm64.yaml

@@ -0,0 +1,60 @@
+name: Build and Push ARM64
+on:
+  workflow_dispatch:  # Only triggered manually
+jobs:
+  build-and-push-arm64:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0  # Fetch all history for proper versioning
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Cache Docker layers
+        uses: actions/cache@v4
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-arm64-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-arm64-
+
+      - name: Calculate version
+        id: version
+        run: |
+          # Get the latest git tag
+          LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0")
+          echo "Latest tag: $LATEST_TAG"
+
+          # Get current commit hash
+          COMMIT_HASH=$(git rev-parse --short HEAD)
+          echo "Commit hash: $COMMIT_HASH"
+
+          # Create version string
+          VERSION="${LATEST_TAG}-${COMMIT_HASH}"
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+          echo "latest_tag=${LATEST_TAG}" >> $GITHUB_OUTPUT
+          echo "commit_hash=${COMMIT_HASH}" >> $GITHUB_OUTPUT
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push ARM64 Docker image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          platforms: linux/arm64
+          push: true
+          provenance: false
+          tags: |
+            ghcr.io/agessaman/meshinfo-lite:latest-arm64
+            ghcr.io/agessaman/meshinfo-lite:${{ steps.version.outputs.version }}-arm64
+            ghcr.io/agessaman/meshinfo-lite:${{ steps.version.outputs.latest_tag }}-arm64
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache,mode=max 

.github/workflows/deploy.yaml

@@ -1,28 +1,139 @@
-name: Manual Build and Push
+name: Build, Push, and Publish Multi-Arch Manifest
+
 on:
-  workflow_dispatch:  # Only triggered manually
+  workflow_dispatch:
+
 jobs:
-  build-and-push:
+  build-and-push-amd64:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
-
+        with:
+          fetch-depth: 0
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Cache Docker layers
+        uses: actions/cache@v4
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-amd64-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-amd64-
+      - name: Calculate version
+        id: version
+        run: |
+          LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0")
+          echo "Latest tag: $LATEST_TAG"
+          COMMIT_HASH=$(git rev-parse --short HEAD)
+          echo "Commit hash: $COMMIT_HASH"
+          VERSION="${LATEST_TAG}-${COMMIT_HASH}"
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+          echo "latest_tag=${LATEST_TAG}" >> $GITHUB_OUTPUT
+          echo "commit_hash=${COMMIT_HASH}" >> $GITHUB_OUTPUT
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and push AMD64 Docker image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          platforms: linux/amd64
+          push: true
+          provenance: false
+          tags: |
+            ghcr.io/agessaman/meshinfo-lite:latest-amd64
+            ghcr.io/agessaman/meshinfo-lite:${{ steps.version.outputs.version }}-amd64
+            ghcr.io/agessaman/meshinfo-lite:${{ steps.version.outputs.latest_tag }}-amd64
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache,mode=max
+
+  build-and-push-arm64:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-
+      - name: Cache Docker layers
+        uses: actions/cache@v4
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-arm64-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-arm64-
+      - name: Calculate version
+        id: version
+        run: |
+          LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0")
+          echo "Latest tag: $LATEST_TAG"
+          COMMIT_HASH=$(git rev-parse --short HEAD)
+          echo "Commit hash: $COMMIT_HASH"
+          VERSION="${LATEST_TAG}-${COMMIT_HASH}"
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+          echo "latest_tag=${LATEST_TAG}" >> $GITHUB_OUTPUT
+          echo "commit_hash=${COMMIT_HASH}" >> $GITHUB_OUTPUT
       - name: Log in to GitHub Container Registry
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push Docker image
+      - name: Build and push ARM64 Docker image
         uses: docker/build-push-action@v4
         with:
           context: .
+          platforms: linux/arm64
           push: true
+          provenance: false
           tags: |
-            ghcr.io/agessaman/meshinfo-lite:latest
-            ghcr.io/agessaman/meshinfo-lite:${{ github.sha }}
+            ghcr.io/agessaman/meshinfo-lite:latest-arm64
+            ghcr.io/agessaman/meshinfo-lite:${{ steps.version.outputs.version }}-arm64
+            ghcr.io/agessaman/meshinfo-lite:${{ steps.version.outputs.latest_tag }}-arm64
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache,mode=max
+
+  create-manifest:
+    runs-on: ubuntu-latest
+    needs: [build-and-push-amd64, build-and-push-arm64]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Calculate version
+        id: version
+        run: |
+          LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0")
+          echo "Latest tag: $LATEST_TAG"
+          COMMIT_HASH=$(git rev-parse --short HEAD)
+          echo "Commit hash: $COMMIT_HASH"
+          VERSION="${LATEST_TAG}-${COMMIT_HASH}"
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+          echo "latest_tag=${LATEST_TAG}" >> $GITHUB_OUTPUT
+          echo "commit_hash=${COMMIT_HASH}" >> $GITHUB_OUTPUT
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Create and push multi-arch manifest
+        run: |
+          docker manifest create ghcr.io/agessaman/meshinfo-lite:latest \
+            ghcr.io/agessaman/meshinfo-lite:latest-amd64 \
+            ghcr.io/agessaman/meshinfo-lite:latest-arm64
+          docker manifest create ghcr.io/agessaman/meshinfo-lite:${{ steps.version.outputs.version }} \
+            ghcr.io/agessaman/meshinfo-lite:${{ steps.version.outputs.version }}-amd64 \
+            ghcr.io/agessaman/meshinfo-lite:${{ steps.version.outputs.version }}-arm64
+          docker manifest create ghcr.io/agessaman/meshinfo-lite:${{ steps.version.outputs.latest_tag }} \
+            ghcr.io/agessaman/meshinfo-lite:${{ steps.version.outputs.latest_tag }}-amd64 \
+            ghcr.io/agessaman/meshinfo-lite:${{ steps.version.outputs.latest_tag }}-arm64
+          docker manifest push ghcr.io/agessaman/meshinfo-lite:latest
+          docker manifest push ghcr.io/agessaman/meshinfo-lite:${{ steps.version.outputs.version }}
+          docker manifest push ghcr.io/agessaman/meshinfo-lite:${{ steps.version.outputs.latest_tag }}

.gitignore

@@ -9,6 +9,8 @@ node_modules/
 .github_pat
 .env
 .venv
+.cursorrules
+.cursor/
 
 backups/*
 caddy
@@ -19,6 +21,7 @@ postgres/data/*
 config.json
 docker-compose.yml
 spa
+venv/
 
 .pnp.*
 .yarn/*

Dockerfile

@@ -1,32 +1,89 @@
 # trunk-ignore-all(checkov/CKV_DOCKER_3)
-FROM python:3.13-slim
+FROM python:3.13.3-slim-bookworm
 
-LABEL org.opencontainers.image.source=https://github.com/dadecoza/meshinfo-lite
+LABEL org.opencontainers.image.source=https://github.com/agessaman/meshinfo-lite
 LABEL org.opencontainers.image.description="Realtime web UI to run against a Meshtastic regional or private mesh network."
 
 ENV MQTT_TLS=false
-ENV PYTHONUNBUFFERED=1
+ENV PYTHONUNBUFFERED=1 \
+    # Set standard locations
+    PATH="/app/.local/bin:${PATH}" \
+    # Consistent port for the app
+    APP_PORT=8000 \
+    # Optimize pip for faster builds
+    PIP_NO_CACHE_DIR=1 \
+    PIP_DISABLE_PIP_VERSION_CHECK=1
+
+RUN groupadd --system app && \
+    useradd --system --gid app --home-dir /app --create-home app
 
 # Set the working directory in the container
-RUN mkdir /app
 WORKDIR /app
 
-RUN apt-get update && apt-get -y install \
-    libexpat1 libexpat1-dev
+# Install system dependencies
+ARG TARGETPLATFORM
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    libexpat1 \
+    libcairo2 \
+    pkg-config \
+    fonts-symbola \
+    fontconfig \
+    freetype2-demos \
+    libgdal-dev \
+    gdal-bin \
+    libgeos-dev \
+    libproj-dev \
+    proj-bin \
+    default-mysql-client \
+    $([ "$TARGETPLATFORM" = "linux/arm64" ] && echo "curl") \
+    && apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN fc-cache -fv
+
+# Architecture-specific rasterio installation
+ENV GDAL_CONFIG=/usr/bin/gdal-config
+
+# For ARM64: Install conda/mamba and use conda-forge for rasterio
+RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \
+    curl -L -O https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-aarch64.sh && \
+    bash Miniforge3-Linux-aarch64.sh -b -p /opt/conda && \
+    rm Miniforge3-Linux-aarch64.sh && \
+    /opt/conda/bin/mamba install -c conda-forge rasterio -y; \
+    fi
+
+# Update PATH to include conda if installed
+ENV PATH="/opt/conda/bin:${PATH}"
 
 COPY requirements.txt banner run.sh ./
-COPY *.py ./
-COPY www  ./www
-COPY templates ./templates
-COPY migrations ./migrations
 
-RUN pip install --upgrade pip
-RUN pip install --no-cache-dir -r requirements.txt
+# Upgrade pip and install packages
+RUN pip install --upgrade pip setuptools wheel
 
-HEALTHCHECK NONE
+# Install requirements, excluding rasterio for ARM64 (already installed via conda)
+RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \
+    grep -v "^rasterio" requirements.txt > requirements_filtered.txt || echo "" > requirements_filtered.txt; \
+    else \
+    cp requirements.txt requirements_filtered.txt; \
+    fi
 
-EXPOSE 8080
+RUN su app -c "pip install --no-cache-dir --user -r requirements_filtered.txt"
+
+COPY --chown=app:app banner run.sh ./
+COPY --chown=app:app *.py ./
+COPY --chown=app:app *.sh ./
+COPY --chown=app:app www  ./www
+COPY --chown=app:app templates ./templates
+COPY --chown=app:app migrations ./migrations
+
+HEALTHCHECK NONE
 
 RUN chmod +x run.sh
+RUN chmod +x *.sh
+
+USER app
+
+EXPOSE ${APP_PORT}
 
-CMD ["./run.sh"]
+CMD ["./run.sh"]