usdot-fhwa-OPS · paulbourelly999 · Apr 8, 2024 · Apr 9, 2024 · Apr 9, 2024 · Apr 9, 2024
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -66,19 +66,13 @@ jobs:
         name: Docker Pull Release
         # Pull all built images associated with github tag
         command: |
-          docker pull usdotfhwaops/php:master
-          docker pull usdotfhwaops/port-drayage-webservice:master
-          docker pull usdotfhwaops/v2xhubamd:master
           docker pull usdotfhwaops/php_arm:master
           docker pull usdotfhwaops/port-drayage-webservice_arm:master
           docker pull usdotfhwaops/v2xhubarm:master
      - run:
         name: Docker Tag Release
         # Tag all pulled images with github tag name
         command: | 
-          docker tag usdotfhwaops/php:master usdotfhwaops/php:${CIRCLE_TAG}
-          docker tag usdotfhwaops/port-drayage-webservice:master usdotfhwaops/port-drayage-webservice:${CIRCLE_TAG}
-          docker tag usdotfhwaops/v2xhubamd:master usdotfhwaops/v2xhubamd:${CIRCLE_TAG}
           docker tag usdotfhwaops/php_arm:master usdotfhwaops/php_arm:${CIRCLE_TAG}
           docker tag usdotfhwaops/port-drayage-webservice_arm:master usdotfhwaops/port-drayage-webservice_arm:${CIRCLE_TAG}
           docker tag usdotfhwaops/v2xhubarm:master usdotfhwaops/v2xhubarm:${CIRCLE_TAG}
@@ -87,9 +81,6 @@ jobs:
         # Push all tagged images
         command: |
           echo "$DOCKERHUB_PASSWORD" | docker login --username $DOCKERHUB_USERNAME --password-stdin
-          docker push usdotfhwaops/php:${CIRCLE_TAG}
-          docker push usdotfhwaops/port-drayage-webservice:${CIRCLE_TAG}
-          docker push usdotfhwaops/v2xhubamd:${CIRCLE_TAG}
           docker push usdotfhwaops/php_arm:${CIRCLE_TAG}
           docker push usdotfhwaops/port-drayage-webservice_arm:${CIRCLE_TAG}
           docker push usdotfhwaops/v2xhubarm:${CIRCLE_TAG}

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,7 +2,15 @@ name: Build Workflows
 
 on:
   pull_request:
+    types: [opened, synchronize, reopened]
   push:
+    branches:
+      - develop
+      - master
+      - "release/*"
+      - feature-update-release-version
+    tags:
+      - "*"
 
 # TODO push to dockerhub with correct tags
 jobs:

diff --git a/.github/workflows/sonar-scanner.yml b/.github/workflows/sonar-scanner.yml
@@ -1,7 +1,11 @@
 on:
+  pull_request:
+    types: [opened, synchronize, reopened]
   push:
-    # run on branches and not PRs due to secrets used
     branches:
+      - develop
+      - master
+      - "release/*"
 name: Sonar Workflow
 jobs:
   sonarcloud:

diff --git a/configuration/amd64/docker-compose.yml b/configuration/amd64/docker-compose.yml
@@ -20,7 +20,7 @@ services:
       - mysql-datavolume:/var/lib/mysql
 
   php:
-    image: usdotfhwaops/php:lavida
+    image: usdotfhwaops/php:7.6.0
     container_name: php
     network_mode: host
     depends_on: 
@@ -30,7 +30,7 @@ services:
     tty: true
 
   v2xhub:
-    image: usdotfhwaops/v2xhubamd:lavida
+    image: usdotfhwaops/v2xhubamd:7.6.0
     container_name: v2xhub
     network_mode: host
     restart: always
@@ -46,7 +46,7 @@ services:
       - ./logs:/var/log/tmx
       - ./MAP:/var/www/plugins/MAP
   port_drayage_webservice:
-    image: usdotfhwaops/port-drayage-webservice:lavida
+    image: usdotfhwaops/port-drayage-webservice:7.6.0
     container_name: port_drayage_webservice
     network_mode: host
 secrets:

diff --git a/configuration/arm64/docker-compose.yml b/configuration/arm64/docker-compose.yml
@@ -20,7 +20,7 @@ services:
       - mysql-datavolume:/var/lib/mysql
 
   php:
-    image: usdotfhwaops/php_arm:lavida
+    image: usdotfhwaops/php_arm:7.6.0
     container_name: php
     network_mode: host
     depends_on: 
@@ -30,7 +30,7 @@ services:
     tty: true
 
   v2xhub:
-    image: usdotfhwaops/v2xhubarm:lavida
+    image: usdotfhwaops/v2xhubarm:7.6.0
     container_name: v2xhub
     network_mode: host
     restart: always
