fix merge issues

Author: peterbull

backend/backend.dockerfile

@@ -3,18 +3,22 @@ FROM python:3.10.12-slim
 
 
 # Install system dependencies required for psycopg2 and wget
-RUN apt-get update && apt-get install -y libpq-dev gcc wget curl && \
-    rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y libpq-dev gcc wget curl coreutils gdal-bin libgdal-dev g++ && \
+  rm -rf /var/lib/apt/lists/*
 
 # Install Miniconda
 ENV MINICONDA_VERSION=py310_24.1.2-0
+ARG MINICONDA_ARCH
+
+# Typical x86 build env
+# ENV MINICONDA_ARCH=Linux-x86_64
 ENV CONDA_DIR=/opt/conda
 ENV PATH=$CONDA_DIR/bin:$PATH
 
-RUN wget https://repo.anaconda.com/miniconda/Miniconda3-$MINICONDA_VERSION-Linux-x86_64.sh \
-    && mkdir -p $CONDA_DIR \
-    && sh Miniconda3-$MINICONDA_VERSION-Linux-x86_64.sh -b -u -p $CONDA_DIR \
-    && rm -f Miniconda3-$MINICONDA_VERSION-Linux-x86_64.sh
+RUN wget https://repo.anaconda.com/miniconda/Miniconda3-$MINICONDA_VERSION-$MINICONDA_ARCH.sh \
+  && mkdir -p $CONDA_DIR \
+  && sh Miniconda3-$MINICONDA_VERSION-$MINICONDA_ARCH.sh -b -u -p $CONDA_DIR \
+  && rm -f Miniconda3-$MINICONDA_VERSION-$MINICONDA_ARCH.
 
 # Install cfgrib and eccodes using Conda, this is somewhat redudant,
 # but the only way the cfgrib library installs correctly for xarray that I've found
@@ -31,7 +35,7 @@ ENV PYTHONPATH /usr/src/app
 COPY pyproject.toml poetry.lock ./
 
 RUN poetry config virtualenvs.create false \
-    && poetry install --no-interaction --no-ansi
+  && poetry install --no-interaction --no-ansi
 
 COPY . .
 

docker-compose.prod.yml

@@ -120,8 +120,11 @@ services:
     build:
       context: ./backend
       dockerfile: backend.dockerfile
+      args:
+        MINICONDA_ARCH: Linux-x86_64
     env_file:
       - .env.prod
+
     command: sh -c "uvicorn app.main:app --host 0.0.0.0 --port 8000"
     volumes:
       - ./backend:/usr/src/app

docker-compose.yml

@@ -113,6 +113,9 @@ services:
     build:
       context: ./backend
       dockerfile: backend.dockerfile
+      args:
+        MINICONDA_ARCH: Linux-aarch64
+        # MINICONDA_ARCH: Linux-x86_64 # Enable for local dev on non-ARM
     env_file:
       - .env
     command: sh -c "uvicorn app.main:app --host 0.0.0.0 --port 8000"