Updated docker build files

Author: davenquinn

.github/workflows/build-legacy-tileserver.yaml

@@ -5,36 +5,31 @@ on:
     branches: ["main"]
     paths:
       - services/legacy-tileserver/**
+      - py-modules/tileserver-utils/**
     tags:
       - legacy-tileserver-v[0-9]+.[0-9]+.[0-9]+ # Semver Release (non-prerelease)
       - legacy-tileserver-v[0-9]+.[0-9]+.[0-9]+-** # Semver release (prerelease)
   pull_request:
     branches: [main]
     paths:
       - services/legacy-tileserver/**
+      - py-modules/tileserver-utils/**
 jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: "recursive"
       # Set up python and poetry
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: 3.11
-      - name: Install Poetry
-        run: python3 -m pip install poetry==2.1.1
-      - name: Build and stage local packages
-        run: scripts/prepare-services
       - name: Get the version from the tag, if it exists
         run: |
           TAG=${{ github.ref_name }}
           VERSION=$(echo "${TAG}" | sed -E 's/legacy-tileserver-v//')
           echo "VERSION=${VERSION}" >> $GITHUB_ENV
-      - name: Docker meta
+
+      - name: Docker metadata
         id: meta
         uses: docker/metadata-action@v4
         with:
@@ -44,16 +39,8 @@ jobs:
             type=ref,event=pr,suffix=-{{date 'YYYYMMDDHHmmss'}}
             type=ref,event=branch,suffix=-{{date 'YYYYMMDDHHmmss'}}
             type=raw,value=latest,enable={{is_default_branch}}
+            type=raw,value=main-{{date 'YYYYMMDDHHmmss'}},enable={{is_default_branch}}
             type=raw,value=sha-{{sha}}
-            
-            
-            # When a PRODUCTION tag (legacy-tileserver-vX.Y.Z) → also tag staging and dev
-            type=raw,value=main-{{date 'YYYYMMDDHHmmss'}},enable=${{ startsWith(github.ref, 'refs/tags/legacy-tileserver-v') && !contains(env.VERSION, '-') }}
-            type=raw,value=${{ env.VERSION }}-beta.{{date 'YYYYMMDDHHmmss'}},enable=${{ startsWith(github.ref, 'refs/tags/legacy-tileserver-v') && !contains(env.VERSION, '-') }}
-            type=raw,value=${{ env.VERSION }}-beta,enable=${{ startsWith(github.ref, 'refs/tags/legacy-tileserver-v') && !contains(env.VERSION, '-') }}
-
-            # When a STAGING prerelease tag (legacy-tileserver-vX.Y.Z-*) → also tag dev
-            type=raw,value=main-{{date 'YYYYMMDDHHmmss'}},enable=${{ startsWith(github.ref, 'refs/tags/legacy-tileserver-v') && contains(env.VERSION, '-') }}
 
       - name: Set up Docker BuildX
         uses: docker/setup-buildx-action@v2
@@ -67,6 +54,8 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: services/legacy-tileserver
+          build-contexts: |
+            py-modules=./py-modules
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/build-tileserver.yaml

@@ -5,6 +5,7 @@ on:
     branches: ["main"]
     paths:
       - services/tileserver/**
+      - py-modules/tileserver-utils/**
     tags:
       - tileserver-v[0-9]+.[0-9]+.[0-9]+ # Semver Release (non-prerelease)
       - tileserver-v[0-9]+.[0-9]+.[0-9]+-** # Semver release (prerelease)
@@ -18,16 +19,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: "recursive"
-      # Set up python and poetry
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: 3.11
-      - name: Install Poetry
-        run: python3 -m pip install poetry==2.1.1
+
       - name: Get the version from the tag, if it exists
         run: |
           TAG=${{ github.ref_name }}

local-root/docker-compose.yaml

@@ -93,14 +93,18 @@ services:
     # This is necessary for the tileserver to correctly generate URLs for tilejson files.
     # https://github.com/encode/starlette/issues/538
     command: >
-      uvicorn --host 0.0.0.0 --port 8000
+      uv run uvicorn --host 0.0.0.0 --port 8000
         macrostrat.tileserver:app
         --root-path /tiles
         --log-level debug
         --proxy-headers
         --forwarded-allow-ips=*
   legacy_tileserver:
-    build: ../services/legacy-tileserver
+    image: hub.opensciencegrid.org/macrostrat/legacy-tileserver:main
+    build:
+      context: ../services/legacy-tileserver
+      additional_contexts:
+        py-modules: ../py-modules
     environment:
       - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@database:5432/${POSTGRES_DB}
     command: >

py-modules/tileserver-utils/pyproject.toml

@@ -3,7 +3,7 @@ name = "macrostrat.tileserver-utils"
 version = "0.1.0"
 description = "Utilities for Macrostrat tile servers"
 authors = [{ name = "Daven Quinn", email = "[email protected]" }]
-requires-python = ">=3.11,<4.0"
+requires-python = ">=3.9,<4.0"
 readme = "README.md"
 dependencies = [
     "starlette (>=0.37.0,<0.47.0)",

services/api-v3/Dockerfile

@@ -18,4 +18,6 @@ ADD . /services/main
 RUN --mount=type=cache,target=/root/.cache/uv \
     uv sync --locked
 
+EXPOSE 80
+
 CMD ["uv", "run", "uvicorn", "api.app:app", "--host", "0.0.0.0", "--port", "80"]

services/legacy-tileserver/Dockerfile

@@ -56,34 +56,32 @@ RUN npm install -g carto
 # Clear temporary files
 RUN rm -rf /tmp/*
 
-# The rest of this (for vector tile generation and the server itself) should be easier.
+# The rest of this (for the server itself) should be easier.
 
+# Install UV
+COPY --from=ghcr.io/astral-sh/uv:0.9.9 /uv /uvx /bin/
 
-RUN pip install --no-cache-dir "pip==25.1.1" && pip install --no-cache-dir "poetry==2.1.1"
+ENV UV_LINK_MODE=copy
+ENV UV_COMPILE_BYTECODE=1
 
+# NEED TO specify a build context for the py-modules directory
+COPY --from=py-modules tileserver-utils /py-modules/tileserver-utils
 
-# Copy only requirements to cache them in docker layer
-# Right now, Poetry lock file must exist to avoid hanging on dependency resolution
-COPY ./pyproject.toml ./poetry.lock /app/
+WORKDIR /services/main
 
-# Create and activate our own virtual envrionment so that we can keep
-# our application dependencies separate from Poetry's
+# Install dependencies
+RUN --mount=type=cache,target=/root/.cache/uv \
+    --mount=type=bind,source=uv.lock,target=uv.lock \
+    --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
+    --mount=type=bind,source=deps,target=deps \
+    uv sync --locked --no-install-project --no-editable --active
 
-RUN --mount=type=cache,target=$POETRY_CACHE_DIR poetry install --no-root --without dev --without local
+# Add source files to project
+ADD . /services/main
 
-# This gets locally built deps, which must be staged in the
-# image directory before building. This is breakable and we'd like
-# to end up with a better solution eventually.
-COPY ./deps/ /app/deps/
-
-# Install local wheels without caring about hashes (poetry gets mad if package hashes don't match.)
-RUN pip install --no-cache-dir ./deps/*.whl
-
-# Creating folders, and files for a project:
-COPY ./ /app/
-
-# Install the root package
-RUN --mount=type=cache,target=$POETRY_CACHE_DIR poetry install --without dev
+# Sync the project
+RUN --mount=type=cache,target=/root/.cache/uv \
+    uv sync --locked --no-editable --active
 
 EXPOSE 8000
 

services/legacy-tileserver/uv.lock

@@ -44,4 +44,6 @@ ADD . /services/main
 RUN --mount=type=cache,target=/root/.cache/uv \
     uv sync --locked --no-editable
 
+EXPOSE 8000
+
 CMD ["uv", "run", "uvicorn", "--host", "0.0.0.0", "--port", "8000", "macrostrat.tileserver:app" ]