@@ -44,7 +44,7 @@ services:
       - ./logs:/var/log/tmx
       - ./MAP:/var/www/plugins/MAP
   port_drayage_webservice:
-    image: usdotfhwaops/port-drayage-webservice_arm:lavida
+    image: usdotfhwaops/port-drayage-webservice_arm:7.6.0
     container_name: port_drayage_webservice
     network_mode: host
 secrets:

diff --git a/src/v2i-hub/CARMACloudPlugin/CMakeLists.txt b/src/v2i-hub/CARMACloudPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT ( CARMACloudPlugin VERSION 7.5.1 LANGUAGES CXX )
+PROJECT ( CARMACloudPlugin VERSION 7.6.0 LANGUAGES CXX )
 
 SET (TMX_PLUGIN_NAME "CARMACloud")
 add_compile_options(-fPIC)

diff --git a/src/v2i-hub/CARMAStreetsPlugin/CMakeLists.txt b/src/v2i-hub/CARMAStreetsPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT ( CARMAStreetsPlugin VERSION 7.5.1 LANGUAGES CXX )
+PROJECT ( CARMAStreetsPlugin VERSION 7.6.0 LANGUAGES CXX )
 
 BuildTmxPlugin ( )
 

diff --git a/src/v2i-hub/CDASimAdapter/CMakeLists.txt b/src/v2i-hub/CDASimAdapter/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT ( CDASimAdapter VERSION 7.5.1 LANGUAGES CXX )
+PROJECT ( CDASimAdapter VERSION 7.6.0 LANGUAGES CXX )
 set(CMAKE_CXX_STANDARD 17)
 
 FIND_PACKAGE( carma-clock )

diff --git a/src/v2i-hub/CommandPlugin/CMakeLists.txt b/src/v2i-hub/CommandPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT ( CommandPlugin VERSION 7.5.1 LANGUAGES CXX )
+PROJECT ( CommandPlugin VERSION 7.6.0 LANGUAGES CXX )
 
 FIND_PACKAGE (OpenSSL REQUIRED)
 

diff --git a/src/v2i-hub/CswPlugin/CMakeLists.txt b/src/v2i-hub/CswPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT ( CswPlugin VERSION 7.5.1 LANGUAGES CXX )
+PROJECT ( CswPlugin VERSION 7.6.0 LANGUAGES CXX )
 
 SET (TMX_PLUGIN_NAME "CSW")
 

diff --git a/src/v2i-hub/DmsPlugin/CMakeLists.txt b/src/v2i-hub/DmsPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT ( DmsPlugin VERSION 7.5.1 LANGUAGES CXX )
+PROJECT ( DmsPlugin VERSION 7.6.0 LANGUAGES CXX )
 
 SET (TMX_PLUGIN_NAME "Dynamic Message Sign")
 

diff --git a/src/v2i-hub/ERVCloudForwardingPlugin/CMakeLists.txt b/src/v2i-hub/ERVCloudForwardingPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT(ERVCloudForwardingPlugin VERSION 7.5.1 LANGUAGES CXX)
+PROJECT(ERVCloudForwardingPlugin VERSION 7.6.0 LANGUAGES CXX)
 
 SET(TMX_PLUGIN_NAME "ERVCloudForwarding")
 add_compile_options(-fPIC)

diff --git a/src/v2i-hub/ImmediateForwardPlugin/CMakeLists.txt b/src/v2i-hub/ImmediateForwardPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT ( ImmediateForwardPlugin VERSION 7.5.1 LANGUAGES CXX )
+PROJECT ( ImmediateForwardPlugin VERSION 7.6.0 LANGUAGES CXX )
 
 SET (TMX_PLUGIN_NAME "Immediate Forward")
 

diff --git a/src/v2i-hub/LocationPlugin/CMakeLists.txt b/src/v2i-hub/LocationPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-project( LocationPlugin VERSION 7.5.1 LANGUAGES CXX )
+project( LocationPlugin VERSION 7.6.0 LANGUAGES CXX )
 
 SET (TMX_PLUGIN_NAME Location)
 

diff --git a/src/v2i-hub/MapPlugin/CMakeLists.txt b/src/v2i-hub/MapPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT ( MapPlugin VERSION 7.5.1 LANGUAGES CXX )
+PROJECT ( MapPlugin VERSION 7.6.0 LANGUAGES CXX )
 
 SET (TMX_PLUGIN_NAME "MAP")
 

