From 740ba8a1e026164f0ad9b8ce7179cbe2fbbe13e6 Mon Sep 17 00:00:00 2001
From: Lauren Datz <105828115+ladatz@users.noreply.github.com>
Date: Tue, 5 Mar 2024 12:06:47 -0500
Subject: [PATCH 1/4] Enable docker build of integrated scenario

---
 .dockerignore                                 |   2 -
 Dockerfile_integrated.amd64                   | 100 +++++++++++++++++
 Dockerfile_integrated.arm64                   | 103 ++++++++++++++++++
 .../pub_sub_service_settings.integrated.yaml  |  29 +++++
 external/chariott                             |   2 +-
 5 files changed, 233 insertions(+), 3 deletions(-)
 create mode 100644 Dockerfile_integrated.amd64
 create mode 100644 Dockerfile_integrated.arm64
 create mode 100644 config/pub_sub_service_settings.integrated.yaml

diff --git a/.dockerignore b/.dockerignore
index 3bb1989..92e1935 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -11,5 +11,3 @@ target/
 devops/
 docs/
 tools/
-
-Cargo.lock
diff --git a/Dockerfile_integrated.amd64 b/Dockerfile_integrated.amd64
new file mode 100644
index 0000000..b4b0742
--- /dev/null
+++ b/Dockerfile_integrated.amd64
@@ -0,0 +1,100 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+# SPDX-License-Identifier: MIT
+
+# syntax=docker/dockerfile:1
+
+# Comments are provided throughout this file to help you get started.
+# If you need more help, visit the Dockerfile reference guide at
+# https://docs.docker.com/engine/reference/builder/
+
+################################################################################
+# Create a stage for building the application.
+
+ARG RUST_VERSION=1.72.1
+ARG APP_NAME=pub-sub-service
+ARG UID=10001
+
+FROM docker.io/library/rust:${RUST_VERSION}-slim-bullseye AS build
+ARG APP_NAME
+WORKDIR /sdv
+
+COPY ./ .
+
+# Check that APP_NAME argument is valid.
+RUN /sdv/container/scripts/argument_sanitizer.sh \
+    --arg-value "${APP_NAME}" \
+    --regex "^[a-zA-Z_0-9-]+$" || \
+    ( echo "Argument sanitizer failed for ARG 'APP_NAME'"; exit 1 )
+
+# Add Build dependencies.
+RUN apt update && apt upgrade -y && apt install -y \
+    cmake \
+    libssl-dev \
+    pkg-config \
+    protobuf-compiler
+
+# Build the application.
+RUN cargo build --release -p "${APP_NAME}"
+
+# Copy the built application to working directory.
+RUN cp ./target/release/"${APP_NAME}" /sdv/service
+
+################################################################################
+# Create a new stage for running the application that contains the minimal
+# runtime dependencies for the application. This often uses a different base
+# image from the build stage where the necessary files are copied from the build
+# stage.
+#
+# The example below uses the debian bullseye image as the foundation for running the app.
+# By specifying the "bullseye-slim" tag, it will also use whatever happens to be the
+# most recent version of that tag when you build your Dockerfile. If
+# reproducability is important, consider using a digest
+# (e.g., debian@sha256:ac707220fbd7b67fc19b112cee8170b41a9e97f703f588b2cdbbcdcecdd8af57).
+FROM docker.io/library/debian:bullseye-slim AS final
+ARG UID
+
+# Copy container scripts.
+COPY ./container/scripts/*.sh /sdv/scripts/
+
+# Check that UID argument is valid.
+RUN /sdv/scripts/argument_sanitizer.sh \
+    --arg-value "${UID}" \
+    --regex "^[0-9]+$" || \
+    ( echo "Argument sanitizer failed for ARG 'UID'"; exit 1 )
+
+# Create a non-privileged user that the app will run under.
+# See https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#user
+RUN adduser \
+    --disabled-password \
+    --gecos "" \
+    --home "/nonexistent" \
+    --shell "/sbin/nologin" \
+    --no-create-home \
+    --uid "${UID}" \
+    appuser
+
+# Create and add user ownership to config directory.
+RUN mkdir -p /sdv/.agemo/config
+RUN chown appuser /sdv/.agemo/config
+
+# Create mnt directory to copy override configs into.
+RUN mkdir -p /mnt/config
+
+USER appuser
+
+WORKDIR /sdv
+
+ENV AGEMO_HOME=/sdv/.agemo
+
+# Copy the executable from the "build" stage.
+COPY --from=build /sdv/service /sdv/
+
+# Copy the "integrated" config to the override config folder and rename it to what agemo expects
+COPY --from=build /sdv/config/pub_sub_service_settings.integrated.yaml /sdv/.agemo/config/pub_sub_service_settings.yaml
+
+# Expose the port that the application listens on.
+EXPOSE 50051
+
+# What the container should run when it is started.
+CMD ["/sdv/scripts/container_startup.sh"]
diff --git a/Dockerfile_integrated.arm64 b/Dockerfile_integrated.arm64
new file mode 100644
index 0000000..42dc4d1
--- /dev/null
+++ b/Dockerfile_integrated.arm64
@@ -0,0 +1,103 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+# SPDX-License-Identifier: MIT
+
+# syntax=docker/dockerfile:1
+
+# Comments are provided throughout this file to help you get started.
+# If you need more help, visit the Dockerfile reference guide at
+# https://docs.docker.com/engine/reference/builder/
+
+################################################################################
+# Create a stage for building the application.
+
+ARG RUST_VERSION=1.72.1
+ARG APP_NAME=pub-sub-service
+ARG UID=10001
+
+FROM docker.io/library/rust:${RUST_VERSION}-slim-bullseye AS build
+ARG APP_NAME
+WORKDIR /sdv
+
+COPY ./ .
+
+# Check that APP_NAME argument is valid.
+RUN /sdv/container/scripts/argument_sanitizer.sh \
+    --arg-value "${APP_NAME}" \
+    --regex "^[a-zA-Z_0-9-]+$" || \
+    ( echo "Argument sanitizer failed for ARG 'APP_NAME'"; exit 1 )
+
+# Add Build dependencies.
+RUN apt update && apt upgrade -y && apt install -y \
+    cmake \
+    libssl-dev \
+    pkg-config \
+    protobuf-compiler \
+    gcc-aarch64-linux-gnu
+
+RUN rustup target add aarch64-unknown-linux-gnu
+
+# Build the application.
+RUN cargo build --release --target=aarch64-unknown-linux-gnu -p "${APP_NAME}"
+
+# Copy the built application to working directory.
+RUN cp ./target/aarch64-unknown-linux-gnu/release/"${APP_NAME}" /sdv/service
+
+################################################################################
+# Create a new stage for running the application that contains the minimal
+# runtime dependencies for the application. This often uses a different base
+# image from the build stage where the necessary files are copied from the build
+# stage.
+#
+# The example below uses the debian bullseye image as the foundation for running the app.
+# By specifying the "bullseye-slim" tag, it will also use whatever happens to be the
+# most recent version of that tag when you build your Dockerfile. If
+# reproducability is important, consider using a digest
+# (e.g., debian@sha256:ac707220fbd7b67fc19b112cee8170b41a9e97f703f588b2cdbbcdcecdd8af57).
+FROM docker.io/arm64v8/debian:bullseye-slim AS final
+ARG UID
+
+# Copy container scripts.
+COPY ./container/scripts/*.sh /sdv/scripts/
+
+# Check that UID argument is valid.
+RUN /sdv/scripts/argument_sanitizer.sh \
+    --arg-value "${UID}" \
+    --regex "^[0-9]+$" || \
+    ( echo "Argument sanitizer failed for ARG 'UID'"; exit 1 )
+
+# Create a non-privileged user that the app will run under.
+# See https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#user
+RUN adduser \
+    --disabled-password \
+    --gecos "" \
+    --home "/nonexistent" \
+    --shell "/sbin/nologin" \
+    --no-create-home \
+    --uid "${UID}" \
+    appuser
+
+# Create and add user ownership to config directory.
+RUN mkdir -p /sdv/.agemo/config
+RUN chown appuser /sdv/.agemo/config
+
+# Create mnt directory to copy override configs into.
+RUN mkdir -p /mnt/config
+
+USER appuser
+
+WORKDIR /sdv
+
+ENV AGEMO_HOME=/sdv/.agemo
+
+# Copy the executable from the "build" stage.
+COPY --from=build /sdv/service /sdv/
+
+# Copy the "integrated" config to the override config folder and rename it to what agemo expects
+COPY --from=build /sdv/config/pub_sub_service_settings.integrated.yaml /sdv/.agemo/config/pub_sub_service_settings.yaml
+
+# Expose the port that the application listens on.
+EXPOSE 50051
+
+# What the container should run when it is started.
+CMD ["/sdv/scripts/container_startup.sh"]
diff --git a/config/pub_sub_service_settings.integrated.yaml b/config/pub_sub_service_settings.integrated.yaml
new file mode 100644
index 0000000..32edc5a
--- /dev/null
+++ b/config/pub_sub_service_settings.integrated.yaml
@@ -0,0 +1,29 @@
+###
+
+#
+# Pub Sub Service Settings
+#
+
+### Integrated Settings (i.e. using chariott's service discovery)
+
+# The URI that the Chariott Service Discovery listens on for requests.
+# Example: "http://0.0.0.0:50000"
+chariott_uri: "http://0.0.0.0:50000"
+
+# The namespace of the Pub Sub Service.
+# Example: "sdv.pubsub"
+namespace: "sdv.pubsub"
+
+# The name of the Pub Sub Service.
+# Example: "dynamic.pubsub"
+name: "dynamic.pubsub"
+
+# The IP address and port number that the Pub Sub Service listens on for requests.
+# Example: "0.0.0.0:50051"
+pub_sub_authority: "0.0.0.0:50051"
+
+# The URI of the messaging service used to facilitate publish and subscribe functionality.
+# Example: "mqtt://0.0.0.0:1883"
+messaging_uri: "mqtt://0.0.0.0:1883"
+
+###
diff --git a/external/chariott b/external/chariott
index b8528bc..502d5c0 160000
--- a/external/chariott
+++ b/external/chariott
@@ -1 +1 @@
-Subproject commit b8528bcf356162f7f4e41624e7a2bd459d0be111
+Subproject commit 502d5c0d6cf3cf18cb79955c4a73c3e293c8906e

From 3207905bdaa6b41d42e83a517287734849c4a3da Mon Sep 17 00:00:00 2001
From: Lauren Datz <105828115+ladatz@users.noreply.github.com>
Date: Tue, 5 Mar 2024 15:20:35 -0500
Subject: [PATCH 2/4] Revert submodule

---
 external/chariott | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/external/chariott b/external/chariott
index 502d5c0..b8528bc 160000
--- a/external/chariott
+++ b/external/chariott
@@ -1 +1 @@
-Subproject commit 502d5c0d6cf3cf18cb79955c4a73c3e293c8906e
+Subproject commit b8528bcf356162f7f4e41624e7a2bd459d0be111

From 333970cea8302b8467cc9b4feeda984f73fa626f Mon Sep 17 00:00:00 2001
From: Lauren Datz <105828115+ladatz@users.noreply.github.com>
Date: Tue, 5 Mar 2024 15:27:11 -0500
Subject: [PATCH 3/4] Add new dockerfiles to documentation

---
 docs/containers.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/containers.md b/docs/containers.md
index 50040d0..2760d56 100644
--- a/docs/containers.md
+++ b/docs/containers.md
@@ -13,6 +13,16 @@ document has instructions for building and running the provided Dockerfiles in
 x86-64 architecture.
 - [Dockerfile.arm64](../Dockerfile.arm64) - Dockerfile used to build the `Pub Sub Service` for the
 aarch64 architecture.
+- [Dockerfile_integrated.amd64](../Dockerfile_integrated.amd64) - Dockerfile used to build the
+`Pub Sub Service` using
+[Chariott Service Discovery](https://github.com/eclipse-chariott/chariott/blob/main/service_discovery/README.md)
+with the [integrated configuration](../config/pub_sub_service_settings.integrated.yaml) for the
+x86-64 architecture.
+- [Dockerfile_integrated.arm64](../Dockerfile_integrated.arm64) - Dockerfile used to build the
+`Pub Sub Service` using
+[Chariott Service Discovery](https://github.com/eclipse-chariott/chariott/blob/main/service_discovery/README.md)
+with the [integrated configuration](../config/pub_sub_service_settings.integrated.yaml) for the
+aarch64 architecture.
 
 #### Mosquitto MQTT Broker
 

From 5aa56c0883dde777ec07b1e603a2efab8e412dd5 Mon Sep 17 00:00:00 2001
From: Lauren Datz <105828115+ladatz@users.noreply.github.com>
Date: Tue, 5 Mar 2024 17:05:15 -0500
Subject: [PATCH 4/4] Add comment

---
 Dockerfile_integrated.amd64 | 2 +-
 Dockerfile_integrated.arm64 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile_integrated.amd64 b/Dockerfile_integrated.amd64
index b4b0742..9b5142e 100644
--- a/Dockerfile_integrated.amd64
+++ b/Dockerfile_integrated.amd64
@@ -93,7 +93,7 @@ COPY --from=build /sdv/service /sdv/
 # Copy the "integrated" config to the override config folder and rename it to what agemo expects
 COPY --from=build /sdv/config/pub_sub_service_settings.integrated.yaml /sdv/.agemo/config/pub_sub_service_settings.yaml
 
-# Expose the port that the application listens on.
+# Expose the port that the pub sub service listens on.
 EXPOSE 50051
 
 # What the container should run when it is started.
diff --git a/Dockerfile_integrated.arm64 b/Dockerfile_integrated.arm64
index 42dc4d1..f6af23c 100644
--- a/Dockerfile_integrated.arm64
+++ b/Dockerfile_integrated.arm64
@@ -96,7 +96,7 @@ COPY --from=build /sdv/service /sdv/
 # Copy the "integrated" config to the override config folder and rename it to what agemo expects
 COPY --from=build /sdv/config/pub_sub_service_settings.integrated.yaml /sdv/.agemo/config/pub_sub_service_settings.yaml
 
-# Expose the port that the application listens on.
+# Expose the port that the pub sub service listens on.
 EXPOSE 50051
 
 # What the container should run when it is started.