Skip to content

Commit

Permalink
Update nrel/openstudio docker image to 3.8.0 beta to test multiple ge…
Browse files Browse the repository at this point in the history
…ms (#190)

- Use the 20:04 image
- Update the stock ruby in image to 3.2.0 to compatitable with openstudio 3.8
- Update OS 3.8 to test gems.
  • Loading branch information
wenyikuang committed Apr 23, 2024
1 parent 189b7e3 commit dc319ee
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 16 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/docker-openstudio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ on: [push, pull_request]

env:
USE_TESTING_TIMEOUTS: "true"
OPENSTUDIO_VERSION: 3.7.0
OPENSTUDIO_SHA: d5269793f1
OPENSTUDIO_VERSION_EXT: ""
OPENSTUDIO_VERSION: 3.8.0
OPENSTUDIO_SHA: 2Bc6dd2826ef
OPENSTUDIO_VERSION_EXT: "-beta"


jobs:
Expand All @@ -27,7 +27,7 @@ jobs:
- name: test and build
shell: bash
run: |
docker build --target base -t openstudio:latest \
docker build -t openstudio:latest \
--build-arg OPENSTUDIO_VERSION=$OPENSTUDIO_VERSION \
--build-arg OPENSTUDIO_SHA=$OPENSTUDIO_SHA \
--build-arg OPENSTUDIO_VERSION_EXT=$OPENSTUDIO_VERSION_EXT \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual_installer_test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build, test and deploy Docker image
name: manual_update_develop

on:
workflow_dispatch:
Expand Down
23 changes: 12 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ FROM ubuntu:20.04 AS base
MAINTAINER Nicholas Long [email protected]

# Set the version of OpenStudio when building the container. For example `docker build --build-arg
ARG OPENSTUDIO_VERSION=3.7.0
ARG OPENSTUDIO_VERSION_EXT=""
ARG OPENSTUDIO_DOWNLOAD_URL=https://github.com/NREL/OpenStudio/releases/download/v3.7.0/OpenStudio-3.7.0+d5269793f1-Ubuntu-20.04-x86_64.deb
ENV OS_BUNDLER_VERSION=2.1.4
ENV RUBY_VERSION=2.7.2
ARG OPENSTUDIO_VERSION=3.8.0
ARG OPENSTUDIO_VERSION_EXT="-beta"
ARG OPENSTUDIO_DOWNLOAD_URL=https://openstudio-ci-builds.s3.amazonaws.com/develop/OpenStudio-3.8.0-beta%2B276859dd1e-Ubuntu-20.04-x86_64.deb
ENV OS_BUNDLER_VERSION=2.4.10
ENV RUBY_VERSION=3.2.2
ENV BUNDLE_WITHOUT=native_ext
# Install gdebi, then download and install OpenStudio, then clean up.
# gdebi handles the installation of OpenStudio's dependencies
Expand All @@ -33,21 +33,22 @@ RUN apt-get update && apt-get install -y \
&& grep -v -q "<Code>AccessDenied</Code>" ${OPENSTUDIO_DOWNLOAD_FILENAME} \
&& gdebi -n $OPENSTUDIO_DOWNLOAD_FILENAME
# Cleanup
RUN rm -f $OPENSTUDIO_DOWNLOAD_FILENAME \
RUN apt update && apt install -y libyaml-dev ruby-full

RUN rm -f $OPENSTUDIO_DOWNLOAD_FILENAME \
&& rm -rf /var/lib/apt/lists/* \
&& locale-gen en_US en_US.UTF-8 \
&& dpkg-reconfigure locales

# RUN apt-get install ca-certificates
# RUN curl -k -SLO https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.2.tar.gz \

RUN curl -SLO -k https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.2.tar.gz \
&& tar -xvzf ruby-2.7.2.tar.gz \
&& cd ruby-2.7.2 \
RUN pwd
RUN curl -SLO -k https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.2.tar.gz \
&& tar -xvzf ruby-3.2.2.tar.gz \
&& cd ruby-3.2.2 \
&& ./configure \
&& make && make install


## Add RUBYLIB link for openstudio.rb
ENV RUBYLIB=/usr/local/openstudio-${OPENSTUDIO_VERSION}${OPENSTUDIO_VERSION_EXT}/Ruby
ENV ENERGYPLUS_EXE_PATH=/usr/local/openstudio-${OPENSTUDIO_VERSION}${OPENSTUDIO_VERSION_EXT}/EnergyPlus/energyplus
Expand Down

0 comments on commit dc319ee

Please sign in to comment.