Sync develop to master #610
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
Note: newest version nats 3.8.0 breaks docker build <!-- Thanks for the contribution, this is awesome. --> # PR Details ## Description Fix the Docker build by setting nats.c version to install. Also fix the readme. CHanges already merged to develop under #584 <!--- Describe your changes in detail --> ## Related Issue VH-1277 <!--- This project only accepts pull requests related to open issues --> <!--- If suggesting a new feature or change, please discuss it in an issue first --> <!--- If fixing a bug, there should be an issue describing it with steps to reproduce --> <!--- Please link to the issue here: --> ## Motivation and Context Fix CI processes and README <!--- Why is this change required? What problem does it solve? --> ## How Has This Been Tested? CI <!--- Please describe in detail how you tested your changes. --> <!--- Include details of your testing environment, and the tests you ran to --> <!--- see how your change affects other areas of the code, etc. --> ## Types of changes <!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [x] Defect fix (non-breaking change that fixes an issue) - [ ] New feature (non-breaking change that adds functionality) - [ ] Breaking change (fix or feature that cause existing functionality to change) ## Checklist: <!--- Go over all the following points, and put an `x` in all the boxes that apply. --> <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> - [ ] I have added any new packages to the sonar-scanner.properties file - [ ] My change requires a change to the documentation. - [ ] I have updated the documentation accordingly. - [x] I have read the **CONTRIBUTING** document. [V2XHUB Contributing Guide](https://github.com/usdot-fhwa-OPS/V2X-Hub/blob/develop/Contributing.md) - [ ] I have added tests to cover my changes. - [ ] All new and existing tests passed.
<!-- Thanks for the contribution, this is awesome. --> # PR Details ## Description Adds logs to support usdot-fhwa-stol/carma-analytics-fotda#43 <!--- Describe your changes in detail --> ## Related Issue CDAR-774 <!--- This project only accepts pull requests related to open issues --> <!--- If suggesting a new feature or change, please discuss it in an issue first --> <!--- If fixing a bug, there should be an issue describing it with steps to reproduce --> <!--- Please link to the issue here: --> ## Motivation and Context Data Analysis <!--- Why is this change required? What problem does it solve? --> ## How Has This Been Tested? <!--- Please describe in detail how you tested your changes. --> <!--- Include details of your testing environment, and the tests you ran to --> <!--- see how your change affects other areas of the code, etc. --> ## Types of changes <!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [ ] Defect fix (non-breaking change that fixes an issue) - [ ] New feature (non-breaking change that adds functionality) - [ ] Breaking change (fix or feature that cause existing functionality to change) ## Checklist: <!--- Go over all the following points, and put an `x` in all the boxes that apply. --> <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> - [ ] I have added any new packages to the sonar-scanner.properties file - [ ] My change requires a change to the documentation. - [ ] I have updated the documentation accordingly. - [ ] I have read the **CONTRIBUTING** document. [V2XHUB Contributing Guide](https://github.com/usdot-fhwa-OPS/V2X-Hub/blob/develop/Contributing.md) - [ ] I have added tests to cover my changes. - [ ] All new and existing tests passed.
<!-- Thanks for the contribution, this is awesome. --> # PR Details ## Description Update V2X-hub release version <!--- Describe your changes in detail --> ## Related Issue <!--- This project only accepts pull requests related to open issues --> <!--- If suggesting a new feature or change, please discuss it in an issue first --> <!--- If fixing a bug, there should be an issue describing it with steps to reproduce --> <!--- Please link to the issue here: --> ## Motivation and Context <!--- Why is this change required? What problem does it solve? --> ## How Has This Been Tested? <!--- Please describe in detail how you tested your changes. --> <!--- Include details of your testing environment, and the tests you ran to --> <!--- see how your change affects other areas of the code, etc. --> ## Types of changes <!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [ ] Defect fix (non-breaking change that fixes an issue) - [ ] New feature (non-breaking change that adds functionality) - [ ] Breaking change (fix or feature that cause existing functionality to change) ## Checklist: <!--- Go over all the following points, and put an `x` in all the boxes that apply. --> <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> - [ ] I have added any new packages to the sonar-scanner.properties file - [ ] My change requires a change to the documentation. - [ ] I have updated the documentation accordingly. - [ ] I have read the **CONTRIBUTING** document. [V2XHUB Contributing Guide](https://github.com/usdot-fhwa-OPS/V2X-Hub/blob/develop/Contributing.md) - [ ] I have added tests to cover my changes. - [ ] All new and existing tests passed. @MishkaMN
<!-- Thanks for the contribution, this is awesome. --> # PR Details ## Description <!--- Describe your changes in detail --> ## Related Issue <!--- This project only accepts pull requests related to open issues --> <!--- If suggesting a new feature or change, please discuss it in an issue first --> <!--- If fixing a bug, there should be an issue describing it with steps to reproduce --> <!--- Please link to the issue here: --> ## Motivation and Context <!--- Why is this change required? What problem does it solve? --> ## How Has This Been Tested? <!--- Please describe in detail how you tested your changes. --> <!--- Include details of your testing environment, and the tests you ran to --> <!--- see how your change affects other areas of the code, etc. --> ## Types of changes <!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [ ] Defect fix (non-breaking change that fixes an issue) - [ ] New feature (non-breaking change that adds functionality) - [ ] Breaking change (fix or feature that cause existing functionality to change) ## Checklist: <!--- Go over all the following points, and put an `x` in all the boxes that apply. --> <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> - [ ] I have added any new packages to the sonar-scanner.properties file - [ ] My change requires a change to the documentation. - [ ] I have updated the documentation accordingly. - [ ] I have read the **CONTRIBUTING** document. [V2XHUB Contributing Guide](https://github.com/usdot-fhwa-OPS/V2X-Hub/blob/develop/Contributing.md) - [ ] I have added tests to cover my changes. - [ ] All new and existing tests passed.
6 tasks
MishkaMN
requested changes
Apr 30, 2024
| @@ -20,7 +20,7 @@ services: | |||
| - mysql-datavolume:/var/lib/mysql | |||
|
|
|||
| php: | |||
| image: usdotfhwaops/php:7.6.0 | |||
| image: usdotfhwaops/php:${V2XHUB_VERSION:-develop} | |||
There was a problem hiding this comment.
This looks like a syntax error. Do you mean just ${V2XHUB_VERSION}?
ditto for all occurrences in the PR.
And does this variable need to be in a .env file?
There was a problem hiding this comment.
No this is not a syntax error. This is how you specify docker-compose environment variables with a default value https://docs.docker.com/compose/environment-variables/env-file/#interpolation. This way we do not have to provide an .env file but if one is used it will overwrite the default values.
dan-du-car
reviewed
Apr 30, 2024
| container_name: v2xhub | ||
| network_mode: host | ||
| restart: always | ||
| depends_on: | ||
| - db | ||
| environment: | ||
| - MYSQL_PASSWORD=/run/secrets/mysql_password | ||
| - INFRASTRUCTURE_ID=rsu_<J2735 MAP MESSAGE INTERSECTION ID> | ||
| - INFRASTRUCTURE_NAME=<RSU_NAME> | ||
| - SIMULATION_MODE=${SIMULATION_MODE:-false} |
There was a problem hiding this comment.
Are we reading this variable from .env file? If yes, can we upload a sample.env file?
There was a problem hiding this comment.
The default values alleviate a need for a sample env. With non provided it will use the default values. I could add documentation to instruct users on how to generate a .env file
There was a problem hiding this comment.
It would be beneficial if we could provide a sample.env, such as:
- Default values are great ideas. However, if users need adjust the env variables to fit their specific needs, they can reuse this sample tempate and move it to .env and update the values. It is simpler and more straightforward than reading trough docs.
- In the sample.env, we can also provide more descriptions about the definitions of these env variables, and how they are used in the system as needed.
- I would prefer to use a centralized location for references of env variables.
Since this is not our standard practice, I am ok leaving as it.
dan-du-car
reviewed
Apr 30, 2024
| @@ -20,7 +20,7 @@ services: | |||
| - mysql-datavolume:/var/lib/mysql | |||
|
|
|||
| php: | |||
| image: usdotfhwaops/php:develop | |||
| image: usdotfhwaops/php:${V2XHUB_VERSION:-develop} | |||
There was a problem hiding this comment.
How do we distinguish this v2xhub docker version from the v2xhub ( plugins ) software version?
dan-du-car
approved these changes
Apr 30, 2024
|
MishkaMN
approved these changes
Apr 30, 2024
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.
PR Details
Description
This is an intermediate branch cut from master which includes fixes to the branch coupling of build and checkout scripts. This coupling can not yet be removed from CI processes because this repository still uses CircleCI. The functionality to decouple CI from branches is currently only available through our GitHub actions
Related GitHub Issue
Related Jira Key
Motivation and Context
Decouple build/checkout from branch to make release process simpler
How Has This Been Tested?
CI
Types of changes
Checklist: