fix: tweaks to docker files and rename compose (#821)

Co-authored-by: Pete Gadomski <[email protected]>

Author: Phil Varner

CHANGES.md

@@ -373,7 +373,7 @@ Full changelog: https://stac-utils.github.io/stac-fastapi/migrations/v3.0.0/#cha
 ### Added
 
 * Nginx service as second docker-compose stack to demonstrate proxy ([#503](https://github.com/stac-utils/stac-fastapi/pull/503))
-* Validation checks in CI using [stac-api-validator](github.com/stac-utils/stac-api-validator) ([#508](https://github.com/stac-utils/stac-fastapi/pull/508))
+* Validation checks in CI using [stac-api-validator](https://github.com/stac-utils/stac-api-validator) ([#508](https://github.com/stac-utils/stac-fastapi/pull/508))
 * Required links to the sqlalchemy ItemCollection endpoint ([#508](https://github.com/stac-utils/stac-fastapi/pull/508))
 * Publication of docker images to GHCR ([#525](https://github.com/stac-utils/stac-fastapi/pull/525))
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.11-slim as base
+FROM python:3.12-slim AS base
 
 # Any python libraries that require system libraries to be installed will likely
 # need the following packages in order to build
@@ -10,12 +10,13 @@ RUN apt-get update && \
 
 ENV CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
 
-FROM base as builder
+FROM base AS builder
 
 WORKDIR /app
 
 COPY . /app
 
-RUN python -m pip install -e ./stac_fastapi/types[dev] && \
-    python -m pip install -e ./stac_fastapi/api[dev] && \
-    python -m pip install -e ./stac_fastapi/extensions[dev]
+RUN python -m pip install \
+    -e ./stac_fastapi/types[dev] \
+    -e ./stac_fastapi/api[dev] \
+    -e ./stac_fastapi/extensions[dev]

Dockerfile.docs

@@ -1,7 +1,9 @@
-FROM python:3.11-slim
+FROM python:3.12-slim
 
 # build-essential is required to build a wheel for ciso8601
-RUN apt update && apt install -y build-essential
+RUN apt update && apt install -y build-essential && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
 
 RUN python -m pip install --upgrade pip
 

Makefile

@@ -11,12 +11,12 @@ install:
 
 .PHONY: docs-image
 docs-image:
-	docker compose -f docker-compose.docs.yml \
+	docker compose -f compose.docs.yml \
 		build
 
 .PHONY: docs
 docs: docs-image
-	docker compose -f docker-compose.docs.yml \
+	docker compose -f compose.docs.yml \
 		run docs
 
 .PHONY: test

README.md

@@ -78,10 +78,10 @@ Other backends may be available from other sources, search [PyPI](https://pypi.o
 Install the packages in editable mode:
 
 ```shell
-python -m pip install -e \
-  'stac_fastapi/types[dev]' \
-  'stac_fastapi/api[dev]' \
-  'stac_fastapi/extensions[dev]'
+python -m pip install \
+  -e 'stac_fastapi/types[dev]' \
+  -e 'stac_fastapi/api[dev]' \
+  -e 'stac_fastapi/extensions[dev]'
 ```
 
 To run the tests: