From a903d43368622bd0a93159481a52a38a421204f1 Mon Sep 17 00:00:00 2001
From: Rob Kooper <kooper@illinois.edu>
Date: Sun, 1 Sep 2024 22:32:41 -0500
Subject: [PATCH] leverage binary ed build

---
 .github/workflows/docker.yml | 14 ++++----
 models/ed/Dockerfile         | 66 ++++++++++++++++++++----------------
 2 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 01096746f0d..eef80be8e9e 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -286,7 +286,7 @@ jobs:
         name:
           - basgra
           - biocro
-          - ed2_2.2.0
+          # - ed2_2.2.0
           - ed2_git
           - maespa
           - sipnet
@@ -303,12 +303,12 @@ jobs:
             PLATFORM: "linux/amd64"
             MODEL: biocro
             VERSION: "0.95"
-          - name: ed2_2.2.0
-            CONTEXT: models/ed
-            DOCKERFILE: models/ed/Dockerfile
-            PLATFORM: "linux/amd64"
-            MODEL: ed2
-            VERSION: "2.2.0"
+          # - name: ed2_2.2.0
+          #   CONTEXT: models/ed
+          #   DOCKERFILE: models/ed/Dockerfile
+          #   PLATFORM: "linux/amd64"
+          #   MODEL: ed2
+          #   VERSION: "2.2.0"
           - name: ed2_git
             CONTEXT: models/ed
             DOCKERFILE: models/ed/Dockerfile
diff --git a/models/ed/Dockerfile b/models/ed/Dockerfile
index 282a5b5d391..f8edf578f4e 100644
--- a/models/ed/Dockerfile
+++ b/models/ed/Dockerfile
@@ -1,40 +1,45 @@
-# this needs to be at the top, what version are we building
-ARG IMAGE_VERSION="latest"
+# # this needs to be at the top, what version are we building
+# ARG IMAGE_VERSION="latest"
 
-# ----------------------------------------------------------------------
-# BUILD MODEL BINARY
-# ----------------------------------------------------------------------
-FROM pecan/models:${IMAGE_VERSION} as model-binary
+# # ----------------------------------------------------------------------
+# # BUILD MODEL BINARY
+# # ----------------------------------------------------------------------
+# FROM pecan/models:${IMAGE_VERSION} as model-binary
 
-# Some variables that can be used to set control the docker build
-ARG MODEL_VERSION="2.2.0"
-ARG BINARY_VERSION="2.2"
+# # Some variables that can be used to set control the docker build
+# ARG MODEL_VERSION="2.2.0"
+# ARG BINARY_VERSION="2.2"
 
-# specify fortran compiler
-ENV FC_TYPE=GNU
+# # specify fortran compiler
+# ENV FC_TYPE=GNU
 
-# install dependencies
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-       build-essential \
-       curl \
-       gfortran \
-       git \
-       libhdf5-dev \
-       libopenmpi-dev \
-    && rm -rf /var/lib/apt/lists/*
+# # install dependencies
+# RUN apt-get update \
+#     && apt-get install -y --no-install-recommends \
+#        build-essential \
+#        curl \
+#        gfortran \
+#        git \
+#        libhdf5-dev \
+#        libopenmpi-dev \
+#     && rm -rf /var/lib/apt/lists/*
 
-# download, unzip and build ed2
-WORKDIR /src
-RUN git -c http.sslVerify=false clone https://github.com/EDmodel/ED2.git \
-    && cd ED2/ED/build \
-    && curl -o make/include.mk.VM http://isda.ncsa.illinois.edu/~kooper/EBI/include.mk.opt.`uname -s` \
-    && if [ "${MODEL_VERSION}" != "git" ]; then git checkout "v.${MODEL_VERSION}"; fi \
-    && ./install.sh -g -p VM \
-    && mv /src/ED2/ED/build/ed_${BINARY_VERSION}-opt /src/ED2/ED/build/ed 
+# # download, unzip and build ed2
+# WORKDIR /src
+# RUN git -c http.sslVerify=false clone https://github.com/EDmodel/ED2.git \
+#     && cd ED2/ED/build \
+#     && curl -o make/include.mk.VM http://isda.ncsa.illinois.edu/~kooper/EBI/include.mk.opt.`uname -s` \
+#     && if [ "${MODEL_VERSION}" != "git" ]; then git checkout "v.${MODEL_VERSION}"; fi \
+#     && ./install.sh -g -p VM \
+#     && mv /src/ED2/ED/build/ed_${BINARY_VERSION}-opt /src/ED2/ED/build/ed 
 
 ########################################################################
 
+# ----------------------------------------------------------------------
+# ED MODEL
+# ----------------------------------------------------------------------
+FROM edmodel/ed2:gnu AS model-binary
+
 # ----------------------------------------------------------------------
 # BUILD PECAN FOR MODEL
 # ----------------------------------------------------------------------
@@ -66,4 +71,5 @@ RUN sed -i -e "s/@VERSION@/${MODEL_VERSION}/g" \
            -e "s#@BINARY@#/usr/local/bin/ed.${MODEL_VERSION}#g" /work/model.json
 
 # COPY model binary
-COPY --from=model-binary /src/ED2/ED/build/ed /usr/local/bin/ed.${MODEL_VERSION}
+# COPY --from=model-binary /src/ED2/ED/build/ed /usr/local/bin/ed.${MODEL_VERSION}
+COPY --from=model-binary /usr/bin/ed2 /usr/local/bin/ed.${MODEL_VERSION}
\ No newline at end of file