Ignore hashes for local packages

Author: davenquinn

services/legacy-tileserver/Dockerfile

@@ -59,26 +59,30 @@ WORKDIR /app/
 # 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/
-# 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/
 
 # Create and activate our own virtual envrionment so that we can keep
 # our application dependencies separate from Poetry's
 RUN python3 -m venv /venv
 ENV PATH="/venv/bin:$PATH"
+ENV VIRTUAL_ENV=/venv
 
-RUN --mount=type=cache,target=$POETRY_CACHE_DIR poetry install --no-root --without dev
+RUN --mount=type=cache,target=$POETRY_CACHE_DIR poetry install --no-root --without dev --without local
 
-EXPOSE 8000
+# 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
 
+EXPOSE 8000
 
 CMD ["uvicorn", "--host", "0.0.0.0", "--port", "8000", "macrostrat.legacy_tileserver:app"]
 

services/legacy-tileserver/poetry.lock

@@ -16,16 +16,20 @@ asyncpg = "^0.23.0"
 buildpg = "^0.4"
 morecantile = "^6.2.0"
 "macrostrat.utils" = "^1.2.0"
+"macrostrat.database" = "^3.0.0"
+
+[tool.poetry.group.local.dependencies]
 # Local wheel of macrostrat.tileserver-utils. This must be built (using make in the py-modules directory)
 # and copied here before Docker build.
 "macrostrat.tileserver-utils" = { file = "deps/macrostrat_tileserver_utils-0.1.0-py3-none-any.whl" }
-"macrostrat.database" = "^3.0.0"
-# NOTE: there is also a requirement on mapnik, but this cannot be installed via poetry
-# due to its complicated installation process.
 
 [tool.poetry.group.dev.dependencies]
 isort = "^5.12.0"
 black = "^24.8.0"
+# NOTE: there is also a requirement on mapnik, but this cannot be installed via poetry
+# due to its complicated installation process.
+# mapnik = "^3.0.0"
+
 
 [build-system]
 build-backend = "poetry.core.masonry.api"

services/legacy-tileserver/pyproject.toml

@@ -35,6 +35,7 @@ ENV PATH="/venv/bin:$PATH" \
 WORKDIR /app/
 
 COPY pyproject.toml poetry.lock ./
+COPY ./deps/timvt ./deps/timvt
 RUN touch README.md
 
 # Install Poetry dependencies (without dev and local dependencies)
@@ -48,7 +49,16 @@ RUN apt-get remove -y \
   python3.11-dev && \
   rm -rf /var/lib/apt/lists/*
 
-# Creating folders and files for a project, including local dependencies
+# Copy local wheels and install with pip
+# TODO: place these wheels in a package repository to separate their build process...
+COPY ./deps/*.whl ./deps/
+# Install local wheels without caring about hashes (poetry gets mad if package hashes don't match.
+# Non-matching hashes could result from a different build environment (e.g, the wheel was compiled/locked locally
+# and the Dockerfile is now being built in CI/CD).
+# This is a temporary solution until we can get the wheels into a package repository.
+RUN pip install --no-cache-dir ./deps/*.whl
+
+# Creating folders and files for a project, including remaining local wheels
 COPY ./ /app/
 
 # Install the root project and local dependencies

services/tileserver/Dockerfile

@@ -17,9 +17,9 @@ uvicorn = "^0.34.2"
 titiler = "^0.18.5"
 httpx = "^0.27.2"
 mapbox-vector-tile = "^2.1.0"
+timvt = { path = "./deps/timvt", develop = true }
 
 [tool.poetry.group.local.dependencies]
-timvt = { path = "./deps/timvt", develop = true }
 # Local wheel of macrostrat.tileserver-utils. This must be built (using make in the py-modules directory)
 # and copied here before Docker build.
 "macrostrat.tileserver-utils" = { file = "./deps/macrostrat_tileserver_utils-0.1.0-py3-none-any.whl" }