Merge pull request #226 from usdot-fhwa-OPS/v2xrelease-6.0

V2xrelease 6.0
usdot-fhwa-OPS · Jul 29, 2021 · 25b0aab · 25b0aab
2 parents 3d01b99 + be6cbba
commit 25b0aab
Show file tree

Hide file tree

Showing 1,289 changed files with 35,254 additions and 52,336 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -47,7 +47,7 @@ jobs:
           command: |
             set -x
             apt-get update
-            apt-get -y install curl unzip sudo cmake gcovr gcc-7 g++-7 libboost1.65-dev libboost-thread1.65-dev libboost-regex1.65-dev libboost-log1.65-dev libboost-program-options1.65-dev libboost1.65-all-dev libxerces-c-dev libcurl4-openssl-dev libsnmp-dev libmysqlclient-dev libjsoncpp-dev uuid-dev libusb-dev libusb-1.0-0-dev libftdi-dev swig liboctave-dev gpsd libgps-dev portaudio19-dev libsndfile1-dev libglib2.0-dev libglibmm-2.4-dev libpcre3-dev libsigc++-2.0-dev libxml++2.6-dev libxml2-dev liblzma-dev dpkg-dev libmysqlcppconn-dev libev-dev libuv-dev git vim zip build-essential libssl-dev qtbase5-dev qtbase5-dev-tools curl libqhttpengine-dev libgtest-dev
+            apt-get -y install curl unzip sudo cmake gcovr gcc-7 g++-7 libboost1.65-dev libboost-thread1.65-dev libboost-regex1.65-dev libboost-log1.65-dev libboost-program-options1.65-dev libboost1.65-all-dev libxerces-c-dev libcurl4-openssl-dev libsnmp-dev libmysqlclient-dev libjsoncpp-dev uuid-dev libusb-dev libusb-1.0-0-dev libftdi-dev swig liboctave-dev gpsd libgps-dev portaudio19-dev libsndfile1-dev libglib2.0-dev libglibmm-2.4-dev libpcre3-dev libsigc++-2.0-dev libxml++2.6-dev libxml2-dev liblzma-dev dpkg-dev libmysqlcppconn-dev libev-dev libuv-dev git vim zip build-essential libssl-dev qtbase5-dev qtbase5-dev-tools curl libqhttpengine-dev libgtest-dev  libcpprest-dev librdkafka-dev
             
             cd /home/V2X-Hub-build/
             mkdir -p ext
@@ -58,7 +58,6 @@ jobs:
             make
             make install
             cd ../../../..
-
             cd /home/V2X-Hub-build/ext
             git clone https://github.com/usdot-fhwa-OPS/qhttpengine.git
             cd /home/V2X-Hub-build/ext/qhttpengine
@@ -70,20 +69,34 @@ jobs:
             cmake .
             make
             make install
+
+            cd /home/V2X-Hub-build/ext/ccserver
+            cmake .
+            make
+            make install
             
-            cd /usr/src/googletest/googletest
+            cd /usr/src/googletest
             mkdir build
-            cd /usr/src/googletest/googletest/build
+            cd /usr/src/googletest/build
             cmake ..
             make
-            cp libgtest* /usr/lib/
-            cd /usr/src/googletest/googletest
+            make install
+            cd /usr/src/googletest
             rm -rf build
-            mkdir /usr/local/lib/googletest
-            ln -s /usr/lib/libgtest.a /usr/local/lib/googletest/libgtest.a
-            ln -s /usr/lib/libgtest_main.a /usr/local/lib/googletest/libgtest_main.a
+            ln -s  /usr/local/lib/libgtest.a /usr/lib/libgtest.a 
+            ln -s  /usr/local/lib/libgtest_main.a /usr/lib/libgtest_main.a
+            cd /usr/local/lib/
+            ldconfig
+
+            cd /home/V2X-Hub-build/ext/
+            git clone https://github.com/HowardHinnant/date.git
+            cd /home/V2X-Hub-build/ext/date
+            cmake .
+            make
+            make install
             ldconfig
 
+
             cd ../../../../..
             cd /home/V2X-Hub-build
             mkdir .base-image
@@ -92,6 +105,7 @@ jobs:
             curl -o $SONAR_DIR/sonar-scanner.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.2.0.1873-linux.zip
             curl -o $SONAR_DIR/build-wrapper.zip https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip
             curl -sL https://deb.nodesource.com/setup_10.x | bash -
