CARDS-2317: Split CARDS into multiple projects #1694
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In docker_entry.sh, add the project codename specified by the /external_project/project_code.txt file to the VALID_CARDS_PROJECTS list if such file exists
Add the generic CARDS logo as /metadata/logo.png in the built Docker images
When CARDS is starting, it should also look for required JARs in the /root/.cards-generic-m2/repository directory. This directory, by default, is empty but can be volume-mounted with the JARs from the generic CARDS platform (--cards_generic_jars_repo flag for generate_compose_yaml.py)
distribution/docker_entry.sh: Rename PROJECT_ARTIFACTID variable to CARDS_ARTIFACTID
distribution/docker_entry.sh: Rename PROJECT_VERSION variable to CARDS_VERSION
distribution/docker_entry.sh: The version of the CARDS-based project (eg. HERACLES, SPARC, etc...), as opposed to the version of the CARDS core platform, to be launched is now determined by the CARDS_PROJECT_VERSION environment variable and not the CARDS_VERSION environment variable
distribution/docker_entry.sh: Display the values of the CARDS_PROJECT and CARDS_PROJECT_VERSION environment variables upon startup
Rename CARDS_PROJECT_VERSION to PROJECT_VERSION
sdumitriu
force-pushed
the
CARDS-2317-base
branch
from
7ac4715
to
133e395
Compare
Allow interpreting $PROJECT_VERSION variables in the ADDITIONAL_SLING_FEATURES env variable
Allow interpreting variables in the passed arguments, and allow definining a separate PROJECT_VERSION variable as the version for external projects
sdumitriu
force-pushed
the
CARDS-2317-base
branch
from
133e395
to
b21ea84
Compare
Add support for separate versions for the base CARDS platform and the specific project on top of it Remove support for the deprecated run modes handling Remove custom support for specific projects
sdumitriu
force-pushed
the
CARDS-2317-base
branch
from
b21ea84
to
8be2419
Compare
IntegralProgrammer
approved these changes
Feb 14, 2024
There was a problem hiding this comment.
Tested as follows, all worked as expected:
./start_cards.sh- Generic mode
- Cards4LFS
- Cards4Prems
- Cards4Proms
- Cards4Heracles
generate_compose_yaml.py- Generic mode
- Cards4LFS mode
- Cards4Prems mode
- Tested and can confirm that SMTPS emails and Clarity SQL imports work
- Cards4Proms mode
- Tested and can confirm that SMTPS emails and Clarity SQL imports work
- Cards4Heracles mode
- Tested and can confirm that pushing data to a test S3 bucket works
It is important to note that, given that the CARDS_PROJECT environment variable has been renamed to PROJECT_NAME, we will need to make this change manually to all our deployments next time that a container image is deployed which contain these changes.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Splitting #1652 in two. This is just the all the improvements to the startup scripts, without any project removal.
To test: running with
start_cards.shand compose-cluster still works as before.