usdot-jpo-ode · dan-du-car · Jun 14, 2024 · Jan 18, 2024 · Jan 26, 2024 · Jan 26, 2024
diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
@@ -19,8 +19,13 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Replcae Docker tag
+        id: set_tag
+        run: echo "TAG=$(echo ${GITHUB_REF##*/} | sed 's/\//-/g')" >> $GITHUB_ENV
+
       - name: Build
         uses: docker/build-push-action@v3
         with:
           push: true
-          tags: usdotjpoode/jpo-conflictmonitor:${{ github.ref_name }}
+          tags: usdotjpoode/jpo-conflictmonitor:${{ env.TAG }}
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,8 @@
 jpo-conflictmonitor/target/**
+jpo-conflictmonitor/bin/**
+jpo-deduplicator/target/**
+jpo-deduplicator/bin/**
 .env
 *.log
-.idea/
+.idea/
+*.class
diff --git a/Dedup_Dockerfile b/Dedup_Dockerfile
@@ -0,0 +1,71 @@
+FROM maven:3.8-eclipse-temurin-21-alpine as builder
+
+WORKDIR /home
+
+# Copy only the files needed to avoid putting all sorts of junk from your local env on to the image
+
+# Copy and Build ODE
+COPY ./jpo-geojsonconverter/jpo-ode/pom.xml ./jpo-ode/
+COPY ./jpo-geojsonconverter/jpo-ode/jpo-ode-common/pom.xml ./jpo-ode/jpo-ode-common/
+COPY ./jpo-geojsonconverter/jpo-ode/jpo-ode-common/src ./jpo-ode/jpo-ode-common/src
+COPY ./jpo-geojsonconverter/jpo-ode/jpo-ode-plugins/pom.xml ./jpo-ode/jpo-ode-plugins/
+COPY ./jpo-geojsonconverter/jpo-ode/jpo-ode-plugins/src ./jpo-ode/jpo-ode-plugins/src
+COPY ./jpo-geojsonconverter/jpo-ode/jpo-ode-core/pom.xml ./jpo-ode/jpo-ode-core/
+COPY ./jpo-geojsonconverter/jpo-ode/jpo-ode-core/src ./jpo-ode/jpo-ode-core/src/
+COPY ./jpo-geojsonconverter/jpo-ode/jpo-ode-svcs/pom.xml ./jpo-ode/jpo-ode-svcs/
+COPY ./jpo-geojsonconverter/jpo-ode/jpo-ode-svcs/src ./jpo-ode/jpo-ode-svcs/src
+
+WORKDIR /home/jpo-ode
+RUN mvn install -DskipTests
+
+
+# Copy and Build GeoJsonConverter
+WORKDIR /home
+COPY ./jpo-geojsonconverter/jpo-geojsonconverter/pom.xml ./jpo-geojsonconverter/
+COPY ./jpo-geojsonconverter/jpo-geojsonconverter/src ./jpo-geojsonconverter/src
+
+WORKDIR /home/jpo-geojsonconverter
+RUN mvn clean install -DskipTests
+
+
+# Copy and Build Conflict Monitor
+WORKDIR /home
+COPY ./jpo-conflictmonitor/pom.xml ./jpo-conflictmonitor/
+COPY ./jpo-conflictmonitor/src ./jpo-conflictmonitor/src
+
+WORKDIR /home/jpo-conflictmonitor
+RUN mvn clean install -DskipTests
+
+
+# Copy and Build Deduplicator
+WORKDIR /home
+COPY ./jpo-deduplicator/pom.xml ./jpo-deduplicator/
+COPY ../jpo-deduplicator/src ./jpo-deduplicator/src
+
+WORKDIR /home/jpo-deduplicator
+RUN mvn clean package -DskipTests
+
+FROM amazoncorretto:21
+
+WORKDIR /home
+
+COPY --from=builder /home/jpo-deduplicator/src/main/resources/application.yaml /home
+COPY --from=builder /home/jpo-deduplicator/src/main/resources/logback.xml /home
+COPY --from=builder /home/jpo-deduplicator/target/jpo-deduplicator.jar /home
+
+#COPY cert.crt /home/cert.crt
+#RUN keytool -import -trustcacerts -keystore /usr/local/openjdk-11/lib/security/cacerts -storepass changeit -noprompt -alias mycert -file cert.crt
+
+ENTRYPOINT ["java", \
+    "-Djava.rmi.server.hostname=$DOCKER_HOST_IP", \
+    "-Dcom.sun.management.jmxremote.port=9090", \
+    "-Dcom.sun.management.jmxremote.rmi.port=9090", \
+    "-Dcom.sun.management.jmxremote", \
+    "-Dcom.sun.management.jmxremote.local.only=true", \
+    "-Dcom.sun.management.jmxremote.authenticate=false", \
+    "-Dcom.sun.management.jmxremote.ssl=false", \
+    "-Dlogback.configurationFile=/home/logback.xml", \
+    "-jar", \
+    "/home/jpo-deduplicator.jar"]
+
+# ENTRYPOINT ["tail", "-f", "/dev/null"]
diff --git a/Dockerfile b/Dockerfile
@@ -31,7 +31,7 @@ WORKDIR /home/jpo-conflictmonitor
 
 RUN mvn clean package -DskipTests
 
-FROM eclipse-temurin:21-jre-alpine
+FROM amazoncorretto:21
 
 WORKDIR /home
 

diff --git a/LICENSE.html b/LICENSE.html
@@ -0,0 +1,228 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta charset="utf-8">
+  <title>Apache License, Version 2.0</title>
+</head>
+<body>
+<div class="container">
+  <style type="text/css">
+  /* The following code is added by mdx_elementid.py
+     It was originally lifted from http://subversion.apache.org/style/site.css */
+  /*
+   * Hide class="elementid-permalink", except when an enclosing heading
+   * has the :hover property.
+   */
+  .headerlink, .elementid-permalink {
+    visibility: hidden;
+  }
+  h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }
+  </style>
+  <p>Apache License<br>
+  Version 2.0, January 2004<br>
+  <a href=
+  "http://www.apache.org/licenses/">http://www.apache.org/licenses/</a></p>
+  <p>TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND
+  DISTRIBUTION</p>
+  <p><strong><a name="definitions" id="definitions">1.
+  Definitions</a></strong>.</p>
+  <p>"License" shall mean the terms and conditions for use,
+  reproduction, and distribution as defined by Sections 1 through 9
+  of this document.</p>
+  <p>"Licensor" shall mean the copyright owner or entity authorized
+  by the copyright owner that is granting the License.</p>
+  <p>"Legal Entity" shall mean the union of the acting entity and
+  all other entities that control, are controlled by, or are under
+  common control with that entity. For the purposes of this
+  definition, "control" means (i) the power, direct or indirect, to
+  cause the direction or management of such entity, whether by
+  contract or otherwise, or (ii) ownership of fifty percent (50%)
+  or more of the outstanding shares, or (iii) beneficial ownership
+  of such entity.</p>
+  <p>"You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.</p>
+  <p>"Source" form shall mean the preferred form for making
+  modifications, including but not limited to software source code,
+  documentation source, and configuration files.</p>
+  <p>"Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but not
+  limited to compiled object code, generated documentation, and
+  conversions to other media types.</p>
+  <p>"Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work (an
+  example is provided in the Appendix below).</p>
+  <p>"Derivative Works" shall mean any work, whether in Source or
+  Object form, that is based on (or derived from) the Work and for
+  which the editorial revisions, annotations, elaborations, or
+  other modifications represent, as a whole, an original work of
+  authorship. For the purposes of this License, Derivative Works
+  shall not include works that remain separable from, or merely
+  link (or bind by name) to the interfaces of, the Work and
+  Derivative Works thereof.</p>
+  <p>"Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or
+  additions to that Work or Derivative Works thereof, that is
+  intentionally submitted to Licensor for inclusion in the Work by
+  the copyright owner or by an individual or Legal Entity
+  authorized to submit on behalf of the copyright owner. For the
+  purposes of this definition, "submitted" means any form of
+  electronic, verbal, or written communication sent to the Licensor
+  or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control
+  systems, and issue tracking systems that are managed by, or on
+  behalf of, the Licensor for the purpose of discussing and
+  improving the Work, but excluding communication that is
+  conspicuously marked or otherwise designated in writing by the
+  copyright owner as "Not a Contribution."</p>
+  <p>"Contributor" shall mean Licensor and any individual or Legal
+  Entity on behalf of whom a Contribution has been received by
+  Licensor and subsequently incorporated within the Work.</p>
+  <p><strong><a name="copyright" id="copyright">2. Grant of
+  Copyright License</a></strong>. Subject to the terms and
+  conditions of this License, each Contributor hereby grants to You
+  a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+  irrevocable copyright license to reproduce, prepare Derivative
+  Works of, publicly display, publicly perform, sublicense, and
+  distribute the Work and such Derivative Works in Source or Object
+  form.</p>
+  <p><strong><a name="patent" id="patent">3. Grant of Patent
+  License</a></strong>. Subject to the terms and conditions of this
+  License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  (except as stated in this section) patent license to make, have
+  made, use, offer to sell, sell, import, and otherwise transfer
+  the Work, where such license applies only to those patent claims
+  licensable by such Contributor that are necessarily infringed by
+  their Contribution(s) alone or by combination of their
+  Contribution(s) with the Work to which such Contribution(s) was
+  submitted. If You institute patent litigation against any entity
+  (including a cross-claim or counterclaim in a lawsuit) alleging
+  that the Work or a Contribution incorporated within the Work
+  constitutes direct or contributory patent infringement, then any
+  patent licenses granted to You under this License for that Work
+  shall terminate as of the date such litigation is filed.</p>
+  <p><strong><a name="redistribution" id="redistribution">4.
+  Redistribution</a></strong>. You may reproduce and distribute
+  copies of the Work or Derivative Works thereof in any medium,
+  with or without modifications, and in Source or Object form,
+  provided that You meet the following conditions:</p>
+  <ol style="list-style: lower-latin;">
+    <li>You must give any other recipients of the Work or
+    Derivative Works a copy of this License; and</li>
+    <li>You must cause any modified files to carry prominent
+    notices stating that You changed the files; and</li>
+    <li>You must retain, in the Source form of any Derivative Works
+    that You distribute, all copyright, patent, trademark, and
+    attribution notices from the Source form of the Work, excluding
+    those notices that do not pertain to any part of the Derivative
+    Works; and</li>
+    <li>If the Work includes a "NOTICE" text file as part of its
+    distribution, then any Derivative Works that You distribute
+    must include a readable copy of the attribution notices
+    contained within such NOTICE file, excluding those notices that
+    do not pertain to any part of the Derivative Works, in at least
+    one of the following places: within a NOTICE text file
+    distributed as part of the Derivative Works; within the Source
+    form or documentation, if provided along with the Derivative
+    Works; or, within a display generated by the Derivative Works,
+    if and wherever such third-party notices normally appear. The
+    contents of the NOTICE file are for informational purposes only
+    and do not modify the License. You may add Your own attribution
+    notices within Derivative Works that You distribute, alongside
+    or as an addendum to the NOTICE text from the Work, provided
+    that such additional attribution notices cannot be construed as
+    modifying the License.<br>
+    <br>
+    You may add Your own copyright statement to Your modifications
+    and may provide additional or different license terms and
+    conditions for use, reproduction, or distribution of Your
+    modifications, or for any such Derivative Works as a whole,
+    provided Your use, reproduction, and distribution of the Work
+    otherwise complies with the conditions stated in this
+    License.</li>
+  </ol>
+  <p><strong><a name="contributions" id="contributions">5.
+  Submission of Contributions</a></strong>. Unless You explicitly
+  state otherwise, any Contribution intentionally submitted for
+  inclusion in the Work by You to the Licensor shall be under the
+  terms and conditions of this License, without any additional
+  terms or conditions. Notwithstanding the above, nothing herein
+  shall supersede or modify the terms of any separate license
+  agreement you may have executed with Licensor regarding such
+  Contributions.</p>
+  <p><strong><a name="trademarks" id="trademarks">6.
+  Trademarks</a></strong>. This License does not grant permission
+  to use the trade names, trademarks, service marks, or product
+  names of the Licensor, except as required for reasonable and
+  customary use in describing the origin of the Work and
+  reproducing the content of the NOTICE file.</p>
+  <p><strong><a name="no-warranty" id="no-warranty">7. Disclaimer
+  of Warranty</a></strong>. Unless required by applicable law or
+  agreed to in writing, Licensor provides the Work (and each
+  Contributor provides its Contributions) on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+  implied, including, without limitation, any warranties or
+  conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or
+  FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for
+  determining the appropriateness of using or redistributing the
+  Work and assume any risks associated with Your exercise of
+  permissions under this License.</p>
+  <p><strong><a name="no-liability" id="no-liability">8. Limitation
+  of Liability</a></strong>. In no event and under no legal theory,
+  whether in tort (including negligence), contract, or otherwise,
+  unless required by applicable law (such as deliberate and grossly
+  negligent acts) or agreed to in writing, shall any Contributor be
+  liable to You for damages, including any direct, indirect,
+  special, incidental, or consequential damages of any character
+  arising as a result of this License or out of the use or
+  inability to use the Work (including but not limited to damages
+  for loss of goodwill, work stoppage, computer failure or
+  malfunction, or any and all other commercial damages or losses),
+  even if such Contributor has been advised of the possibility of
+  such damages.</p>
+  <p><strong><a name="additional" id="additional">9. Accepting
+  Warranty or Additional Liability</a></strong>. While
+  redistributing the Work or Derivative Works thereof, You may
+  choose to offer, and charge a fee for, acceptance of support,
+  warranty, indemnity, or other liability obligations and/or rights
+  consistent with this License. However, in accepting such
+  obligations, You may act only on Your own behalf and on Your sole
+  responsibility, not on behalf of any other Contributor, and only
+  if You agree to indemnify, defend, and hold each Contributor
+  harmless for any liability incurred by, or claims asserted
+  against, such Contributor by reason of your accepting any such
+  warranty or additional liability.</p>
+  <p>END OF TERMS AND CONDITIONS</p>
+  <h1 id="apply">APPENDIX: How to apply the Apache License to your
+  work<a class="headerlink" href="#apply" title=
+  "Permanent link">¶</a></h1>
+  <p>To apply the Apache License to your work, attach the following
+  boilerplate notice, with the fields enclosed by brackets "[]"
+  replaced with your own identifying information. (Don't include
+  the brackets!) The text should be enclosed in the appropriate
+  comment syntax for the file format. We also recommend that a file
+  or class name and description of purpose be included on the same
+  "printed page" as the copyright notice for easier identification
+  within third-party archives.</p>
+  <div class="codehilite">
+    <pre>Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+    </pre>
+  </div>
+</div>
+
+</body>
+</html>
diff --git a/README.md b/README.md
@@ -168,7 +168,9 @@ docker-compose ps
 
 **Notes:**
 - Docker builds may fail if you are on a corporate network due to DNS resolution errors.
-- In order for Docker to automatically read the environment variable file, you must rename it from `sample.env` to `.env`. **This file will contain private keys, do not put add it to version control.**
+- In order for Docker to automatically read the environment variable file, you must rename it from `sample.env` to `.env`. **This file will contain private keys, do not put add it to version control.
+- The MongoDB keyfile should be randomized for each deployment. To Create a new keyfile run the following `openssl rand -base64 756 > ./docker/mongo/keyfile.txt`
+**
 
 Navigate to the root directory of the jpo-conflictmonitor project and run the following command:
 
@@ -281,6 +283,10 @@ Install the IDE of your choice:
 
 * The standalone deployment has the services provided by `docker-compose-standalone.yml` and is intended to only deploy the conflict monitor service with auto-restarting conditions. This deployment requires an existing MongoDB database as well as configurations for kafka connectors for an existing kafka-connector service.
 
+### Release Deployment
+
+* The release deployment has the services provided by `release-compose.yml` including a MongoDB container, Monitor Container and Connector container. This deployment references pre-built dockerfiles available on dockerhub, and can provide a streamlined deployment process using the latest formal release.
+
 [Back to top](#toc)
 
 <!--

diff --git a/docker-compose-dedup.yml b/docker-compose-dedup.yml
@@ -0,0 +1,25 @@
+version: '3.9'
+services:
+  deduplicator:
+    build: 
+      context: .
+      dockerfile: Dedup_Dockerfile
+    image: jpo-deduplicator:latest
+    restart: always
+    environment:
+      DOCKER_HOST_IP: ${DOCKER_HOST_IP}
+      KAFKA_BROKER_IP: ${KAFKA_BROKER_IP}
+      spring.kafka.bootstrap-servers: ${KAFKA_BROKER_IP}:9092
+    healthcheck:
+      test: ["CMD", "java", "-version"]
+      interval: 10s
+      timeout: 10s
+      retries: 20
+    logging:
+      options:
+        max-size: "10m"
+        max-file: "5"
+    deploy:
+      resources:
+        limits:
+          memory: 3G