Skip to content
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.

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

Renovate: dependency xnatdev/container-service to v3.5.0 #135

Open
wants to merge 23 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
2830db1
Renovate: dependency xnatdev/container-service to v3.5.0
renovate[bot] Sep 26, 2024
7c15d1a
Fix linting
paddyroddy Sep 26, 2024
2aa8c79
Merge branch 'main' into renovate/xnat
drmatthews Oct 1, 2024
750e305
Allow latest Docker to be installed
HChughtai Oct 1, 2024
2cdb150
Update to container-service 3.6.0
HChughtai Oct 7, 2024
358d429
Merge branch 'main' into renovate/xnat
paddyroddy Nov 1, 2024
dcb4646
Attempt to fix conflict with the python3 package on Rocky Linux 9
ruaridhg Nov 4, 2024
01bcf89
Clean DNF cache before upgrade all packages
ruaridhg Nov 4, 2024
04c5dbd
Clean DNF cache before upgrade all packages
ruaridhg Nov 4, 2024
ae65c72
Clean DNF cache before upgrade all packages
ruaridhg Nov 4, 2024
8ee98ce
Clean DNF cache before upgrade all packages
ruaridhg Nov 4, 2024
f2178da
Clean DNF cache before upgrade all packages
ruaridhg Nov 4, 2024
aa921ac
Remove clean dnf and reinstall python
ruaridhg Nov 4, 2024
3722aa3
Add appstream repo
ruaridhg Nov 5, 2024
ed3e14f
Add appstream repo
ruaridhg Nov 5, 2024
00bbd74
Add appstream repo
ruaridhg Nov 5, 2024
28107a6
Add appstream repo
ruaridhg Nov 5, 2024
b46d2c8
Remove disable conflicting repos step
ruaridhg Nov 5, 2024
3cc8fad
Rollback attempted fixes
ruaridhg Nov 5, 2024
d90513a
Change container_service_url
ruaridhg Nov 5, 2024
fab8428
Merge branch 'main' into renovate/xnat
ruaridhg Nov 5, 2024
27bbd77
Change back xnat_container_service_url
p-j-smith Nov 14, 2024
00508dc
Default to xnat version 1.9.0
p-j-smith Nov 14, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ docker_client_hostnames:
- "{{ hostvars['xnat_web']['hostname'] }}"
docker_tls_verify: false

# docker<25 is required for XNAT
# docker<25 is required for XNAT for Container Service plugin < 3.5.0
# see: https://groups.google.com/g/xnat_discussion/c/yyPBkN4kayE/m/LUe5GQH5AAAJ
docker_version: 24.0.9
docker_version: latest

# mirsg.infrastructure.firewalld
firewalld_internal_zone_sources:
Expand Down
4 changes: 0 additions & 4 deletions roles/provision/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
ansible.builtin.yum:
name: "*"
state: latest
exclude:
# https://groups.google.com/g/xnat_discussion/c/yyPBkN4kayE/m/LUe5GQH5AAAJ
- docker-ce
- docker-ce-cli

tags:
- molecule-idempotence-notest
Expand Down
4 changes: 2 additions & 2 deletions roles/xnat/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
xnat_version: 1.8.10.1
xnat_version: 1.9.0
xnat_pipeline_version: 1.8.10
xnat_archive_dir: "{{ xnat_root_dir }}/archive"
xnat_prearchive_dir: "{{ xnat_root_dir }}/prearchive"
Expand Down Expand Up @@ -41,7 +41,7 @@ xnat_ldap_keystore_alias: ""
xnat_plugin_urls:
- https://api.bitbucket.org/2.0/repositories/xnatdev/xsync/downloads/xsync-plugin-all-1.7.0.jar
- https://api.bitbucket.org/2.0/repositories/xnatx/ldap-auth-plugin/downloads/ldap-auth-plugin-1.1.0.jar
- https://api.bitbucket.org/2.0/repositories/xnatdev/container-service/downloads/container-service-3.4.3-fat.jar
- https://api.bitbucket.org/2.0/repositories/xnatdev/container-service/downloads/container-service-3.6.0-fat.jar
- https://api.bitbucket.org/2.0/repositories/xnatx/xnatx-batch-launch-plugin/downloads/batch-launch-0.6.0.jar
- https://github.com/VUIIS/dax/raw/main/misc/xnat-plugins/dax-plugin-genProcData-1.4.2.jar
- https://api.bitbucket.org/2.0/repositories/icrimaginginformatics/ohif-viewer-xnat-plugin/downloads/ohif-viewer-3.6.2.jar
Expand Down
Loading