Base all-in-one image on PostgreSQL Bookworm
This commit is contained in:
@@ -67,12 +67,14 @@ def test_unraid_all_in_one_runtime_starts_embedded_postgis_backend_and_nginx() -
|
||||
nginx_config = (ROOT / "deploy" / "unraid" / "nginx-all-in-one.conf").read_text(encoding="utf-8")
|
||||
dockerignore = (ROOT / ".dockerignore").read_text(encoding="utf-8")
|
||||
|
||||
assert "FROM postgis/postgis:16-3.5 AS runtime" in dockerfile
|
||||
assert "FROM postgres:16-bookworm AS runtime" in dockerfile
|
||||
assert "postgresql-16-postgis-3" in dockerfile
|
||||
assert "postgresql-16-postgis-3-scripts" in dockerfile
|
||||
assert "ln -sf /usr/bin/python3.11 /usr/local/bin/python3" in dockerfile
|
||||
assert "ln -sf /usr/bin/python3.11 /usr/bin/python3" in dockerfile
|
||||
assert "/usr/bin/python3.11 -m venv /opt/geointel/venv" in dockerfile
|
||||
assert "python3-pip" not in dockerfile
|
||||
assert "python3-venv" not in dockerfile
|
||||
assert "python3-venv" in dockerfile
|
||||
assert "COPY --from=frontend-build /frontend/dist/ /usr/share/nginx/html/" in dockerfile
|
||||
assert 'CMD ["/usr/local/bin/geointel-all-in-one-start"]' in dockerfile
|
||||
assert "/usr/local/bin/docker-entrypoint.sh postgres &" in start_script
|
||||
|
||||
@@ -6,7 +6,7 @@ RUN npm install
|
||||
COPY frontend/ ./
|
||||
RUN npm run build
|
||||
|
||||
FROM postgis/postgis:16-3.5 AS runtime
|
||||
FROM postgres:16-bookworm AS runtime
|
||||
|
||||
ENV GEOINTEL_ENV=production \
|
||||
GEOINTEL_API_PREFIX=/api/v1 \
|
||||
@@ -27,7 +27,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
libpq-dev \
|
||||
libproj-dev \
|
||||
nginx \
|
||||
postgresql-16-postgis-3 \
|
||||
postgresql-16-postgis-3-scripts \
|
||||
proj-bin \
|
||||
python3-dev \
|
||||
python3-venv \
|
||||
&& ln -sf /usr/bin/python3.11 /usr/local/bin/python3 \
|
||||
&& ln -sf /usr/bin/python3.11 /usr/bin/python3 \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
Reference in New Issue
Block a user