From 7aec72a1c061aef6769b30db00ecddbe3537c7ae Mon Sep 17 00:00:00 2001
From: Ian McGinnis <67600557+ian-noaa@users.noreply.github.com>
Date: Thu, 6 Jul 2023 14:29:10 -0600
Subject: [PATCH] Use pip to manage Python dependencies

We were previously installing OS-vendored versions of our Python
dependencies as that was easiest when on Alpine and dealing with
musl. We're now on a Debian-base image so pip packages will be well
tested and compatible.

Switch METcalcpy to install from pip. Previously we were installing
from their "develop" GitHub branch as official pypi packages weren't
available. Official releases should be more stable now that they're
available.

I also added g++ and build-essentials to support ARM/Apple Silicon
builds.
---
 Dockerfile | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1e63a556d..b28f81064 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,24 +27,23 @@ ARG APPNAME
 ARG BUILDVER=dev
 ARG COMMITBRANCH=development
 ARG COMMITSHA
-ARG METCALCPYVER=develop
 
 ENV DEBIAN_FRONTEND=noninteractive
 
 # Install runtime dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \
     bash \
-    git \
     ca-certificates \
     python3 \
-    python3-numpy \
-    python3-scipy \
-    python3-pandas \
     python3-pip \
-    python3-pymysql \
     && apt-get clean && rm -rf /var/lib/apt/lists/* \
-    && pip3 --no-cache-dir install \
-        metcalcpy@git+https://github.com/dtcenter/METcalcpy.git@${METCALCPYVER}
+    && python3 -m pip install --upgrade --no-cache-dir pip wheel setuptools \
+    && python3 -m pip --no-cache-dir install \
+        metcalcpy \
+        numpy \
+        scipy \
+        pandas \
+        pymysql
 
 # Set Environment
 ENV APP_FOLDER=/usr/app
@@ -76,9 +75,19 @@ RUN mkdir -p ${SETTINGS_DIR} \
     && chown node:node ${APP_BUNDLE_FOLDER}/bundle/programs/server/fileCache \
     && chmod 644 ${APP_BUNDLE_FOLDER}/bundle/programs/server/fileCache
 
-# Install the Meteor app's NPM dependencies and update the OS in the container
-RUN bash $SCRIPTS_FOLDER/build-meteor-npm-dependencies.sh
-RUN apt-get update && apt-get -y upgrade && apt-get clean && apt-get clean && rm -rf /var/lib/apt/lists/*
+# Install the Meteor app's NPM dependencies
+# g++ & build-essential are needed for Apple Silicon builds
+RUN apt-get update && apt-get install -y --no-install-recommends g++ build-essential \
+    && bash $SCRIPTS_FOLDER/build-meteor-npm-dependencies.sh \
+    && apt-get purge -y g++ build-essential \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Update the OS packages in the container
+RUN apt-get update \
+    && apt-get -y upgrade \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 
 EXPOSE ${PORT}
 USER node
@@ -95,7 +104,7 @@ LABEL version=${BUILDVER} code.branch=${COMMITBRANCH} code.commit=${COMMITSHA}
 
 
 # Create a stage with the root user for debugging
-# Note - you'll need to override the entrypoint if you want a shell (docker run --entrypoint /bin/bash ...)
+# Note - you'll need to override the entrypoint if you want a shell (docker run -it --entrypoint /bin/bash ...)
 FROM production AS debug
 USER root