+            sudo apt-get install -y nodejs
             mkdir /opt/jq
             curl -L "https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64" -o /opt/jq/jq
             chmod +x /opt/jq/jq
@@ -123,7 +137,8 @@ jobs:
             source /home/V2X-Hub-build/.base-image/init-env.sh
             if [ -z "${CIRCLE_PULL_REQUEST}" ]; then
               echo "Non-PR Build Detected. Running analysis on ${CIRCLE_BRANCH}"
-              sonar-scanner -X -Dproject.settings=.sonarqube/sonar-scanner.properties -Dsonar.login=${SONAR_SCANNER_TOKEN}
+              # cd /home/V2X-Hub-build
+              # sonar-scanner -X -Dproject.settings=.sonarqube/sonar-scanner.properties -Dsonar.login=${SONAR_SCANNER_TOKEN}
               exit 0;
             else
               echo "PR branch ${CIRCLE_BRANCH}"
@@ -134,6 +149,60 @@ jobs:
               export BASE_BRANCH_URL="https://api.github.com/repos/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}/pulls/${PR_NUM}"
               export TARGET_BRANCH=$(curl "$BASE_BRANCH_URL" | jq '.base.ref' | tr -d '"') 
               echo "Target Branch = ${TARGET_BRANCH}"
-              git merge origin/${TARGET_BRANCH}
+             # git merge origin/${TARGET_BRANCH}
               sonar-scanner -X -Dproject.settings=.sonarqube/sonar-scanner.properties -Dsonar.login=${SONAR_SCANNER_TOKEN} -Dsonar.pullrequest.base=${TARGET_BRANCH} -Dsonar.pullrequest.branch=${CIRCLE_BRANCH} -Dsonar.pullrequest.key=${PR_NUM}            
-            fi
+            fi 
+  docker_build&push :
+   machine:
+    image: ubuntu-1604:202004-01
+   steps:
+     - checkout
+     - run: 
+        name: Docker Build
+        # Run MYSQL image and build v2xhub docker image
+        command: |
+          cd configuration/amd64/
+          docker-compose up -d db
+          cd ../../
+          docker build --network=host -t usdotfhwaops/v2xhubamd:${CIRCLE_BRANCH,,} .
+    
+     - run: 
+        name: Docker Push
+        # Push v2xhub docker image to usdotfhwaops dockerhub
+        command: | 
+          echo "$DOCKERHUB_PASSWORD" | docker login --username $DOCKERHUB_USERNAME --password-stdin
+          docker push usdotfhwaops/v2xhubamd:${CIRCLE_BRANCH,,}
+  docker_build&push_develop :
+   machine:
+    image: ubuntu-1604:202004-01
+   steps:
+     - checkout
+     - run: 
+        name: Docker Build
+        # Run MYSQL image and build v2xhub docker image develop image
+        command: |
+          cd configuration/amd64/
+          docker-compose up -d db
+          cd ../../
+          docker build --network=host -t usdotfhwaops/v2xhubamd:latest .
+    
+     - run: 
+        name: Docker Push
+        # Push v2xhub docker image to usdotfhwaops dockerhub
+        command: | 
+          echo "$DOCKERHUB_PASSWORD" | docker login --username $DOCKERHUB_USERNAME --password-stdin
+          docker push usdotfhwaops/v2xhubamd:latest
+workflows:
+  version: 2
+  build:
+    jobs:
+      - docker_build&push_develop:
+          filters:
+            branches:
+              only: develop
+      - docker_build&push:
+          filters:
+           branches:
+              ignore: develop
+      - build
+
diff --git a/.sonarqube/sonar-scanner.properties b/.sonarqube/sonar-scanner.properties
@@ -27,20 +27,20 @@ sonar.scm.enabled=true
 sonar.scm.provider=git
 
 # Modules starting with Java packages then C++ packages
-sonar.modules=  BsmLoggerPlugin, \
-  CswPlugin, \
-  DmsPlugin, \
+sonar.modules=  MessageLoggerPlugin, \
   DsrcImmediateForwardPlugin, \
-  LocationPlugin, \
-  MapPlugin, \
   MessageReceiverPlugin, \
-  ODEPlugin, \
   PedestrianPlugin, \
   PreemptionPlugin, \
-  RtcmPlugin, \
-  SPaTLoggerPlugin, \
-  SpatPlugin, \
   TimPlugin
