Integrate tileserver #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

davenquinn merged 345 commits into main from integrate-tileserver

May 22, 2025

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

-Original file line number
+Diff line change
@@ -0,0 +1,64 @@
+    name: Build legacy tileserver
+    on:
+      push:
+        # Branches and paths are exclusive
+        branches: ["main"]
+        paths:
+          - services/legacy-tileserver/**
+        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/**
+    jobs:
+      docker:
+        runs-on: ubuntu-latest
+        steps:
+          - name: Checkout
+            uses: actions/checkout@v4
+            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.event.release.tag_name }}
+              VERSION=$(echo "${TAG}" | sed -E 's/legacy-tileserver-v//')
+              echo "VERSION=${VERSION}" >> $GITHUB_ENV
+          - name: Docker meta
+            id: meta
+            uses: docker/metadata-action@v4
+            with:
+              images: hub.opensciencegrid.org/macrostrat/legacy-tileserver
+              tags: |
+                type=ref,event=pr,suffix=-{{date 'YYYYMMDDHHmmss'}}
+                type=ref,event=branch,suffix=-{{date 'YYYYMMDDHHmmss'}}
+                type=semver,pattern={{version}}
+                type=raw,value=latest,enable={{is_default_branch}}
+                type=raw,value=sha-{{sha}}
+          - name: Set up Docker BuildX
+            uses: docker/setup-buildx-action@v2
+          - name: Login to OSG DockerHub
+            uses: docker/login-action@v2
+            with:
+              registry: hub.opensciencegrid.org
+              username: ${{ vars.HARBOR_CLI_NAME }}
+              password: ${{ secrets.HARBOR_CLI_SECRET }}
+          - name: Build and push
+            uses: docker/build-push-action@v5
+            with:
+              context: services/legacy-tileserver
+              push: true
+              tags: ${{ steps.meta.outputs.tags }}
+              labels: ${{ steps.meta.outputs.labels }}
+              cache-from: type=gha
+              cache-to: type=gha,mode=max

.github/workflows/build-tileserver.yaml

-Original file line number
+Diff line change
@@ -0,0 +1,64 @@
+    name: Build tileserver
+    on:
+      push:
+        # Branches and paths are exclusive
+        branches: ["main"]
+        paths:
+          - services/tileserver/**
+        tags:
+          - tileserver-v[0-9]+.[0-9]+.[0-9]+ # Semver Release (non-prerelease)
+          - tileserver-v[0-9]+.[0-9]+.[0-9]+-** # Semver release (prerelease)
+      pull_request:
+        branches: [main]
+        paths:
+          - services/tileserver/**
+    jobs:
+      docker:
+        runs-on: ubuntu-latest
+        steps:
+          - name: Checkout
+            uses: actions/checkout@v4
+            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.event.release.tag_name }}
+              VERSION=$(echo "${TAG}" | sed -E 's/tileserver-v//')
+              echo "VERSION=${VERSION}" >> $GITHUB_ENV
+          - name: Docker meta
+            id: meta
+            uses: docker/metadata-action@v4
+            with:
+              images: hub.opensciencegrid.org/macrostrat/tileserver
+              tags: |
+                type=ref,event=pr,suffix=-{{date 'YYYYMMDDHHmmss'}}
+                type=ref,event=branch,suffix=-{{date 'YYYYMMDDHHmmss'}}
+                type=semver,pattern={{version}}
+                type=raw,value=latest,enable={{is_default_branch}}
+                type=raw,value=sha-{{sha}}
+          - name: Set up Docker BuildX
+            uses: docker/setup-buildx-action@v2
+          - name: Login to OSG DockerHub
+            uses: docker/login-action@v2
+            with:
+              registry: hub.opensciencegrid.org
+              username: ${{ vars.HARBOR_CLI_NAME }}
+              password: ${{ secrets.HARBOR_CLI_SECRET }}
+          - name: Build and push
+            uses: docker/build-push-action@v5
+            with:
+              context: services/tileserver
+              push: true
+              tags: ${{ steps.meta.outputs.tags }}
+              labels: ${{ steps.meta.outputs.labels }}
+              cache-from: type=gha
+              cache-to: type=gha,mode=max

.gitmodules

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,3 +7,6 @@ @@
     [submodule "submodules/storage-admin"]
     	path = submodules/storage-admin
     	url = https://github.com/UW-Macrostrat/radosgw_admin_client
+    [submodule "deps/timvt"]
+    	path = services/tileserver/deps/timvt
+    	url = https://github.com/developmentseed/timvt.git

.idea/macrostrat.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

.idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

.idea/sqldialects.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

.idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

local-root/Caddyfile

-Original file line number
+Diff line change
@@ Expand Up / @@ -54,7 +54,11 @@ localhost, macrostrat.local { @@
         # Legacy API for development
         import schema-proxy /api/pg macrostrat_api
+        # The legacy tileserver is served at a different domain in production
+        # but we keep it here to be straightforward for local development
+        handle_path /tiles/legacy/* {
+            reverse_proxy legacy_tileserver:8000
+        }
         handle_path /tiles/* {
             reverse_proxy tileserver:8000
@@ Expand Down @@

local-root/__old_configs/dev-server/.gitignore

This file was deleted.

local-root/__old_configs/dev-server/Dockerfile.api

This file was deleted.

local-root/__old_configs/dev-server/docker-compose.yaml

This file was deleted.

local-root/__old_configs/dev-server/gateway/Dockerfile

This file was deleted.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Integrate tileserver #149

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!