diff --git a/src/v2i-hub/MessageLoggerPlugin/CMakeLists.txt b/src/v2i-hub/MessageLoggerPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT ( MessageLoggerPlugin VERSION 7.5.1 LANGUAGES CXX )
+PROJECT ( MessageLoggerPlugin VERSION 7.6.0 LANGUAGES CXX )
 
 SET (TMX_PLUGIN_NAME "MessageLoggerPlugin")
 

diff --git a/src/v2i-hub/MessageReceiverPlugin/CMakeLists.txt b/src/v2i-hub/MessageReceiverPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT ( MessageReceiverPlugin VERSION 7.5.1 LANGUAGES CXX )
+PROJECT ( MessageReceiverPlugin VERSION 7.6.0 LANGUAGES CXX )
 
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

diff --git a/src/v2i-hub/ODEForwardPlugin/CMakeLists.txt b/src/v2i-hub/ODEForwardPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT ( ODEForwardPlugin VERSION 7.5.1 LANGUAGES CXX )
+PROJECT ( ODEForwardPlugin VERSION 7.6.0 LANGUAGES CXX )
 
 SET (TMX_PLUGIN_NAME "ODEForwardPlugin")
 

diff --git a/src/v2i-hub/PedestrianPlugin/CMakeLists.txt b/src/v2i-hub/PedestrianPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT ( PedestrianPlugin VERSION 7.5.1 LANGUAGES CXX )
+PROJECT ( PedestrianPlugin VERSION 7.6.0 LANGUAGES CXX )
 
 SET (TMX_PLUGIN_NAME "Pedestrian")
 add_compile_options(-fPIC)

diff --git a/src/v2i-hub/PortDrayagePlugin/CMakeLists.txt b/src/v2i-hub/PortDrayagePlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT ( PortDrayagePlugin VERSION 7.5.1 LANGUAGES CXX )
+PROJECT ( PortDrayagePlugin VERSION 7.6.0 LANGUAGES CXX )
 
 SET (TMX_PLUGIN_NAME "PortDrayage")
 set(CMAKE_AUTOMOC ON)

diff --git a/src/v2i-hub/PreemptionPlugin/CMakeLists.txt b/src/v2i-hub/PreemptionPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT ( PreemptionPlugin VERSION 7.5.1 LANGUAGES CXX )
+PROJECT ( PreemptionPlugin VERSION 7.6.0 LANGUAGES CXX )
 
 SET (TMX_PLUGIN_NAME "Preemption")
 

diff --git a/src/v2i-hub/RSUHealthMonitorPlugin/CMakeLists.txt b/src/v2i-hub/RSUHealthMonitorPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT(RSUHealthMonitorPlugin VERSION 7.5.1 LANGUAGES CXX)
+PROJECT(RSUHealthMonitorPlugin VERSION 7.6.0 LANGUAGES CXX)
 
 set(TMX_PLUGIN_NAME "RSU Health Monitor")
 

diff --git a/src/v2i-hub/RtcmPlugin/CMakeLists.txt b/src/v2i-hub/RtcmPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT ( RtcmPlugin VERSION 7.5.1 LANGUAGES CXX )
+PROJECT ( RtcmPlugin VERSION 7.6.0 LANGUAGES CXX )
 
 SET (TMX_PLUGIN_NAME "RTCM")
 

diff --git a/src/v2i-hub/SpatPlugin/CMakeLists.txt b/src/v2i-hub/SpatPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT ( SpatPlugin VERSION 7.5.1 LANGUAGES CXX )
+PROJECT ( SpatPlugin VERSION 7.6.0 LANGUAGES CXX )
 
 SET (TMX_PLUGIN_NAME "SPAT")
 

diff --git a/src/v2i-hub/TelematicBridgePlugin/CMakeLists.txt b/src/v2i-hub/TelematicBridgePlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT (TelematicBridgePlugin VERSION 7.5.1 LANGUAGES CXX)
+PROJECT (TelematicBridgePlugin VERSION 7.6.0 LANGUAGES CXX)
 
 set (TMX_PLUGIN_NAME "Telematic Bridge")
 

diff --git a/src/v2i-hub/TimPlugin/CMakeLists.txt b/src/v2i-hub/TimPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT ( TimPlugin VERSION 7.5.1 LANGUAGES CXX )
+PROJECT ( TimPlugin VERSION 7.6.0 LANGUAGES CXX )
 
 SET (TMX_PLUGIN_NAME "TIM")
 add_compile_options(-fPIC)

diff --git a/web/admin/admin.html b/web/admin/admin.html
@@ -49,7 +49,7 @@
         </div>    
         <div class="headerbottom">
            <div class="timelabel" id="timeDisplay"></div>
-           <div class="versionlabel" id="versionDisplay">7.4.0</div>
+           <div class="versionlabel" id="versionDisplay">7.6.0</div>
         </div>
     </div>