+  # LocationPlugin, \
+  # MapPlugin, \
+  # ODEPlugin, \
+  # RtcmPlugin, \
+  # SPaTLoggerPlugin, \
+  # SpatPlugin, \
+  # CswPlugin, \
+  # DmsPlugin, \
   # TmxCore, \
   # TmxCtl, \
   # TmxTools, \
@@ -51,19 +51,19 @@ sonar.modules=  BsmLoggerPlugin, \
 # TmxCtl.sonar.projectBaseDir                     =/home/V2X-Hub-build/src/tmx/TmxCtl
 # TmxTools.sonar.projectBaseDir                   =/home/V2X-Hub-build/src/tmx/TmxTools
 # TmxUtils.sonar.projectBaseDir                   =/home/V2X-Hub-build/src/tmx/TmxUtils
-BsmLoggerPlugin.sonar.projectBaseDir            =/home/V2X-Hub-build/src/v2i-hub/BsmLoggerPlugin
-CswPlugin.sonar.projectBaseDir                  =/home/V2X-Hub-build/src/v2i-hub/CswPlugin
-DmsPlugin.sonar.projectBaseDir                  =/home/V2X-Hub-build/src/v2i-hub/DmsPlugin
+MessageLoggerPlugin.sonar.projectBaseDir            =/home/V2X-Hub-build/src/v2i-hub/MessageLoggerPlugin
+#CswPlugin.sonar.projectBaseDir                  =/home/V2X-Hub-build/src/v2i-hub/CswPlugin
+#DmsPlugin.sonar.projectBaseDir                  =/home/V2X-Hub-build/src/v2i-hub/DmsPlugin
 DsrcImmediateForwardPlugin.sonar.projectBaseDir =/home/V2X-Hub-build/src/v2i-hub/DsrcImmediateForwardPlugin
-LocationPlugin.sonar.projectBaseDir             =/home/V2X-Hub-build/src/v2i-hub/LocationPlugin
-MapPlugin.sonar.projectBaseDir                  =/home/V2X-Hub-build/src/v2i-hub/MapPlugin
+#LocationPlugin.sonar.projectBaseDir              =/home/V2X-Hub-build/src/v2i-hub/LocationPlugin
+# MapPlugin.sonar.projectBaseDir                  =/home/V2X-Hub-build/src/v2i-hub/MapPlugin
 MessageReceiverPlugin.sonar.projectBaseDir      =/home/V2X-Hub-build/src/v2i-hub/MessageReceiverPlugin
-ODEPlugin.sonar.projectBaseDir                  =/home/V2X-Hub-build/src/v2i-hub/ODEPlugin
+# ODEPlugin.sonar.projectBaseDir                  =/home/V2X-Hub-build/src/v2i-hub/ODEPlugin
 PedestrianPlugin.sonar.projectBaseDir           =/home/V2X-Hub-build/src/v2i-hub/PedestrianPlugin
 PreemptionPlugin.sonar.projectBaseDir           =/home/V2X-Hub-build/src/v2i-hub/PreemptionPlugin
-RtcmPlugin.sonar.projectBaseDir                 =/home/V2X-Hub-build/src/v2i-hub/RtcmPlugin
-SPaTLoggerPlugin.sonar.projectBaseDir           =/home/V2X-Hub-build/src/v2i-hub/SPaTLoggerPlugin
-SpatPlugin.sonar.projectBaseDir                 =/home/V2X-Hub-build/src/v2i-hub/SpatPlugin
+# RtcmPlugin.sonar.projectBaseDir                 =/home/V2X-Hub-build/src/v2i-hub/RtcmPlugin
+# SPaTLoggerPlugin.sonar.projectBaseDir           =/home/V2X-Hub-build/src/v2i-hub/SPaTLoggerPlugin
+# SpatPlugin.sonar.projectBaseDir                 =/home/V2X-Hub-build/src/v2i-hub/SpatPlugin
 TimPlugin.sonar.projectBaseDir                  =/home/V2X-Hub-build/src/v2i-hub/TimPlugin
 
 # C++ Package differences
@@ -72,39 +72,39 @@ TimPlugin.sonar.projectBaseDir                  =/home/V2X-Hub-build/src/v2i-hub
 # TmxCtl.sonar.sources                      =src
 # TmxTools.sonar.sources                    =src
 # TmxUtils.sonar.sources                    =src
-BsmLoggerPlugin.sonar.sources             =src
-CswPlugin.sonar.sources                   =src
-DmsPlugin.sonar.sources                   =src
+MessageLoggerPlugin.sonar.sources             =src
+# CswPlugin.sonar.sources                   =src
+# DmsPlugin.sonar.sources                   =src
 DsrcImmediateForwardPlugin.sonar.sources  =src
