From fbec26dcabd59d8f08996435c192a72435ce9b70 Mon Sep 17 00:00:00 2001 From: TShapinsky Date: Thu, 11 May 2023 13:42:08 -0600 Subject: [PATCH 1/2] bump openstudio to version 3.6.0 and e+ to 23.1.0 --- Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index a3ea979..bb59b38 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,18 +41,18 @@ RUN update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/jav WORKDIR $BUILD_DIR -ENV OPENSTUDIO_DOWNLOAD_FILENAME OpenStudio-3.3.0+ad235ff36e-Ubuntu-20.04.deb -ENV OPENSTUDIO_DOWNLOAD_URL https://github.com/NREL/OpenStudio/releases/download/v3.3.0/OpenStudio-3.3.0+ad235ff36e-Ubuntu-20.04.deb +ENV OPENSTUDIO_DOWNLOAD_FILENAME OpenStudio-3.6.0+860f5de185-Ubuntu-20.04-x86_64.deb +ENV OPENSTUDIO_DOWNLOAD_URL https://github.com/NREL/OpenStudio/releases/download/v3.6.0/OpenStudio-3.6.0+860f5de185-Ubuntu-20.04-x86_64.deb -ENV ENERGYPLUS_VERSION 9.6.0 -ENV ENERGYPLUS_TAG 9.6-3.8 -ENV ENERGYPLUS_SHA e78d88a246 -ENV ENERGYPLUS_DIR /usr/local/EnergyPlus-9-6-0 +ENV ENERGYPLUS_VERSION 23.1.0 +ENV ENERGYPLUS_TAG v23.1.0 +ENV ENERGYPLUS_SHA 87ed9199d4 +ENV ENERGYPLUS_DIR /usr/local/EnergyPlus # mlep / external interface needs parts of EnergyPlus that are not included with OpenStudio # expandobjects, runenergyplus might be two examples, but the need to install EnergyPlus separately from OpenStudio # might be revaluated -ENV ENERGYPLUS_DOWNLOAD_BASE_URL https://github.com/TShapinsky/EnergyPlus/releases/download/$ENERGYPLUS_TAG +ENV ENERGYPLUS_DOWNLOAD_BASE_URL https://github.com/NREL/EnergyPlus/releases/download/$ENERGYPLUS_TAG ENV ENERGYPLUS_DOWNLOAD_FILENAME EnergyPlus-$ENERGYPLUS_VERSION-$ENERGYPLUS_SHA-Linux-Ubuntu20.04-x86_64.tar.gz ENV ENERGYPLUS_DOWNLOAD_URL $ENERGYPLUS_DOWNLOAD_BASE_URL/$ENERGYPLUS_DOWNLOAD_FILENAME From b28f257c4e2fc8f8f1d5b779e6576fc7e2d4f667 Mon Sep 17 00:00:00 2001 From: TShapinsky Date: Fri, 2 Jun 2023 11:44:26 -0600 Subject: [PATCH 2/2] add ruby and bump to os 3.6.1 --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index bb59b38..47a5db2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,6 +27,7 @@ RUN apt-get update \ python3-venv \ python3-pip \ libblas-dev \ + ruby-full \ && rm -rf /var/lib/apt/lists/* @@ -41,8 +42,8 @@ RUN update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/jav WORKDIR $BUILD_DIR -ENV OPENSTUDIO_DOWNLOAD_FILENAME OpenStudio-3.6.0+860f5de185-Ubuntu-20.04-x86_64.deb -ENV OPENSTUDIO_DOWNLOAD_URL https://github.com/NREL/OpenStudio/releases/download/v3.6.0/OpenStudio-3.6.0+860f5de185-Ubuntu-20.04-x86_64.deb +ENV OPENSTUDIO_DOWNLOAD_FILENAME OpenStudio-3.6.1+bb9481519e-Ubuntu-20.04-x86_64.deb +ENV OPENSTUDIO_DOWNLOAD_URL https://github.com/NREL/OpenStudio/releases/download/v3.6.1/OpenStudio-3.6.1+bb9481519e-Ubuntu-20.04-x86_64.deb ENV ENERGYPLUS_VERSION 23.1.0 ENV ENERGYPLUS_TAG v23.1.0