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

Fix build and add custom parameterization #24

Merged
merged 21 commits into from
Nov 14, 2024

Conversation

Faizal-Eeman
Copy link
Contributor

@Faizal-Eeman Faizal-Eeman commented Oct 30, 2024

Description

  • fix the build failure in Docker build failing #22 using renv.lock file
  • add Boutros Lab custom scripts for battenberg.R and battenberg_wgs.R

Closes #23

Testing Results

Docker Image Testing

  • I have tested the Docker image with the docker run command as described below.

Test the Docker image with at least one sample. Verify the new Docker image works using:

docker run -u $(id -u):$(id -g) –w <working-directory> -v <directory-you-want-to-mount>:<how-you-want-to-mount-it-within-the-docker> --rm <docker-image-name> <command-to-the-docker-with-all-parameters>

My command:

sbatch /hot/software/image/docker-Battenberg/Docker/development/mmootor-add-custom-parameterization/test_run_battenberg.sh

Test Cases

  • Case 1
    • sample: NA24149 (normal), NA24143 (tumor)
    • output: /hot/software/image/docker-Battenberg/Docker/development/mmootor-add-custom-parameterization

Checklist

Formatting

File Updates

  • I have ensured that the version number update follows the versioning standards.

  • I have updated the version number in the Dockerfile, README.md and metadata.yaml files.

  • I have updated the dependencies and added my name to the maintainer list in the Dockerfile.

  • I have updated the feature changes in the README.md (optional).

  • I have added the changes included in this pull request to the CHANGELOG.md under the next release version or unreleased, and updated the date.

GitHub Packages Auto Build Rules

  • I have not manually pushed this Docker image to the uclahs-cds container registry (ghcr.io/uclahs-cds) on GitHub.

  • I have updated the image_name in the metadata.yaml which is required by GitHub action to automatically build and push the image.

@wiz-inc-8da00b022c
Copy link

wiz-inc-8da00b022c bot commented Oct 30, 2024

Wiz Scan Summary

Scan Module Critical High Medium Low Info Total
IaC Misconfigurations 0 0 17 2 0 19
Vulnerabilities 0 0 0 0 0 0
Sensitive Data 0 0 0 0 0 0
Secrets 0 0 0 0 0 0
Total 0 0 17 2 0 19

View scan details in Wiz

To detect these findings earlier in the dev lifecycle, try using Wiz Code VS Code Extension.

@Faizal-Eeman Faizal-Eeman changed the title Release 2.2.9-bl-parametrize-max-rho Fix build and add custom parameterization Oct 30, 2024
@Faizal-Eeman
Copy link
Contributor Author

I also realized, we'd have to make a sub-branch off of this branch in order to release docker-Battenberg v2.2.9-bl-parametrize-max-rho. That way the main branch is not affected and I can continue to make changes to the main branch later down the dev cycle.

@yashpatel6 yashpatel6 changed the base branch from main to bl-custom October 31, 2024 18:34
@Faizal-Eeman Faizal-Eeman force-pushed the mmootor-add-custom-parameterization branch from e91b528 to 9501b92 Compare November 1, 2024 22:57
Copy link

@yashpatel6 yashpatel6 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 comments but otherwise looks good. Anything else from @tyamaguchi-ucla ?

Dockerfile Outdated Show resolved Hide resolved
Dockerfile Outdated Show resolved Hide resolved
CHANGELOG.md Show resolved Hide resolved
CHANGELOG.md Show resolved Hide resolved
Dockerfile Outdated Show resolved Hide resolved
README.md Show resolved Hide resolved
Copy link

@yashpatel6 yashpatel6 left a comment

Choose a reason for hiding this comment

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

Generally ok with building from this, anything else to add from @tyamaguchi-ucla ?

Copy link

@tyamaguchi-ucla tyamaguchi-ucla 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! We can update the copyright year range and merge the branch into main.

README.md Outdated
@@ -65,7 +72,7 @@ Author: 'Mohammed Faizal Eeman Mootor', 'Ardalan Davarifar'

docker-Battenberg is licensed under the GNU General Public License version 2. See the file LICENSE for the terms of the GNU GPL license.

docker-Battenberg can be used to create a docker instance to use the Battenberg tool.
docker-Battenberg can be used to create a docker instance to use the Battenberg tool.

Copyright (C) 2021-2023 University of California Los Angeles ("Boutros Lab") All rights reserved.

Choose a reason for hiding this comment

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

Suggested change
Copyright (C) 2021-2023 University of California Los Angeles ("Boutros Lab") All rights reserved.
Copyright (C) 2021-2024 University of California Los Angeles ("Boutros Lab") All rights reserved.

I can't believe it's almost 2025..!

@Faizal-Eeman Faizal-Eeman merged commit 0041d85 into bl-custom Nov 14, 2024
5 checks passed
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.

Release v2.2.9-bl-parametrize-max-rho
3 participants