-LocationPlugin.sonar.sources              =src
-MapPlugin.sonar.sources                   =src
+# LocationPlugin.sonar.sources              =src
+# MapPlugin.sonar.sources                   =src
 MessageReceiverPlugin.sonar.sources       =src
-ODEPlugin.sonar.sources                   =src
+# ODEPlugin.sonar.sources                   =src
 PedestrianPlugin.sonar.sources            =src
 PreemptionPlugin.sonar.sources            =src
-RtcmPlugin.sonar.sources                  =src
-SPaTLoggerPlugin.sonar.sources            =src
-SpatPlugin.sonar.sources                  =src
+# RtcmPlugin.sonar.sources                  =src
+# SPaTLoggerPlugin.sonar.sources            =src
+# SpatPlugin.sonar.sources                  =src
 TimPlugin.sonar.sources                   =src
 
 # Gcov reports path
 # TmxCore.sonar.cfamily.gcov.reportsPath                    =coverage
 # TmxCtl.sonar.cfamily.gcov.reportsPath                     =coverage
 # TmxTools.sonar.cfamily.gcov.reportsPath                   =coverage
 # TmxUtils.sonar.cfamily.gcov.reportsPath                   =coverage
-BsmLoggerPlugin.sonar.cfamily.gcov.reportsPath            =coverage
-CswPlugin.sonar.cfamily.gcov.reportsPath                  =coverage
-DmsPlugin.sonar.cfamily.gcov.reportsPath                  =coverage
+MessageLoggerPlugin.sonar.cfamily.gcov.reportsPath            =coverage
+# CswPlugin.sonar.cfamily.gcov.reportsPath                  =coverage
+# DmsPlugin.sonar.cfamily.gcov.reportsPath                  =coverage
 DsrcImmediateForwardPlugin.sonar.cfamily.gcov.reportsPath =coverage
-LocationPlugin.sonar.cfamily.gcov.reportsPath             =coverage
-MapPlugin.sonar.cfamily.gcov.reportsPath                  =coverage
+# LocationPlugin.sonar.cfamily.gcov.reportsPath             =coverage
+# MapPlugin.sonar.cfamily.gcov.reportsPath                  =coverage
 MessageReceiverPlugin.sonar.cfamily.gcov.reportsPath      =coverage
-ODEPlugin.sonar.cfamily.gcov.reportsPath                  =coverage
+# ODEPlugin.sonar.cfamily.gcov.reportsPath                  =coverage
 PedestrianPlugin.sonar.cfamily.gcov.reportsPath           =coverage
 PreemptionPlugin.sonar.cfamily.gcov.reportsPath           =coverage
-RtcmPlugin.sonar.cfamily.gcov.reportsPath                 =coverage
-SPaTLoggerPlugin.sonar.cfamily.gcov.reportsPath           =coverage
-SpatPlugin.sonar.cfamily.gcov.reportsPath                 =coverage
+# RtcmPlugin.sonar.cfamily.gcov.reportsPath                 =coverage
+# SPaTLoggerPlugin.sonar.cfamily.gcov.reportsPath           =coverage
+# SpatPlugin.sonar.cfamily.gcov.reportsPath                 =coverage
 TimPlugin.sonar.cfamily.gcov.reportsPath                  =coverage
 
 # Tests

diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,20 @@
 FROM ubuntu:bionic-20190807
 
 
