Merge pull request #166 from ropable/master

Fix bug in ERServicePriorityData validator, update base image minor version, update dependency versions

.github/workflows/image-build-scan.yml

@@ -58,7 +58,7 @@ jobs:
       # Build and push Docker image (not on PR)
       #----------------------------------------------
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}

Dockerfile

@@ -1,20 +1,20 @@
 # syntax=docker/dockerfile:1
 # Prepare the base environment.
-FROM python:3.11.8-slim as builder_base_ibms
-MAINTAINER [email protected]
-LABEL org.opencontainers.image.source https://github.com/dbca-wa/ibms
+FROM python:3.11.9-slim AS builder_base_ibms
+LABEL org.opencontainers.image.authors=[email protected]
+LABEL org.opencontainers.image.source=https://github.com/dbca-wa/ibms
 
 RUN apt-get update -y \
   && apt-get upgrade -y \
   && apt-get install -y python3-dev libpq-dev gcc \
   && 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_ibms as python_libs_ibms
+FROM builder_base_ibms AS python_libs_ibms
 WORKDIR /app
-ARG POETRY_VERSION=1.7.1
-RUN pip install poetry=="${POETRY_VERSION}"
+ARG POETRY_VERSION=1.8.3
+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

ibms_project/ibms/utils.py

@@ -804,7 +804,7 @@ def validate_upload_file(file, file_type):
     elif file_type == 'ERServicePriorityData':
         return validate_headers(
             row,
-            valid_count=8,
+            valid_count=6,
             headings=[
                 'CategoryID',
                 'SerPriNo',

kustomize/base/deployment_hpa.yaml

@@ -13,5 +13,5 @@ spec:
         name: cpu
         target:
           type: Utilization
-          averageUtilization: 250
+          averageUtilization: 500
       type: Resource

kustomize/overlays/prod/kustomization.yaml

@@ -20,4 +20,4 @@ patches:
   - path: service_patch.yaml
 images:
   - name: ghcr.io/dbca-wa/ibms
-    newTag: 2.8.7
+    newTag: 2.8.8

pyproject.toml

@@ -1,31 +1,32 @@
 [tool.poetry]
 name = "ibms"
-version = "2.8.7"
+version = "2.8.8"
 description = "Integrated Business Management System corporate application"
 authors = ["Ashley Felton <[email protected]>"]
 license = "Apache-2.0"
+package-mode = false
 
 [tool.poetry.dependencies]
 python = ">=3.11"
 django = "4.2.11"
-psycopg = {version = "3.1.19", extras = ["binary", "pool"]}
+psycopg = "3.2.1"
 dbca-utils = "2.0.2"
 django-extensions = "3.2.3"
 python-dotenv = "1.0.1"
-dj-database-url = "2.1.0"
+dj-database-url = "2.2.0"
 gunicorn = "22.0.0"
-django-crispy-forms = "2.1"
+django-crispy-forms = "2.2"
 crispy-bootstrap5 = "2024.2"
 xlrd = "2.0.1"  # TODO: deprecate
 xlutils = "2.0.0"  # TODO: deprecate
 xlwt = "1.3.0"  # TODO: deprecate
-openpyxl = "3.1.2"
-webtemplate-dbca = "1.7.0"
-whitenoise = {version = "6.6.0", extras = ["brotli"]}
+openpyxl = "3.1.5"
+webtemplate-dbca = "1.7.1"
+whitenoise = {version = "6.7.0", extras = ["brotli"]}
 mixer = "7.2.2"
 
 [tool.poetry.group.dev.dependencies]
-ipython = "^8.23.0"
+ipython = "^8.26.0"
 ipdb = "^0.13.13"
 pre-commit = "^3.7.1"