Skip to content

Commit c4088cf

Browse files
committed
ubuntu 22.04 -> 24.04 bc of mongo change
mongo 6.0.7 => 8.0.12
1 parent 93304c8 commit c4088cf

19 files changed

+36
-36
lines changed

.github/workflows/openstudio-server-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ env:
1919

2020
jobs:
2121
linux-test:
22-
runs-on: ubuntu-22.04
22+
runs-on: ubuntu-24.04
2323
steps:
2424
- name: Delete huge unnecessary tools folder
2525
run: rm -rf /opt/hostedtoolcache
@@ -91,7 +91,7 @@ jobs:
9191
name: openstudio-server-gems-darwin
9292
path: build/NREL/export/*.tar.gz
9393
docker:
94-
runs-on: ubuntu-22.04
94+
runs-on: ubuntu-24.04
9595
steps:
9696
- name: Delete huge unnecessary tools folder
9797
run: rm -rf /opt/hostedtoolcache

.github/workflows/security-scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ env:
1919

2020
jobs:
2121
docker-scan:
22-
runs-on: ubuntu-22.04
22+
runs-on: ubuntu-24.04
2323
steps:
2424
- name: Check out repository
2525
uses: actions/checkout@v2

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ ENV DEBIAN_FRONTEND=noninteractive
1212
# Install required libaries.
1313
# realpath - needed for wait-for-it
1414
RUN apt-get update && apt-get install -y wget gnupg lsb-release \
15-
&& wget -qO - https://www.mongodb.org/static/pgp/server-6.0.asc | gpg --dearmor | tee /usr/share/keyrings/mongodb-org-6.0-archive-keyring.gpg \
16-
&& echo "deb [arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-org-6.0-archive-keyring.gpg] https://repo.mongodb.org/apt/ubuntu $(lsb_release -cs)/mongodb-org/6.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-6.0.list \
15+
&& wget -qO - https://www.mongodb.org/static/pgp/server-8.0.asc | gpg --dearmor | tee /usr/share/keyrings/mongodb-org-8.0-archive-keyring.gpg \
16+
&& echo "deb [arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-org-8.0-archive-keyring.gpg] https://repo.mongodb.org/apt/ubuntu $(lsb_release -cs)/mongodb-org/8.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-8.0.list \
1717
&& apt-get update \
1818
&& apt-get install -y --no-install-recommends \
1919
mongodb-org \

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ fundamentals.
3131

3232
The [openstudio_meta](./bin/openstudio_meta) file is a ruby script which provides access to packaging and execution
3333
commands which allow for this codebase to be embedded in applications deployed to computers without docker. Deployment
34-
requires that [MongoDB 6.0.7](https://www.mongodb.com/download-center/community/releases/archive) and [Ruby v2.7](https://www.ruby-lang.org/en/downloads/)
34+
requires that [MongoDB 8.0.12](https://www.mongodb.com/download-center/community/releases/archive) and [Ruby v3.2](https://www.ruby-lang.org/en/downloads/)
3535
are additionally packaged.
3636

3737
The openstudio_meta deployment relies on the `install_gems` command, which uses local system libraries to build all

ci/github-actions/install_openstudio.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ OPENSTUDIO_VERSION_EXT="${3:-}"
88

99
if [ ! -z ${OPENSTUDIO_VERSION} ] && [ ! -z ${OPENSTUDIO_SHA} ]; then
1010
# OPENSTUDIO_VERSION_EXT may be empty
11-
OPENSTUDIO_DOWNLOAD_FILENAME=OpenStudio-${OPENSTUDIO_VERSION}${OPENSTUDIO_VERSION_EXT}+${OPENSTUDIO_SHA}-Ubuntu-22.04-x86_64.deb
11+
OPENSTUDIO_DOWNLOAD_FILENAME=OpenStudio-${OPENSTUDIO_VERSION}${OPENSTUDIO_VERSION_EXT}+${OPENSTUDIO_SHA}-Ubuntu-24.04-x86_64.deb
1212
echo "Installing OpenStudio ${OPENSTUDIO_DOWNLOAD_FILENAME}"
1313
#OPENSTUDIO_DOWNLOAD_BASE_URL=https://openstudio-ci-builds.s3-us-west-2.amazonaws.com/develop
1414
#OPENSTUDIO_DOWNLOAD_BASE_URL=https://github.com/NREL/OpenStudio/releases/download/v3.8.0

ci/github-actions/setup.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ else
3333
rm ruby-3.2.2-darwin.tar.gz
3434

3535
# Install mongodb from a download. Brew is hanging and requires building mongo. This also speeds up the builds.
36-
curl -SLO https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-6.0.7.tgz
37-
tar xvzf mongodb-macos-x86_64-6.0.7.tgz
36+
curl -SLO https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-8.0.12.tgz
37+
tar xvzf mongodb-macos-x86_64-8.0.12.tgz
3838
exit_status_tar=$?
3939
if [ $exit_status_tar -ne 0 ]; then
40-
echo "Error: Failed to extract Mongo 6.0.7 archive"
40+
echo "Error: Failed to extract Mongo 8.0.12 archive"
4141
exit $exit_status_tar
4242
fi
43-
sudo cp mongodb-macos-x86_64-6.0.7/bin/* /usr/local/bin/
43+
sudo cp mongodb-macos-x86_64-8.0.12/bin/* /usr/local/bin/
4444
rm -r mongodb-macos*
4545

4646
# Install openstudio -- Use the install script that is in this repo now, the one on OpenStudio/develop has changed

docker-compose.deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
version: '3.4'
33
services:
44
db:
5-
image: mongo:6.0.7
5+
image: mongo:8.0.12
66
ports:
77
- "27017:27017"
88
deploy:

docker-compose.local.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
version: '3.4'
44
services:
55
db:
6-
image: mongo:6.0.7
6+
image: mongo:8.0.12
77
ports:
88
- "27017:27017"
99
volumes:

docker-compose.test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
version: '3.4'
44
services:
55
db:
6-
image: mongo:6.0.7
6+
image: mongo:8.0.12
77
ports:
88
- "27017:27017"
99
environment:

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
version: '3.4'
44
services:
55
db:
6-
image: mongo:6.0.7
6+
image: mongo:8.0.12
77
ports:
88
- "27017:27017"
99
volumes:

0 commit comments

Comments
 (0)