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

Merge release/miura (7.7.0) branch into master #629

Merged
merged 29 commits into from
Aug 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
d886fae
J2735 2020 upgrade (#568)
jwillmartin Feb 20, 2024
9c2ffb0
added include dir to dependency copys to get h files (#580)
ajloughr-leidos Mar 13, 2024
62875bb
Fix ci badges (#584)
paulbourelly999 Mar 20, 2024
fb65791
VH-1279: Fix sonar reported bugs in MessageRouterBasic.cpp (#588)
paulbourelly999 Mar 25, 2024
24d6989
New workflow for PRs (#587)
paulbourelly999 Mar 26, 2024
9ac6eda
CXC-28: Update CARMA Cloud Plugin to have configurable IP/Port (#593)
paulbourelly999 Apr 4, 2024
625800e
V2xHub and carma cloud integration: TCM connection refused (#600)
dan-du-car Apr 9, 2024
9fef692
CARMACloudPlugin: Fix the issue to unzip the compressed TCMs (#602)
dan-du-car Apr 11, 2024
798326e
TelematicPlugin: Memory leak (#599)
dan-du-car Apr 16, 2024
ff9dd7c
Fix tcm intermittent reception (#604)
dan-du-car Apr 17, 2024
c1759dd
Implement functionality to connect RSU Health Monitor to multiple RSU…
dan-du-car Apr 18, 2024
16d93f1
Uncouple docker-compose from version
paulbourelly999 Apr 29, 2024
b2025ad
Merge branch 'develop' into sync-develop-to-master
paulbourelly999 Apr 29, 2024
51f2e6e
Add git install back to sonar-scanner workflow for checkout action
paulbourelly999 Apr 30, 2024
bc7d1ff
Undo sonar-scanner workflow changes
paulbourelly999 Apr 30, 2024
23be0ae
Added documentation for deployment
paulbourelly999 Apr 30, 2024
2cc9a4a
Sync develop to master (#610)
paulbourelly999 Apr 30, 2024
9a21060
CARMACloudPlugin: TCR oldest issue in simulation environment (#611)
dan-du-car Apr 30, 2024
326bac2
modified: configuration/arm64/docker-compose.yml (#585)
jwillmartin May 1, 2024
610d77e
VH 1295 - Support multi architecture docker deployment (#612)
DokurOmkar May 29, 2024
be92009
Add configuration parameters for RSUHealthMonitorPlugin (#613)
dan-du-car May 31, 2024
ab664ac
Remove Obsolete docker compose file version (#614)
jwillmartin Jun 6, 2024
165cb55
VH 1303 - Updated the script to generate a .env file based on user in…
DokurOmkar Jun 7, 2024
cea762d
Optional SENSOR_CONFIG_JSON_FILE (#616)
paulbourelly999 Jun 12, 2024
8979d91
Add README documentation for port drayage (#617)
dan-du-car Jun 17, 2024
5a6b2b9
Update Release_notes.md
SaikrishnaBairamoni Aug 13, 2024
3cef97e
Update Release_notes.md
SaikrishnaBairamoni Aug 13, 2024
877a50a
Update Release_notes.md
SaikrishnaBairamoni Aug 15, 2024
4fae835
Update Release_notes.md with 7.7.0 version (#630)
maefromm Aug 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
109 changes: 0 additions & 109 deletions .circleci/config.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
// Docker Compose syntax from https://github.com/devcontainers/templates/blob/main/src/docker-existing-docker-compose/.devcontainer/devcontainer.json
// and https://github.com/microsoft/vscode-dev-containers/blob/main/container-templates/docker-compose/.devcontainer/devcontainer.json
"name": "V2XHUB Docker Compose Dev",
"name": "V2X Hub Docker Compose Dev",

// Update the 'dockerComposeFile' list if you have more compose files or use different names.
"dockerComposeFile": "docker-compose-vscode.yml",
Expand Down
6 changes: 2 additions & 4 deletions .devcontainer/docker-compose-vscode.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.3'

services:
v2xhub:
build:
Expand Down Expand Up @@ -31,7 +29,7 @@ services:
- mysql_password

db:
image: mysql:5.7
image: mysql:8.0
container_name: mysql
restart: always
environment:
Expand All @@ -44,7 +42,7 @@ services:
- mysql_password
- mysql_root_password
volumes:
- ../configuration/amd64/mysql/localhost.sql:/docker-entrypoint-initdb.d/localhost.sql
- ../configuration/mysql/localhost.sql:/docker-entrypoint-initdb.d/localhost.sql
# include creation of a user (user/user) to be able to log in
- ./mysql_add_dev_user.sql:/docker-entrypoint-initdb.d/mysql_add_dev_user.sql
- mysql-datavolume:/var/lib/mysql
Expand Down
106 changes: 0 additions & 106 deletions .github/workflows/build.yml

This file was deleted.

48 changes: 48 additions & 0 deletions .github/workflows/build_php_docker_image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Build PHP V2X-Hub Web UI
on:
push:
branches:
- develop
- master
- 'release/**'
# Build all tags not containing a / (https://stackoverflow.com/questions/61891328/trigger-github-action-only-on-new-tags )
tags:
- '*'
jobs:
v2xhub-docker:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5
with:
images: usdotfhwaops/php
tags: |
type=schedule
type=ref,event=branch
type=ref,event=tag
type=ref,event=pr
# set latest tag for default branch
type=raw,value=latest,enable={{is_default_branch}}
- name: Build and push
uses: docker/build-push-action@v5
with:
push: true
platforms: linux/amd64,linux/arm64
file: ./docker/Dockerfile-php
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
BUILD_ARCHITECTURE=${{ matrix.architecture }}
UBUNTU_CODENAME=${{ matrix.ubuntu-codename }}
48 changes: 48 additions & 0 deletions .github/workflows/build_port_drayage_docker_image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Build Port Drayage Web Service
on:
push:
branches:
- develop
- master
- 'release/**'
# Build all tags not containing a / (https://stackoverflow.com/questions/61891328/trigger-github-action-only-on-new-tags )
tags:
- '*'
jobs:
v2xhub-docker:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5
with:
images: usdotfhwaops/port-drayage-webservice
tags: |
type=schedule
type=ref,event=branch
type=ref,event=tag
type=ref,event=pr
# set latest tag for default branch
type=raw,value=latest,enable={{is_default_branch}}
- name: Build and push
uses: docker/build-push-action@v5
with:
push: true
platforms: linux/amd64,linux/arm64
context: ./tools/port-drayage-webservice/
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
BUILD_ARCHITECTURE=${{ matrix.architecture }}
UBUNTU_CODENAME=${{ matrix.ubuntu-codename }}
47 changes: 47 additions & 0 deletions .github/workflows/build_v2xhub_docker_image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Build V2X-Hub Docker Image
on:
push:
branches:
- develop
- master
- 'release/**'
# Build all tags not containing a / (https://stackoverflow.com/questions/61891328/trigger-github-action-only-on-new-tags )
tags:
- '*'
jobs:
v2xhub-docker:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5
with:
images: usdotfhwaops/v2xhub
tags: |
type=schedule
type=ref,event=branch
type=ref,event=tag
type=ref,event=pr
# set latest tag for default branch
type=raw,value=latest,enable={{is_default_branch}}
- name: Build and push
uses: docker/build-push-action@v5
with:
push: true
platforms: linux/amd64,linux/arm64
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
BUILD_ARCHITECTURE=${{ matrix.architecture }}
UBUNTU_CODENAME=${{ matrix.ubuntu-codename }}
Loading
Loading