-RUN apt-get update  && apt-get install -y sudo cmake gcc-7 g++-7 libboost1.65-dev libboost-thread1.65-dev libboost-regex1.65-dev libboost-log1.65-dev libboost-program-options1.65-dev libboost1.65-all-dev libxerces-c-dev libcurl4-openssl-dev libsnmp-dev libmysqlclient-dev libjsoncpp-dev uuid-dev libusb-dev libusb-1.0-0-dev libftdi-dev swig liboctave-dev gpsd libgps-dev portaudio19-dev libsndfile1-dev libglib2.0-dev libglibmm-2.4-dev libpcre3-dev libsigc++-2.0-dev libxml++2.6-dev libxml2-dev liblzma-dev dpkg-dev libmysqlcppconn-dev libev-dev libuv-dev git vim zip build-essential libssl-dev qtbase5-dev qtbase5-dev-tools curl libqhttpengine-dev libgtest-dev
+RUN apt-get update  && apt-get install -y sudo cmake gcc-7 g++-7 libboost1.65-dev libboost-thread1.65-dev libboost-regex1.65-dev libboost-log1.65-dev libboost-program-options1.65-dev libboost1.65-all-dev libxerces-c-dev libcurl4-openssl-dev libsnmp-dev libmysqlclient-dev libjsoncpp-dev uuid-dev libusb-dev libusb-1.0-0-dev libftdi-dev swig liboctave-dev gpsd libgps-dev portaudio19-dev libsndfile1-dev libglib2.0-dev libglibmm-2.4-dev libpcre3-dev libsigc++-2.0-dev libxml++2.6-dev libxml2-dev liblzma-dev dpkg-dev libmysqlcppconn-dev libev-dev libuv-dev git vim zip build-essential libssl-dev qtbase5-dev qtbase5-dev-tools curl libqhttpengine-dev libgtest-dev libcpprest-dev librdkafka-dev
 
+WORKDIR cd /usr/src/googletest/googletest
+RUN mkdir ~/build
+WORKDIR /usr/src/googletest/googletest/build
+RUN cmake ..
+RUN make
+RUN cp libgtest* /usr/lib/
+WORKDIR cd /usr/src/googletest/googletest
+RUN rm -rf build
+RUN mkdir /usr/local/lib/googletest
+RUN ln -s /usr/lib/libgtest.a /usr/local/lib/googletest/libgtest.a
+RUN ln -s /usr/lib/libgtest_main.a /usr/local/lib/googletest/libgtest_main.a
+RUN ldconfig
 ENV MYSQL_ROOT_PASSWORD ivp
 
 RUN mkdir ~/V2X-Hub
@@ -18,7 +30,7 @@ RUN /home/V2X-Hub/container/library.sh
 RUN ldconfig
 
 WORKDIR /home/V2X-Hub/
-RUN mkdir -p ~/ext
+RUN mkdir -p /home/V2X-Hub/ext
 WORKDIR /home/V2X-Hub/ext/
 RUN git clone https://github.com/usdot-fhwa-OPS/libwebsockets.git
 WORKDIR /home/V2X-Hub/ext/libwebsockets/
@@ -33,27 +45,31 @@ RUN cmake .
 RUN make 
 RUN make install
 
+WORKDIR /home/V2X-Hub/ext/ 
+RUN git clone https://github.com/HowardHinnant/date.git
+WORKDIR /home/V2X-Hub/ext/date
+RUN cmake .
+RUN make
+RUN make install
+RUN ldconfig 
+
 WORKDIR /home/V2X-Hub/ext/server
 RUN cmake .
 RUN make
 RUN make install
 
-WORKDIR cd /usr/src/googletest/googletest
-RUN mkdir ~/build
-WORKDIR /usr/src/googletest/googletest/build
-RUN cmake ..
+WORKDIR /home/V2X-Hub/ext/ccserver
+RUN cmake . 
 RUN make
-RUN cp libgtest* /usr/lib/
-WORKDIR cd /usr/src/googletest/googletest
-RUN rm -rf build
-RUN mkdir /usr/local/lib/googletest
-RUN ln -s /usr/lib/libgtest.a /usr/local/lib/googletest/libgtest.a
-RUN ln -s /usr/lib/libgtest_main.a /usr/local/lib/googletest/libgtest_main.a
-RUN ldconfig
+RUN make install 
+
+### setup and install v2x-hub core and plugins 
 
 WORKDIR /home/V2X-Hub/src/v2i-hub/
-RUN cmake . -DqserverPedestrian_DIR=/usr/local/share/qserverPedestrian/cmake
+RUN cmake . -DqserverPedestrian_DIR=/usr/local/share/qserverPedestrian/cmake -Dv2xhubWebAPI_DIR=/usr/local/share/v2xhubWebAPI/cmake/
 RUN make
+
+
 RUN ln -s ../bin CommandPlugin/bin
 RUN zip CommandPlugin.zip CommandPlugin/bin/CommandPlugin CommandPlugin/manifest.json
 RUN ln -s ../bin CswPlugin/bin
@@ -78,12 +94,19 @@ RUN ln -s ../bin PreemptionPlugin/bin
 RUN zip PreemptionPlugin.zip PreemptionPlugin/bin/PreemptionPlugin PreemptionPlugin/manifest.json
 RUN ln -s ../bin SPaTLoggerPlugin/bin
 RUN zip SPaTLoggerPlugin.zip SPaTLoggerPlugin/bin/SPaTLoggerPlugin SPaTLoggerPlugin/manifest.json
-RUN ln -s ../bin BsmLoggerPlugin/bin
-RUN zip BsmLoggerPlugin.zip BsmLoggerPlugin/bin/BsmLoggerPlugin BsmLoggerPlugin/manifest.json
+RUN ln -s ../bin MessageLoggerPlugin/bin
+RUN zip MessageLoggerPlugin.zip MessageLoggerPlugin/bin/MessageLoggerPlugin MessageLoggerPlugin/manifest.json
 RUN ln -s ../bin PedestrianPlugin/bin
 RUN zip PedestrianPlugin.zip PedestrianPlugin/bin/PedestrianPlugin PedestrianPlugin/manifest.json
 RUN ln -s ../bin TimPlugin/bin
 RUN zip TimPlugin.zip TimPlugin/bin/TimPlugin TimPlugin/manifest.json
+RUN ln -s ../bin CARMACloudPlugin/bin
+RUN zip CARMACloudPlugin.zip CARMACloudPlugin/bin/CARMACloudPlugin CARMACloudPlugin/manifest.json
+RUN ln -s ../bin MobilityOperationPlugin/bin
+RUN zip MobilityOperationPlugin.zip MobilityOperationPlugin/bin/MobilityOperationPlugin MobilityOperationPlugin/manifest.json
+RUN ln -s ../bin ODELoggerPlugin/bin
+RUN zip ODELoggerPlugin.zip ODELoggerPlugin/bin/ODELoggerPlugin ODELoggerPlugin/manifest.json
+
 
 WORKDIR /home/V2X-Hub/src/tmx/TmxCore/
 RUN cp tmxcore.service /lib/systemd/system/
@@ -105,7 +128,7 @@ RUN mkdir /var/www/plugins/.ssl
 RUN chown plugin .ssl
 RUN chgrp www-data .ssl
 WORKDIR /var/www/plugins/.ssl/
-RUN openssl req -x509 -newkey rsa:4096 -sha256 -nodes -keyout tmxcmd.key -out tmxcmd.crt -subj "/CN= <your website url> " -days 3650
+RUN openssl req -x509 -newkey rsa:4096 -sha256 -nodes -keyout tmxcmd.key -out tmxcmd.crt -subj "/CN= <127.0.0.1> " -days 3650
 RUN chown plugin *
 RUN chgrp www-data *
 WORKDIR /home/V2X-Hub/src/v2i-hub/
@@ -120,9 +143,12 @@ RUN tmxctl --plugin-install RtcmPlugin.zip
 RUN tmxctl --plugin-install SpatPlugin.zip
 RUN tmxctl --plugin-install PreemptionPlugin.zip
 RUN tmxctl --plugin-install SPaTLoggerPlugin.zip
-RUN tmxctl --plugin-install BsmLoggerPlugin.zip
+RUN tmxctl --plugin-install MessageLoggerPlugin.zip
 RUN tmxctl --plugin-install PedestrianPlugin.zip
 RUN tmxctl --plugin-install TimPlugin.zip
+RUN tmxctl --plugin-install CARMACloudPlugin.zip
+RUN tmxctl --plugin-install MobilityOperationPlugin.zip
+RUN tmxctl --plugin-install ODELoggerPlugin.zip
 
 RUN sudo mkdir /home/V2X-Hub/.base-image 
 

diff --git a/README.md b/README.md
@@ -61,10 +61,7 @@ The dependencies for Ubuntu 18.04 can be found in the [Ubuntu 18.04 Requirements
 The installation and setup instructions can be found in the [Installation and Setup Guide](docs/Installation_and_Setup.md)
 
 ## Docker Setup
-
-The installation and setup instructions for the docker image on an AMD system can be found in the [Docker Instructions Guide for AMD](docs/Docker_Instructions_AMD.md)
-
-The installation and setup instructions for the docker image on an ARM system can be found in the [Docker Instructions Guide for ARM](docs/Docker_Instructions_ARM.md)
+The installation and setup instructions for the docker image on an AMD and ARM system can be found in the [Docker Instructions Guide for AMD and ARM](docs/Docker_Instructions.md)
 
 ## Contribution
 Welcome to the V2X-Hub contributing guide. Please read this guide to learn about our development process, how to propose pull requests and improvements, and how to build and test your changes to this project. [V2X-Hub Contributing Guide](Contributing.md)