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

Dockerise #16

Merged
merged 4 commits into from
Apr 12, 2024
Merged

Dockerise #16

merged 4 commits into from
Apr 12, 2024

Conversation

forus
Copy link
Contributor

@forus forus commented Mar 1, 2024

Changes:

  • Moved scripts from the jar artifact to the project's root directory, improving the development experience by making the environment more familiar and convenient for script developers.

  • Imported the requirements.txt file for installing Python dependencies from the cBioPortal project, ensuring consistency and ease of setup for Python-related tasks.

  • Developed a new Docker image that is fully equipped with all necessary dependencies, offering a ready-to-use environment for running the Java loader or executing scripts.

Follow up items in: cBioPortal/cbioportal#10734

@forus forus changed the title WIP: Dockerise Dockerise Mar 5, 2024
@inodb
Copy link
Member

inodb commented Mar 27, 2024

@forus is the intention here to eventually have a separate docker image just for importing?

Dockerfile Outdated Show resolved Hide resolved
Dockerfile Outdated Show resolved Hide resolved
Dockerfile Outdated Show resolved Hide resolved
.gitignore Outdated Show resolved Hide resolved
requirements.txt Outdated Show resolved Hide resolved
@forus
Copy link
Contributor Author

forus commented Mar 29, 2024

@forus is the intention here to eventually have a separate docker image just for importing?

@inodb yes, exactly. This PR creates a separate docker image just for importing. What's left is to update the docs and clean up the cbioportal docker file from pulling cbioportal-core jar.

@forus
Copy link
Contributor Author

forus commented Mar 29, 2024

@forus is the intention here to eventually have a separate docker image just for importing?

@inodb yes, exactly. This PR creates a separate docker image just for importing. What's left is to update the docs and clean up the cbioportal docker file from pulling cbioportal-core jar.

@inodb but those actions in the TODO should happen now, but later after some deprecation time. Does it make sense?

@inodb
Copy link
Member

inodb commented Apr 4, 2024

@ruslan-forostianov that makes sense. I created separate follow-up items for this: cBioPortal/cbioportal#10734. Updated the description of the PR

Move scripts out of java jar

Fix tests diff by removing absolut path

It seems like currently report has been generated inside from container.
But the test should work when run from any dev machine

Add Dockerfile

Include scripts into jar for backward compatibility

Remove redundant gitignore for the jar file

Use maven:3-eclipse-temurin-2 as jar build image instead

Skip tests while building jar file for Dockerfile

Install python on java docker image instead of otherwise

python is more straightforward to install than java
Copy link
Collaborator

@haynescd haynescd left a comment

Choose a reason for hiding this comment

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

Everything looks good except the python gh action

forus added 2 commits April 12, 2024 07:12
It seems like jinja2 started to remove newline character
since recent version?
@forus forus requested a review from haynescd April 12, 2024 11:33
@forus
Copy link
Contributor Author

forus commented Apr 12, 2024

Everything looks good except the python gh action

@haynescd thanks for catching it. I've pushed the fix. Please have another look.

Copy link
Collaborator

@haynescd haynescd left a comment

Choose a reason for hiding this comment

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

lgtm

@forus forus merged commit 55e781c into cBioPortal:main Apr 12, 2024
1 of 2 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.

3 participants