Merge release branch k900-xil into master (#542)

<!-- Thanks for the contribution, this is awesome. -->
This PR is to merge release branch k900-xil into master for xil-release
# 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.

.dockerignore

@@ -14,3 +14,5 @@
 Dockerfile
 docker-compose.yml
 *.md
+**/build
+

Dockerfile

@@ -1,11 +1,11 @@
 ARG UBUNTU_VERSION=jammy-20230126
 
-FROM ubuntu:$UBUNTU_VERSION
+FROM ubuntu:$UBUNTU_VERSION AS dependencies
 
 ENV DEBIAN_FRONTEND=noninteractive
 ADD scripts/install_dependencies.sh /usr/local/bin/
-RUN sed -i 's|http://archive.ubuntu.com|http://us.archive.ubuntu.com|g' /etc/apt/sources.list && \
-    /usr/local/bin/install_dependencies.sh
+RUN sed -i 's|http://archive.ubuntu.com|http://us.archive.ubuntu.com|g' /etc/apt/sources.list
+RUN /usr/local/bin/install_dependencies.sh
 
 # build out ext components
 COPY ./ext /home/V2X-Hub/ext
@@ -14,6 +14,7 @@ RUN ./build.sh
 
 ADD container/wait-for-it.sh /usr/local/bin/
 ADD container/service.sh /usr/local/bin/
+
 COPY ./container /home/V2X-Hub/container
 WORKDIR /home/V2X-Hub/container/
 RUN ./database.sh
@@ -26,8 +27,33 @@ WORKDIR /home/V2X-Hub/src/
 RUN ./build.sh release
 RUN ldconfig
 
-WORKDIR /home/V2X-Hub/
+# run final image
+FROM ubuntu:$UBUNTU_VERSION AS v2xhub
+ENV DEBIAN_FRONTEND=noninteractive
+ADD scripts/deployment_dependencies.sh /usr/local/bin/
+RUN /usr/local/bin/deployment_dependencies.sh
+
+COPY ./container /home/V2X-Hub/container/
+WORKDIR /home/V2X-Hub/container/
+RUN ./database.sh
+RUN ./library.sh
+RUN ldconfig
+
+COPY --from=dependencies /usr/local/plugins/ /usr/local/plugins/
+COPY --from=dependencies /usr/local/lib/ /usr/local/lib/
+COPY --from=dependencies /usr/local/bin/ /usr/local/bin/
+COPY --from=dependencies /usr/lib/ /usr/lib/
+COPY --from=dependencies /usr/bin/ /usr/bin/
+COPY --from=dependencies /usr/local/share/ /usr/local/share/
+COPY --from=dependencies /var/www/plugins/ /var/www/plugins/
+COPY --from=dependencies /var/log/tmx/ /var/log/tmx/
+COPY --from=dependencies /opt/ /opt/
+ADD src/tmx/TmxCore/tmxcore.service /lib/systemd/system/
+ADD src/tmx/TmxCore/tmxcore.service /usr/sbin/
+RUN ldconfig
+
 RUN /home/V2X-Hub/container/setup.sh
+
 WORKDIR /var/log/tmx
 
 # Set metadata labels

configuration/amd64/docker-compose.yml

@@ -20,7 +20,7 @@ services:
       - mysql-datavolume:/var/lib/mysql
 
   php:
-    image: usdotfhwaops/php:k900
+    image: usdotfhwaops/php:7.5.1
     container_name: php
     network_mode: host
     depends_on: 
@@ -30,7 +30,7 @@ services:
     tty: true
 
   v2xhub:
-    image: usdotfhwaops/v2xhubamd:k900
+    image: usdotfhwaops/v2xhubamd:7.5.1
     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:k900
+    image: usdotfhwaops/port-drayage-webservice:7.5.1
     container_name: port_drayage_webservice
     network_mode: host
 secrets:

configuration/arm64/docker-compose.yml

@@ -20,7 +20,7 @@ services:
       - mysql-datavolume:/var/lib/mysql
 
   php:
-    image: usdotfhwaops/php_arm:k900
+    image: usdotfhwaops/php_arm:7.5.1
     container_name: php
     network_mode: host
     depends_on: 
@@ -30,7 +30,7 @@ services:
     tty: true
 
   v2xhub:
-    image: usdotfhwaops/v2xhubarm:k900
+    image: usdotfhwaops/v2xhubarm:7.5.1
     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:k900
+    image: usdotfhwaops/port-drayage-webservice_arm:7.5.1
     container_name: port_drayage_webservice
     network_mode: host
 secrets:

container/setup.sh

@@ -1,9 +1,6 @@
 #!/bin/sh
 set -ex
 
-cp src/tmx/TmxCore/tmxcore.service /lib/systemd/system/
-cp src/tmx/TmxCore/tmxcore.service /usr/sbin/
-
 mkdir -p /var/www/plugins/MAP /var/www/plugins/.ssl
 openssl req -x509 -newkey rsa:4096 -sha256 -nodes -keyout /var/www/plugins/.ssl/tmxcmd.key -out /var/www/plugins/.ssl/tmxcmd.crt -subj "/CN= <127.0.0.1> " -days 3650
 chown -R plugin:www-data /var/www/plugins/.ssl