Skip to content

Rework image version and names #650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StuartWheater merged 8 commits into from
Feb 12, 2026
Merged

Rework image version and names #650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7fd8720
New perf profile
StuartWheater Jan 12, 2026
46b02ac
Switch to 'molgenis-rock-base'
StuartWheater Jan 14, 2026
245e5b3
Fix docker image typo
StuartWheater Jan 14, 2026
d4dca23
Update version of mongo
StuartWheater Jan 16, 2026
2847b6e
Switch to 'rio-lamba' profile
StuartWheater Feb 6, 2026
2ef1082
Switched profile based on Rock 2.2.0
StuartWheater Feb 9, 2026
d41f142
Rework image names
StuartWheater Feb 11, 2026
29e8697
Fixed image name typo
StuartWheater Feb 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions docker-compose_armadillo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ services:
hostname: armadillo
ports:
- 8080:8080
image: datashield/armadillo_citest:5.12.2
image: datashield/armadillo_citest:latest
environment:
LOGGING_CONFIG: 'classpath:logback-file.xml'
AUDIT_LOG_PATH: '/app/logs/audit.log'
SPRING_SECURITY_USER_PASSWORD: 'admin'
DEBUG: "FALSE"
volumes:
- ./tests/docker/armadillo/standard/logs:/logs
- ./tests/docker/armadillo/standard/data:/data
Expand All @@ -16,6 +17,6 @@ services:

default:
hostname: default
image: datashield/rock-quebrada-lamda-permissive:latest
image: datashield/rock_citest-permissive:latest
environment:
DEBUG: "FALSE"
4 changes: 2 additions & 2 deletions docker-compose_opal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ services:
- ROCK_HOSTS=rock:8085
- ROCK_ADMINISTRATOR_PASSWORD=foobar
mongo:
image: mongo:4.4.15
image: mongo:6.0.27
environment:
- MONGO_INITDB_ROOT_USERNAME=root
- MONGO_INITDB_ROOT_PASSWORD=foobar
rock:
image: datashield/rock-quebrada-lamda-permissive:latest
image: datashield/rock_citest-permissive:latest
environment:
DEBUG: "FALSE"
3 changes: 2 additions & 1 deletion tests/docker/armadillo/standard/config/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ armadillo:
# oidc-admin-user: user@yourdomain.org
profiles:
- name: default
image: datashield/rock-quebrada-lamda-permissive:latest
image: datashield/rock_citest-permissive:latest
port: 8085
host: default
package-whitelist: # Packages for 'permissive'
- dsBase
- dsTidyverse
- resourcer
function-blacklist: [ ]
options:
Expand Down
2 changes: 1 addition & 1 deletion tests/testthat/perf_files/armadillo_hp-laptop-quay_perf-profile.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"ds.asNumeric::perf:0","1.354","0.5","2"
"ds.assign::perf::0","2.745","0.5","2"
"ds.class::perf::combine:0","3.261","0.5","2"
"ds.colnames::perf:0","2.404","0.5","2"
"ds.colnames::perf:0","8.566","0.5","2"
"ds.exists::perf::combine:0","6.342","0.5","2"
"ds.length::perf::combine:0","7.835","0.5","2"
"ds.mean::perf::combine:0","8.127","0.5","2"
Expand Down