Merge release/neon (4.7.0) branch into master (#381)

usdot-fhwa-stol · Aug 28, 2024 · ccd1a9f · ccd1a9f
2 parents 6ccd891 + be75530
commit ccd1a9f
Show file tree

Hide file tree

Showing 43 changed files with 106 additions and 86 deletions.
diff --git a/ail_vru_uc1_scenario/.dockerignore b/ail_vru_uc1_scenario/.dockerignore
@@ -0,0 +1,4 @@
+HostVehicleParams.yaml
+build-image.sh
+Dockerfile
+cdasim_config
diff --git a/ail_vru_uc1_scenario/Dockerfile b/ail_vru_uc1_scenario/Dockerfile
@@ -35,5 +35,6 @@ LABEL org.label-schema.build-date=${BUILD_DATE}
 
 ADD . /root/vehicle/config
 VOLUME /opt/carma/vehicle/config
-
-CMD  cp /root/vehicle/config/* /opt/carma/vehicle/config
+RUN mkdir -p /opt/carma/vehicle/config
+RUN cp -a /root/vehicle/config/.env /opt/carma/vehicle/config/
+CMD cp /root/vehicle/config/* /opt/carma/vehicle/config
diff --git a/ail_vru_uc1_scenario/docker-compose.yml b/ail_vru_uc1_scenario/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "2"
+
 services:
   carma-simulation:
     privileged: true

diff --git a/carla_ground_truth_integration/Dockerfile b/carla_ground_truth_integration/Dockerfile
@@ -35,5 +35,7 @@ LABEL org.label-schema.build-date=${BUILD_DATE}
 
 ADD . /root/vehicle/config
 VOLUME /opt/carma/vehicle/config
+RUN mkdir -p /opt/carma/vehicle/config
+RUN cp -a /root/vehicle/config/.env /opt/carma/vehicle/config/
 
-CMD  cp /root/vehicle/config/* /opt/carma/vehicle/config
+CMD cp /root/vehicle/config/* /opt/carma/vehicle/config
diff --git a/carla_ground_truth_integration/docker-compose-background.yml b/carla_ground_truth_integration/docker-compose-background.yml
@@ -12,8 +12,8 @@
 #  License for the specific language governing permissions and limitations under
 #  the License.
 
-# Docker Compose Spec Version
-version: '2'
+
+
 
 services:
   web-ui:

diff --git a/carla_ground_truth_integration/docker-compose.yml b/carla_ground_truth_integration/docker-compose.yml
@@ -12,8 +12,8 @@
 #  License for the specific language governing permissions and limitations under
 #  the License.
 
-# Docker Compose Spec Version
-version: '2'
+
+
 
 services:
   roscore:

diff --git a/chrysler_pacifica_ehybrid_s_2019/Dockerfile b/chrysler_pacifica_ehybrid_s_2019/Dockerfile
@@ -35,5 +35,7 @@ LABEL org.label-schema.build-date=${BUILD_DATE}
 
 ADD . /root/vehicle/config
 VOLUME /opt/carma/vehicle/config
+RUN mkdir -p /opt/carma/vehicle/config
+RUN cp -a /root/vehicle/config/.env /opt/carma/vehicle/config/
 
-CMD  cp /root/vehicle/config/* /opt/carma/vehicle/config
+CMD cp /root/vehicle/config/* /opt/carma/vehicle/config
diff --git a/chrysler_pacifica_ehybrid_s_2019/docker-compose-background.yml b/chrysler_pacifica_ehybrid_s_2019/docker-compose-background.yml
@@ -12,8 +12,8 @@
 #  License for the specific language governing permissions and limitations under
 #  the License.
 
-# Docker Compose Spec Version
-version: '2'
+
+
 
 services:
   web-ui:

diff --git a/chrysler_pacifica_ehybrid_s_2019/docker-compose.yml b/chrysler_pacifica_ehybrid_s_2019/docker-compose.yml
@@ -12,8 +12,8 @@
 #  License for the specific language governing permissions and limitations under
 #  the License.
 
-# Docker Compose Spec Version
-version: '2'
+
+
 
 services:
   roscore:

diff --git a/development/Dockerfile b/development/Dockerfile
@@ -35,5 +35,7 @@ LABEL org.label-schema.build-date=${BUILD_DATE}
 
 ADD . /root/vehicle/config
 VOLUME /opt/carma/vehicle/config
+RUN mkdir -p /opt/carma/vehicle/config
+RUN cp -a /root/vehicle/config/.env /opt/carma/vehicle/config/
 
-CMD  cp -R /root/vehicle/config/* /opt/carma/vehicle/config
+CMD cp /root/vehicle/config/* /opt/carma/vehicle/config
diff --git a/ford_fusion_sehybrid_2019/Dockerfile b/ford_fusion_sehybrid_2019/Dockerfile
@@ -35,5 +35,7 @@ LABEL org.label-schema.build-date=${BUILD_DATE}
 
 ADD . /root/vehicle/config
 VOLUME /opt/carma/vehicle/config
+RUN mkdir -p /opt/carma/vehicle/config
+RUN cp -a /root/vehicle/config/.env /opt/carma/vehicle/config/
 
-CMD  cp /root/vehicle/config/* /opt/carma/vehicle/config
+CMD cp /root/vehicle/config/* /opt/carma/vehicle/config
diff --git a/ford_fusion_sehybrid_2019/docker-compose-background.yml b/ford_fusion_sehybrid_2019/docker-compose-background.yml
@@ -12,8 +12,8 @@
 #  License for the specific language governing permissions and limitations under
 #  the License.
 
-# Docker Compose Spec Version
-version: '2'
+
+
 
 services:
   web-ui:

diff --git a/ford_fusion_sehybrid_2019/docker-compose.yml b/ford_fusion_sehybrid_2019/docker-compose.yml
@@ -12,8 +12,8 @@
 #  License for the specific language governing permissions and limitations under
 #  the License.
 
-# Docker Compose Spec Version
-version: '2'
+
+
 
 services:
   roscore:

diff --git a/freightliner_cascadia_2012_dot_10002/Dockerfile b/freightliner_cascadia_2012_dot_10002/Dockerfile
@@ -35,5 +35,7 @@ LABEL org.label-schema.build-date=${BUILD_DATE}
 
 ADD . /root/vehicle/config
 VOLUME /opt/carma/vehicle/config
+RUN mkdir -p /opt/carma/vehicle/config
+RUN cp -a /root/vehicle/config/.env /opt/carma/vehicle/config/
 
-CMD  cp /root/vehicle/config/* /opt/carma/vehicle/config
+CMD cp /root/vehicle/config/* /opt/carma/vehicle/config
diff --git a/freightliner_cascadia_2012_dot_10002/docker-compose-background.yml b/freightliner_cascadia_2012_dot_10002/docker-compose-background.yml
@@ -12,8 +12,8 @@
 #  License for the specific language governing permissions and limitations under
 #  the License.
 
-# Docker Compose Spec Version
-version: '2'
+
+
 
 services:
   web-ui:

diff --git a/freightliner_cascadia_2012_dot_10002/docker-compose.yml b/freightliner_cascadia_2012_dot_10002/docker-compose.yml
@@ -12,8 +12,8 @@
 #  License for the specific language governing permissions and limitations under
 #  the License.
 
-# Docker Compose Spec Version
-version: '2'
+
+
 
 services:
   roscore:

diff --git a/freightliner_cascadia_2012_dot_10003/Dockerfile b/freightliner_cascadia_2012_dot_10003/Dockerfile
@@ -35,5 +35,7 @@ LABEL org.label-schema.build-date=${BUILD_DATE}
 
 ADD . /root/vehicle/config
 VOLUME /opt/carma/vehicle/config
+RUN mkdir -p /opt/carma/vehicle/config
+RUN cp -a /root/vehicle/config/.env /opt/carma/vehicle/config/
 
-CMD  cp /root/vehicle/config/* /opt/carma/vehicle/config
+CMD cp /root/vehicle/config/* /opt/carma/vehicle/config
diff --git a/freightliner_cascadia_2012_dot_10003/docker-compose-background.yml b/freightliner_cascadia_2012_dot_10003/docker-compose-background.yml
@@ -12,8 +12,8 @@
 #  License for the specific language governing permissions and limitations under
 #  the License.
 
-# Docker Compose Spec Version
-version: '2'
+
+
 
 services:
   web-ui:

diff --git a/freightliner_cascadia_2012_dot_10003/docker-compose.yml b/freightliner_cascadia_2012_dot_10003/docker-compose.yml
@@ -12,8 +12,8 @@
 #  License for the specific language governing permissions and limitations under
 #  the License.
 
-# Docker Compose Spec Version
-version: '2'
+
+
 
 services:
   roscore:

diff --git a/freightliner_cascadia_2012_dot_10004/Dockerfile b/freightliner_cascadia_2012_dot_10004/Dockerfile
@@ -35,5 +35,7 @@ LABEL org.label-schema.build-date=${BUILD_DATE}
 
 ADD . /root/vehicle/config
 VOLUME /opt/carma/vehicle/config
+RUN mkdir -p /opt/carma/vehicle/config
+RUN cp -a /root/vehicle/config/.env /opt/carma/vehicle/config/
 
-CMD  cp /root/vehicle/config/* /opt/carma/vehicle/config
+CMD cp /root/vehicle/config/* /opt/carma/vehicle/config
diff --git a/freightliner_cascadia_2012_dot_10004/docker-compose-background.yml b/freightliner_cascadia_2012_dot_10004/docker-compose-background.yml
@@ -12,8 +12,8 @@
 #  License for the specific language governing permissions and limitations under
 #  the License.
 
-# Docker Compose Spec Version
-version: '2'
+
+
 
 services:
   web-ui:

diff --git a/freightliner_cascadia_2012_dot_10004/docker-compose.yml b/freightliner_cascadia_2012_dot_10004/docker-compose.yml
@@ -12,8 +12,8 @@
 #  License for the specific language governing permissions and limitations under
 #  the License.
 
-# Docker Compose Spec Version
-version: '2'
+
+
 
 services:
   roscore:

diff --git a/freightliner_cascadia_2012_dot_80550/Dockerfile b/freightliner_cascadia_2012_dot_80550/Dockerfile
@@ -35,5 +35,7 @@ LABEL org.label-schema.build-date=${BUILD_DATE}
 
 ADD . /root/vehicle/config
 VOLUME /opt/carma/vehicle/config
+RUN mkdir -p /opt/carma/vehicle/config
+RUN cp -a /root/vehicle/config/.env /opt/carma/vehicle/config/
 
-CMD  cp /root/vehicle/config/* /opt/carma/vehicle/config
+CMD cp /root/vehicle/config/* /opt/carma/vehicle/config
diff --git a/freightliner_cascadia_2012_dot_80550/docker-compose-background.yml b/freightliner_cascadia_2012_dot_80550/docker-compose-background.yml
@@ -12,8 +12,8 @@
 #  License for the specific language governing permissions and limitations under
 #  the License.
 
-# Docker Compose Spec Version
-version: '2'
+
+
 
 services:
   web-ui:

diff --git a/freightliner_cascadia_2012_dot_80550/docker-compose.yml b/freightliner_cascadia_2012_dot_80550/docker-compose.yml
@@ -12,8 +12,8 @@
 #  License for the specific language governing permissions and limitations under
 #  the License.
 
-# Docker Compose Spec Version
-version: '2'
+
+
 
 services:
   roscore:

diff --git a/lexus_rx_450h_2019/Dockerfile b/lexus_rx_450h_2019/Dockerfile
@@ -35,5 +35,7 @@ LABEL org.label-schema.build-date=${BUILD_DATE}
 
 ADD . /root/vehicle/config
 VOLUME /opt/carma/vehicle/config
+RUN mkdir -p /opt/carma/vehicle/config
+RUN cp -a /root/vehicle/config/.env /opt/carma/vehicle/config/
 
-CMD  cp /root/vehicle/config/* /opt/carma/vehicle/config
+CMD cp /root/vehicle/config/* /opt/carma/vehicle/config
diff --git a/lexus_rx_450h_2019/docker-compose-background.yml b/lexus_rx_450h_2019/docker-compose-background.yml
@@ -12,8 +12,8 @@
 #  License for the specific language governing permissions and limitations under
 #  the License.
 
-# Docker Compose Spec Version
-version: '2'
+
+
 
 services:
   web-ui:

diff --git a/lexus_rx_450h_2019/docker-compose.yml b/lexus_rx_450h_2019/docker-compose.yml
@@ -11,8 +11,8 @@
 #  License for the specific language governing permissions and limitations under
 #  the License.
 
-# Docker Compose Spec Version
-version: '2'
+
+
 
 services:
   roscore:

diff --git a/traxxas_slash_4x4_platinum_2012/.env b/traxxas_slash_4x4_platinum_2012/.env
@@ -1,2 +1,2 @@
 DOCKER_ORG=usdotfhwastol
-DOCKER_TAG=carma-system-4.5.0
+DOCKER_TAG=carma-system-4.5.0
diff --git a/traxxas_slash_4x4_platinum_2012/Dockerfile b/traxxas_slash_4x4_platinum_2012/Dockerfile
@@ -35,5 +35,7 @@ LABEL org.label-schema.build-date=${BUILD_DATE}
 
 ADD . /root/vehicle/config
 VOLUME /opt/carma/vehicle/config
+RUN mkdir -p /opt/carma/vehicle/config
+RUN cp -a /root/vehicle/config/.env /opt/carma/vehicle/config/
 
-CMD  cp /root/vehicle/config/* /opt/carma/vehicle/config
+CMD cp /root/vehicle/config/* /opt/carma/vehicle/config
diff --git a/traxxas_slash_4x4_platinum_2012/docker-compose-background.yml b/traxxas_slash_4x4_platinum_2012/docker-compose-background.yml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version: '2'
+
 
 services: 
     web-ui:

diff --git a/traxxas_slash_4x4_platinum_2012/docker-compose.yml b/traxxas_slash_4x4_platinum_2012/docker-compose.yml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version: '2'
+
 
 services: 
     roscore:

diff --git a/xil_carma_cloud/Dockerfile b/xil_carma_cloud/Dockerfile
@@ -38,4 +38,4 @@ VOLUME /opt/carma/vehicle/config
 RUN mkdir -p /opt/carma/vehicle/config
 RUN cp -a /root/vehicle/config/.env /opt/carma/vehicle/config/
 
-CMD  cp /root/vehicle/config/* /opt/carma/vehicle/config
+CMD cp /root/vehicle/config/* /opt/carma/vehicle/config
diff --git a/xil_carma_cloud/docker-compose.yml b/xil_carma_cloud/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "2"
+
 services:
   carma-simulation:
     privileged: true

diff --git a/xil_cloud/.dockerignore b/xil_cloud/.dockerignore
@@ -1,3 +1,4 @@
 HostVehicleParams.yaml
 build-image.sh
 Dockerfile
+cdasim_config
diff --git a/xil_cloud/.env b/xil_cloud/.env
@@ -1,3 +1,3 @@
 DOCKER_ORG=usdotfhwastol
 DOCKER_TAG=carma-system-4.5.0
-OPS_DOCKER_TAG=7.6.0
+OPS_DOCKER_TAG=7.6.0
diff --git a/xil_cloud/Dockerfile b/xil_cloud/Dockerfile
@@ -35,5 +35,7 @@ LABEL org.label-schema.build-date=${BUILD_DATE}
 
 ADD . /root/vehicle/config
 VOLUME /opt/carma/vehicle/config
+RUN mkdir -p /opt/carma/vehicle/config
+RUN cp -a /root/vehicle/config/.env /opt/carma/vehicle/config/
 
-CMD  cp /root/vehicle/config/* /opt/carma/vehicle/config
+CMD cp /root/vehicle/config/* /opt/carma/vehicle/config
diff --git a/xil_cloud/docker-compose.yml b/xil_cloud/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2'
+
 services:
 
   carma-simulation:

diff --git a/xil_cloud_telematics/.dockerignore b/xil_cloud_telematics/.dockerignore
@@ -1,3 +1,4 @@
 HostVehicleParams.yaml
 build-image.sh
 Dockerfile
+cdasim_config
diff --git a/xil_cloud_telematics/.env b/xil_cloud_telematics/.env
@@ -1,3 +1,3 @@
 DOCKER_ORG=usdotfhwastol
-DOCKER_TAG=carma-system-4.5.0
-OPS_DOCKER_TAG=7.6.0
+DOCKER_TAG=carma-system-4.7.0
+OPS_DOCKER_TAG=7.8.0
diff --git a/xil_cloud_telematics/Dockerfile b/xil_cloud_telematics/Dockerfile
@@ -35,5 +35,7 @@ LABEL org.label-schema.build-date=${BUILD_DATE}
 
 ADD . /root/vehicle/config
 VOLUME /opt/carma/vehicle/config
+RUN mkdir -p /opt/carma/vehicle/config
+RUN cp -a /root/vehicle/config/.env /opt/carma/vehicle/config/
 
-CMD  cp /root/vehicle/config/* /opt/carma/vehicle/config
+CMD cp /root/vehicle/config/* /opt/carma/vehicle/config