diff --git a/Dockerfile b/Dockerfile index 007166d..ed5eb45 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,20 +1,20 @@ # syntax=docker/dockerfile:1 # Prepare the base environment. -FROM python:3.11.9-slim as builder_base_mapproxy -MAINTAINER asi@dbca.wa.gov.au -LABEL org.opencontainers.image.source https://github.com/dbca-wa/mapproxy +FROM python:3.11.9-slim AS builder_base_mapproxy +LABEL org.opencontainers.image.authors=asi@dbca.wa.gov.au +LABEL org.opencontainers.image.source=https://github.com/dbca-wa/mapproxy RUN apt-get update -y \ && apt-get upgrade -y \ && apt-get install --no-install-recommends -y libgeos-dev libgdal-dev \ && rm -rf /var/lib/apt/lists/* \ - && pip install --upgrade pip + && pip install --root-user-action=ignore --upgrade pip # Install Python libs using Poetry. -FROM builder_base_mapproxy as python_libs_mapproxy +FROM builder_base_mapproxy AS python_libs_mapproxy WORKDIR /app ARG POETRY_VERSION=1.8.3 -RUN pip install poetry=="${POETRY_VERSION}" +RUN pip install --root-user-action=ignore poetry=="${POETRY_VERSION}" COPY poetry.lock pyproject.toml ./ RUN poetry config virtualenvs.create false \ && poetry install --no-interaction --no-ansi --only main diff --git a/kustomize/base/deployment.yaml b/kustomize/base/deployment.yaml index 7428499..e53c342 100644 --- a/kustomize/base/deployment.yaml +++ b/kustomize/base/deployment.yaml @@ -16,8 +16,8 @@ spec: value: "Australia/Perth" resources: requests: - memory: "200Mi" - cpu: "50m" + memory: "100Mi" + cpu: "5m" limits: memory: "2Gi" cpu: "1000m" diff --git a/kustomize/base/deployment_hpa.yaml b/kustomize/base/deployment_hpa.yaml index f7b92e1..0cde4b2 100644 --- a/kustomize/base/deployment_hpa.yaml +++ b/kustomize/base/deployment_hpa.yaml @@ -3,8 +3,8 @@ kind: HorizontalPodAutoscaler metadata: name: mapproxy-deployment-hpa spec: - minReplicas: 1 - maxReplicas: 3 + minReplicas: 2 + maxReplicas: 10 scaleTargetRef: apiVersion: apps/v1 kind: Deployment