Skip to content

Chore add dqr plugin#21

Merged
fordmcdonald merged 6 commits intomainfrom
chore-add-dqr-plugin
May 14, 2024
Merged

Chore add dqr plugin#21
fordmcdonald merged 6 commits intomainfrom
chore-add-dqr-plugin

Conversation

@fordmcdonald
Copy link
Copy Markdown
Member

No description provided.

hollandjg
hollandjg previously approved these changes May 7, 2024
Copy link
Copy Markdown

@hollandjg hollandjg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like the furthest along of all the changes, but it's missing the container service plugin from #16. Is that intended?

Copy link
Copy Markdown

@hollandjg hollandjg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couple of questions on the second file!

Comment thread docker-compose.yaml Outdated
build:
context: .
image: ghcr.io/brown-bnc/xnat:1.8.7.1
image: xnat
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't check this the first time around: what does this change do? Is it necessary for adding the DQR plugin?

Comment thread docker-compose.yaml Outdated
Comment on lines +20 to +21
volumes:
- "${PWD}/brownldap-provider.properties:/data/xnat/home/config/auth/brownldap-provider.properties"
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you say something about this line? Why is it necessary to change ldap --> brownldap here?

@hollandjg hollandjg self-requested a review May 7, 2024 20:30
@hollandjg hollandjg dismissed their stale review May 7, 2024 20:31

Missed a file when reviewing the first time around.

Copy link
Copy Markdown

@hollandjg hollandjg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

Comment thread docker-compose.yaml
build:
context: .
image: ghcr.io/brown-bnc/xnat:1.8.7.1
image: ghcr.io/brown-bnc/xnat:1.8.10.0-dqr
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a question – this looks like the image which is going to be built from this version of the repo. Is that right? What's the deploy process?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's correct—the tag with which I plan to name the image. This hasn't been part of my process in the past, but I figured it would be helpful to update the docker-compose file to reflect the latest image. However, this won't affect the deployment process. Only helpful for someone using docker-compose to build XNAT locally. Our Kubernetes deployment pulls the image straight from the Github Registry, which is built on PRs and via the publish workflow action.

@fordmcdonald fordmcdonald merged commit d1b23b4 into main May 14, 2024
@fordmcdonald fordmcdonald deleted the chore-add-dqr-plugin branch May 14, 2024 15:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants