From bf4bef97024cbe09b1a04a617bd4e3695fb1bfec Mon Sep 17 00:00:00 2001
From: adupont <adupont@Ubuntu20.04.myguest.virtualbox.org>
Date: Mon, 15 Apr 2024 09:28:26 -0600
Subject: [PATCH 1/7] Change polling period to 5 seconds instead of an hour and
 a half

---
 .../certificate_revocation_list/c++11/USER_QOS_PROFILES.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/connext_secure/certificate_revocation_list/c++11/USER_QOS_PROFILES.xml b/examples/connext_secure/certificate_revocation_list/c++11/USER_QOS_PROFILES.xml
index 8d75fa06f..6613cb321 100644
--- a/examples/connext_secure/certificate_revocation_list/c++11/USER_QOS_PROFILES.xml
+++ b/examples/connext_secure/certificate_revocation_list/c++11/USER_QOS_PROFILES.xml
@@ -52,7 +52,7 @@ to use the software. -->
               </element>
               <element>
                 <name>com.rti.serv.secure.files_poll_interval</name>
-                <value>5000</value>
+                <value>5</value>
               </element>
               <!--
                     Needed to allow a previously-revoked participant to fail

From 5544f5864602726661fe864797251b3a5b769805 Mon Sep 17 00:00:00 2001
From: Anthony Dupont <adupont@rti.com>
Date: Mon, 23 Sep 2024 17:11:36 -0600
Subject: [PATCH 2/7] Updating Dockerfile and cmake for Debian package

---
 tutorials/docker/CMakeLists.txt |  3 +-
 tutorials/docker/Dockerfile     | 52 ++++++++++++++++++++++++++-------
 2 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/tutorials/docker/CMakeLists.txt b/tutorials/docker/CMakeLists.txt
index e070f0920..b22c04e28 100644
--- a/tutorials/docker/CMakeLists.txt
+++ b/tutorials/docker/CMakeLists.txt
@@ -15,7 +15,8 @@ project(connext-tutorial-docker-pub-sub)
 
 # Include Connext CMake utilities
 list(APPEND CMAKE_MODULE_PATH
-    "/opt/rti.com/rticonnextdds-examples/resources/cmake/Modules/"
+    # "/opt/rti.com/rticonnextdds-examples/resources/cmake/Modules/"
+    "/app/rticonnextdds-examples/resources/cmake/Modules/"
 )
 include(ConnextDdsConfigureCmakeUtils)
 connextdds_configure_cmake_utils()
diff --git a/tutorials/docker/Dockerfile b/tutorials/docker/Dockerfile
index 82f7b2ba6..db2318c27 100644
--- a/tutorials/docker/Dockerfile
+++ b/tutorials/docker/Dockerfile
@@ -1,27 +1,59 @@
-FROM rticom/connext-sdk:7.3.0-EAR as build-stage
+ARG RTI_LICENSE_AGREEMENT_ACCEPTED=false
+FROM ubuntu:20.04 as build-stage
+
+ARG RTI_LICENSE_AGREEMENT_ACCEPTED
+
+# Install the required packages
+RUN export DEBIAN_FRONTEND=noninteractive \
+    && apt-get update \
+    && apt-get install -y \
+    build-essential \
+    cmake \
+    curl \
+    git \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists
+
+# Install prerequisites
+RUN curl -sSL -o /usr/share/keyrings/rti-official-archive.gpg \
+    https://packages.rti.com/deb/official/repo.key
+RUN printf -- "deb [arch=%s, signed-by=%s] %s %s main\n" \
+    $(dpkg --print-architecture) \
+    /usr/share/keyrings/rti-official-archive.gpg \
+    https://packages.rti.com/deb/official \
+    $(. /etc/os-release && echo ${VERSION_CODENAME}) | \
+    tee /etc/apt/sources.list.d/rti-official.list >/dev/null
+
+# Install the RTI Connext Debian Package
+RUN export DEBIAN_FRONTEND=noninteractive \
+    RTI_LICENSE_AGREEMENT_ACCEPTED=${RTI_LICENSE_AGREEMENT_ACCEPTED} \
+    && apt-get update \
+    && apt-get install -y rti-connext-dds-7.3.0 \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists
 
 # For armv8 uncomment the following line
 # ENV CONNEXTDDS_ARCH=armv8Linux4gcc7.3.0
-
 WORKDIR /app
 
 # Copy the necessary files to the container
-COPY rti_license.dat ${NDDSHOME}
+COPY rti_license.dat /opt/rti.com/rti_connext_dds-7.3.0/
 COPY CMakeLists.txt .
 COPY home_automation.idl .
-COPY *.cxx .
-COPY *.xml .
+COPY *.cxx ./
+COPY *.xml ./
+RUN git clone --recurse-submodule https://github.com/rticommunity/rticonnextdds-examples.git
 
 # Build the applications
 RUN mkdir build
 WORKDIR /app/build
-RUN cmake ..
+RUN cmake .. -DCONNEXTDDS_DIR=/opt/rti.com/rti_connext_dds-7.3.0/
 RUN make -j4
 
 # Copy the built applications to a new container
-FROM rticom/connext-runtime:7.3.0-EAR as final-stage
+FROM ubuntu:20.04 as final-stage
 
 WORKDIR /app
-COPY --chown=rtiuser:rtigroup --from=build-stage ${NDDSHOME}/rti_license.dat ${NDDSHOME}
-COPY --chown=rtiuser:rtigroup --from=build-stage /app/build/ /app
-COPY *.xml /app
+COPY --from=build-stage /opt/rti.com/rti_connext_dds-7.3.0/rti_license.dat ./
+COPY --from=build-stage /app/build/ ./
+COPY *.xml ./
\ No newline at end of file

From b5b3961df569341596d11437aaa45e325c30eed1 Mon Sep 17 00:00:00 2001
From: Anthony Dupont <adupont@rti.com>
Date: Mon, 23 Sep 2024 17:14:32 -0600
Subject: [PATCH 3/7] Reverting unrelated change

---
 .../certificate_revocation_list/c++11/USER_QOS_PROFILES.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/connext_secure/certificate_revocation_list/c++11/USER_QOS_PROFILES.xml b/examples/connext_secure/certificate_revocation_list/c++11/USER_QOS_PROFILES.xml
index 6613cb321..8d75fa06f 100644
--- a/examples/connext_secure/certificate_revocation_list/c++11/USER_QOS_PROFILES.xml
+++ b/examples/connext_secure/certificate_revocation_list/c++11/USER_QOS_PROFILES.xml
@@ -52,7 +52,7 @@ to use the software. -->
               </element>
               <element>
                 <name>com.rti.serv.secure.files_poll_interval</name>
-                <value>5</value>
+                <value>5000</value>
               </element>
               <!--
                     Needed to allow a previously-revoked participant to fail

From 1507ef1b8e498a741e234b7d0ac0d69a4d6fa992 Mon Sep 17 00:00:00 2001
From: Anthony Dupont <adupont@rti.com>
Date: Fri, 11 Oct 2024 14:58:12 -0600
Subject: [PATCH 4/7] decoupling the docker steps into two files

---
 tutorials/docker/CMakeLists.txt     |  1 -
 tutorials/docker/Dockerfile         | 60 ++---------------------------
 tutorials/docker/connext.Dockerfile | 51 ++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 57 deletions(-)
 create mode 100644 tutorials/docker/connext.Dockerfile

diff --git a/tutorials/docker/CMakeLists.txt b/tutorials/docker/CMakeLists.txt
index b22c04e28..288d365fc 100644
--- a/tutorials/docker/CMakeLists.txt
+++ b/tutorials/docker/CMakeLists.txt
@@ -15,7 +15,6 @@ project(connext-tutorial-docker-pub-sub)
 
 # Include Connext CMake utilities
 list(APPEND CMAKE_MODULE_PATH
-    # "/opt/rti.com/rticonnextdds-examples/resources/cmake/Modules/"
     "/app/rticonnextdds-examples/resources/cmake/Modules/"
 )
 include(ConnextDdsConfigureCmakeUtils)
diff --git a/tutorials/docker/Dockerfile b/tutorials/docker/Dockerfile
index db2318c27..07fc8105a 100644
--- a/tutorials/docker/Dockerfile
+++ b/tutorials/docker/Dockerfile
@@ -1,59 +1,7 @@
-ARG RTI_LICENSE_AGREEMENT_ACCEPTED=false
-FROM ubuntu:20.04 as build-stage
-
-ARG RTI_LICENSE_AGREEMENT_ACCEPTED
-
-# Install the required packages
-RUN export DEBIAN_FRONTEND=noninteractive \
-    && apt-get update \
-    && apt-get install -y \
-    build-essential \
-    cmake \
-    curl \
-    git \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists
-
-# Install prerequisites
-RUN curl -sSL -o /usr/share/keyrings/rti-official-archive.gpg \
-    https://packages.rti.com/deb/official/repo.key
-RUN printf -- "deb [arch=%s, signed-by=%s] %s %s main\n" \
-    $(dpkg --print-architecture) \
-    /usr/share/keyrings/rti-official-archive.gpg \
-    https://packages.rti.com/deb/official \
-    $(. /etc/os-release && echo ${VERSION_CODENAME}) | \
-    tee /etc/apt/sources.list.d/rti-official.list >/dev/null
-
-# Install the RTI Connext Debian Package
-RUN export DEBIAN_FRONTEND=noninteractive \
-    RTI_LICENSE_AGREEMENT_ACCEPTED=${RTI_LICENSE_AGREEMENT_ACCEPTED} \
-    && apt-get update \
-    && apt-get install -y rti-connext-dds-7.3.0 \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists
-
-# For armv8 uncomment the following line
-# ENV CONNEXTDDS_ARCH=armv8Linux4gcc7.3.0
-WORKDIR /app
-
-# Copy the necessary files to the container
-COPY rti_license.dat /opt/rti.com/rti_connext_dds-7.3.0/
-COPY CMakeLists.txt .
-COPY home_automation.idl .
-COPY *.cxx ./
-COPY *.xml ./
-RUN git clone --recurse-submodule https://github.com/rticommunity/rticonnextdds-examples.git
-
-# Build the applications
-RUN mkdir build
-WORKDIR /app/build
-RUN cmake .. -DCONNEXTDDS_DIR=/opt/rti.com/rti_connext_dds-7.3.0/
-RUN make -j4
-
 # Copy the built applications to a new container
-FROM ubuntu:20.04 as final-stage
+FROM connext-sdk:latest as final-stage
 
 WORKDIR /app
-COPY --from=build-stage /opt/rti.com/rti_connext_dds-7.3.0/rti_license.dat ./
-COPY --from=build-stage /app/build/ ./
-COPY *.xml ./
\ No newline at end of file
+COPY --from=connext-sdk /opt/rti.com/rti_connext_dds-7.3.0/rti_license.dat ./
+COPY --from=connext-sdk /app/build/ ./
+COPY *.xml ./
diff --git a/tutorials/docker/connext.Dockerfile b/tutorials/docker/connext.Dockerfile
new file mode 100644
index 000000000..7f8a4a945
--- /dev/null
+++ b/tutorials/docker/connext.Dockerfile
@@ -0,0 +1,51 @@
+# FROM rticom/connext-sdk:7.3.0-EAR as build-stage
+FROM ubuntu:20.04 as build-stage
+
+ARG RTI_LICENSE_AGREEMENT_ACCEPTED=false
+
+# Install the required packages
+RUN export DEBIAN_FRONTEND=noninteractive \
+    && apt-get update \
+    && apt-get install -y \
+    build-essential \
+    cmake \
+    curl \
+    git \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists
+
+# Install prerequisites
+RUN curl -sSL -o /usr/share/keyrings/rti-official-archive.gpg \
+    https://packages.rti.com/deb/official/repo.key
+RUN printf -- "deb [arch=%s, signed-by=%s] %s %s main\n" \
+    $(dpkg --print-architecture) \
+    /usr/share/keyrings/rti-official-archive.gpg \
+    https://packages.rti.com/deb/official \
+    $(. /etc/os-release && echo ${VERSION_CODENAME}) | \
+    tee /etc/apt/sources.list.d/rti-official.list >/dev/null
+
+# Install the RTI Connext Debian Package
+RUN export DEBIAN_FRONTEND=noninteractive \
+    RTI_LICENSE_AGREEMENT_ACCEPTED=${RTI_LICENSE_AGREEMENT_ACCEPTED} \
+    && apt-get update \
+    && apt-get install -y rti-connext-dds-7.3.0 \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists
+
+# For armv8 uncomment the following line
+# ENV CONNEXTDDS_ARCH=armv8Linux4gcc7.3.0
+WORKDIR /app
+
+# Copy the necessary files to the container
+COPY rti_license.dat /opt/rti.com/rti_connext_dds-7.3.0/
+COPY CMakeLists.txt .
+COPY home_automation.idl .
+COPY *.cxx ./
+COPY *.xml ./
+RUN git clone --recurse-submodule https://github.com/rticommunity/rticonnextdds-examples.git
+
+# Build the applications
+RUN mkdir build
+WORKDIR /app/build
+RUN cmake .. -DCONNEXTDDS_DIR=/opt/rti.com/rti_connext_dds-7.3.0/
+RUN make -j4
\ No newline at end of file

From 43a4659325ea1bab83967181cf85fb588fbbf560 Mon Sep 17 00:00:00 2001
From: Anthony Dupont <adupont@rti.com>
Date: Thu, 24 Oct 2024 19:51:14 -0600
Subject: [PATCH 5/7] PR feedback

---
 tutorials/docker/Dockerfile         | 24 ++++++++++++++++++++++--
 tutorials/docker/connext.Dockerfile | 18 +-----------------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/tutorials/docker/Dockerfile b/tutorials/docker/Dockerfile
index 07fc8105a..ff67befe1 100644
--- a/tutorials/docker/Dockerfile
+++ b/tutorials/docker/Dockerfile
@@ -1,7 +1,27 @@
+# For armv8 uncomment the following line
+# ENV CONNEXTDDS_ARCH=armv8Linux4gcc7.3.0
+FROM connext-sdk:latest as build-stage
+WORKDIR /app
+
+# Copy the necessary files to the container
+COPY --from=connext-sdk /opt/rti.com/rti_connext_dds-7.3.0 ./opt/rti.com/rti_connext_dds-7.3.0
+COPY --from=connext-sdk rticonnextdds-examples ./rticonnextdds-examples
+COPY CMakeLists.txt .
+COPY home_automation.idl .
+COPY *.cxx ./
+COPY *.xml ./
+
+# Build the applications
+RUN apt-get install -y cmake
+RUN mkdir build
+WORKDIR /app/build
+RUN cmake .. -DCONNEXTDDS_DIR=/opt/rti.com/rti_connext_dds-7.3.0/
+RUN make -j4
+
 # Copy the built applications to a new container
 FROM connext-sdk:latest as final-stage
 
 WORKDIR /app
 COPY --from=connext-sdk /opt/rti.com/rti_connext_dds-7.3.0/rti_license.dat ./
-COPY --from=connext-sdk /app/build/ ./
-COPY *.xml ./
+COPY --from=build-stage /app/build/ ./
+COPY *.xml ./
\ No newline at end of file
diff --git a/tutorials/docker/connext.Dockerfile b/tutorials/docker/connext.Dockerfile
index 7f8a4a945..844e44221 100644
--- a/tutorials/docker/connext.Dockerfile
+++ b/tutorials/docker/connext.Dockerfile
@@ -1,4 +1,3 @@
-# FROM rticom/connext-sdk:7.3.0-EAR as build-stage
 FROM ubuntu:20.04 as build-stage
 
 ARG RTI_LICENSE_AGREEMENT_ACCEPTED=false
@@ -32,20 +31,5 @@ RUN export DEBIAN_FRONTEND=noninteractive \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists
 
-# For armv8 uncomment the following line
-# ENV CONNEXTDDS_ARCH=armv8Linux4gcc7.3.0
-WORKDIR /app
-
-# Copy the necessary files to the container
 COPY rti_license.dat /opt/rti.com/rti_connext_dds-7.3.0/
-COPY CMakeLists.txt .
-COPY home_automation.idl .
-COPY *.cxx ./
-COPY *.xml ./
-RUN git clone --recurse-submodule https://github.com/rticommunity/rticonnextdds-examples.git
-
-# Build the applications
-RUN mkdir build
-WORKDIR /app/build
-RUN cmake .. -DCONNEXTDDS_DIR=/opt/rti.com/rti_connext_dds-7.3.0/
-RUN make -j4
\ No newline at end of file
+RUN git clone --recurse-submodule https://github.com/rticommunity/rticonnextdds-examples.git
\ No newline at end of file

From 1be6e5426044975bfb002583d28aa9cb1af93d64 Mon Sep 17 00:00:00 2001
From: Anthony Dupont <adupont@rti.com>
Date: Mon, 4 Nov 2024 16:30:41 -0700
Subject: [PATCH 6/7] Removing duplicate copy of NDDSHOME

---
 tutorials/docker/Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tutorials/docker/Dockerfile b/tutorials/docker/Dockerfile
index ff67befe1..532c516c8 100644
--- a/tutorials/docker/Dockerfile
+++ b/tutorials/docker/Dockerfile
@@ -4,7 +4,6 @@ FROM connext-sdk:latest as build-stage
 WORKDIR /app
 
 # Copy the necessary files to the container
-COPY --from=connext-sdk /opt/rti.com/rti_connext_dds-7.3.0 ./opt/rti.com/rti_connext_dds-7.3.0
 COPY --from=connext-sdk rticonnextdds-examples ./rticonnextdds-examples
 COPY CMakeLists.txt .
 COPY home_automation.idl .

From 53491a636071153379a31b8bffa66bf11bb1565b Mon Sep 17 00:00:00 2001
From: Anthony Dupont <adupont@rti.com>
Date: Wed, 13 Nov 2024 15:05:45 -0700
Subject: [PATCH 7/7] Removing unneeded copy

---
 tutorials/docker/CMakeLists.txt | 2 +-
 tutorials/docker/Dockerfile     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/tutorials/docker/CMakeLists.txt b/tutorials/docker/CMakeLists.txt
index 288d365fc..fa3b93445 100644
--- a/tutorials/docker/CMakeLists.txt
+++ b/tutorials/docker/CMakeLists.txt
@@ -15,7 +15,7 @@ project(connext-tutorial-docker-pub-sub)
 
 # Include Connext CMake utilities
 list(APPEND CMAKE_MODULE_PATH
-    "/app/rticonnextdds-examples/resources/cmake/Modules/"
+    "/rticonnextdds-examples/resources/cmake/Modules/"
 )
 include(ConnextDdsConfigureCmakeUtils)
 connextdds_configure_cmake_utils()
diff --git a/tutorials/docker/Dockerfile b/tutorials/docker/Dockerfile
index 532c516c8..1cdd6e4ab 100644
--- a/tutorials/docker/Dockerfile
+++ b/tutorials/docker/Dockerfile
@@ -4,7 +4,6 @@ FROM connext-sdk:latest as build-stage
 WORKDIR /app
 
 # Copy the necessary files to the container
-COPY --from=connext-sdk rticonnextdds-examples ./rticonnextdds-examples
 COPY CMakeLists.txt .
 COPY home_automation.idl .
 COPY *.cxx ./