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

Repo variable and config updates #198

Merged
merged 2 commits into from
Oct 6, 2023
Merged

Conversation

kaitj
Copy link
Collaborator

@kaitj kaitj commented Oct 5, 2023

During meeting with @tkkuehn, we fixed a few bugs with the docker compose (had to go back to CMD instead of ENTRYPOINT). Also updated / removed variables from the .envtemplate and docker-compose.yml file where appropriate.

@kaitj kaitj added the maintenance Updates or improvements that do not change functionality of the code label Oct 5, 2023
@kaitj kaitj requested a review from tkkuehn October 5, 2023 18:37
@kaitj kaitj self-assigned this Oct 5, 2023
Copy link
Collaborator

@tkkuehn tkkuehn left a comment

Choose a reason for hiding this comment

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

A couple of small things, you can merge when ready

@@ -35,7 +34,7 @@ AUTOBIDS_ARCHIVE_SSH_PORT=2222
AUTOBIDS_ARCHIVE_SSH_KEY="~/.ssh/id_rsa.pub"
AUTOBIDS_ARCHIVE_TIMEOUT=100000

AUTOBIDS_DICOM_PI_BLACKLIST = []
AUTOBIDS_DICOM_PI_BLACKLIST = []
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should've noted this before, I would do AUTOBIDS_DICOM_PI_BLACKLIST="" (I don't think it will work properly otherwise)

Copy link
Collaborator Author

@kaitj kaitj Oct 5, 2023

Choose a reason for hiding this comment

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

Hmm, I will leave this as is for now but make a mental note until we get a chance to try it out.

@@ -82,4 +82,4 @@ ENV DCM4CHE_VERSION=5.24.1
ENV PATH=/apps/dcm4che/dcm4che-${DCM4CHE_VERSION}/bin:/apps/DicomRaw:/apps/cfmm2tar:/opt/apptainer/bin:$PATH
ENV _JAVA_OPTIONS="-Xmx2048m"

ENTRYPOINT ["/opt/autobidsportal/entrypoint.sh"]
CMD ["uwsgi", "--ini=autobidsportal.ini"]
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think you can still use the entrypoint script if you want as long as CMD is the directive

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I'll give this a shot before merging in - if it works I'll add it back in

@kaitj kaitj force-pushed the maint/config-update branch from 391473f to 98645be Compare October 5, 2023 20:02
Updated while meeting with Tristan, some additional notes:

Production
==========
can largely go from docker
need singularity installed
generate unit file so things run with systemd
crontab for relevant commands

DATALAD_SSH_IDENTITYFILE - needs access to graham
- generate new ssh key on machine and add to allowed_authorized users

sqlalchemy & redis set up on machine
cfmm2tar and tar2bids download -> set up large storage volume on cloud service, mount on machine, add to fstab

Need to be pointed at
=====================
git.sharcnet.ca
repository needs to be cloned on production machine

mailjet - free
@kaitj kaitj force-pushed the maint/config-update branch from 98645be to 908249d Compare October 5, 2023 20:10
@kaitj kaitj merged commit ea21eca into khanlab:main Oct 6, 2023
@kaitj kaitj deleted the maint/config-update branch October 6, 2023 11:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
maintenance Updates or improvements that do not change functionality of the code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants