From a7a465d9d4c7aaffefeb9a6ba88e8efdb920ee98 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Mon, 30 Dec 2024 11:24:56 +0800
Subject: [PATCH] Give node more memory as required to complete build. Install
 newer gdal version.

---
 Dockerfile | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ecb7f918..1109574a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,8 @@ ENV DEBIAN_FRONTEND=noninteractive \
     SITE_DOMAIN='dbca.wa.gov.au' \
     OSCAR_SHOP_NAME='Parks & Wildlife' \
     BPAY_ALLOWED=False \
-    NODE_MAJOR=20
+    NODE_MAJOR=20 \
+    NODE_OPTIONS=--max_old_space_size=4096
 
 FROM builder_base_boranga as apt_packages_boranga
 
@@ -27,17 +28,15 @@ RUN --mount=type=cache,target=/var/cache/apt apt-get update && \
     apt-get upgrade -y && \
     apt-get install --no-install-recommends -y \
     binutils \
-    ca-certificates \
     bzip2 \
+    ca-certificates \
     curl \
     g++ \
     gcc \
-    gdal-bin \
     git \
     graphviz \
     htop \
     ipython3 \
-    libgdal-dev \
     libgraphviz-dev \
     libmagic-dev \
     libpq-dev \
@@ -47,11 +46,11 @@ RUN --mount=type=cache,target=/var/cache/apt apt-get update && \
     patch \
     postgresql-client \
     python3-dev \
-    python3-gdal \
     python3-pil \
     python3-pip \
     python3-setuptools \
     python3-venv \
+    software-properties-common \
     sqlite3 \
     ssh \
     sudo \
@@ -62,6 +61,15 @@ RUN --mount=type=cache,target=/var/cache/apt apt-get update && \
     rm -rf /var/lib/apt/lists/* && \
     update-ca-certificates
 
+RUN add-apt-repository ppa:ubuntugis/ubuntugis-unstable
+
+RUN --mount=type=cache,target=/var/cache/apt apt-get update && \
+    apt-get upgrade -y && \
+    apt-get install --no-install-recommends -y \
+    gdal-bin \
+    libgdal-dev \
+    python3-gdal
+
 FROM apt_packages_boranga as node_boranga
 
 # install node
@@ -123,8 +131,6 @@ RUN cd /app/boranga/frontend/boranga; npm ci --omit=dev && \
 
 FROM build_vue_boranga as launch_boranga
 
-RUN $VIRTUAL_ENV_PATH/bin/python manage.py collectstatic --noinput
-
 EXPOSE 8080
 HEALTHCHECK --interval=1m --timeout=5s --start-period=10s --retries=3 CMD ["wget", "-q", "-O", "-", "http://localhost:8080/"]
 CMD ["/startup.sh"]