From: Dan Timoney <dtimoney@att.com>
Date: Thu, 18 Apr 2024 19:36:37 +0000 (-0400)
Subject: Update dgbuilder to use java 17 JRE
X-Git-Tag: 1.6.2^0
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F60%2F137560%2F3;p=ccsdk%2Fdistribution.git

Update dgbuilder to use java 17 JRE

Update dgbuilder to use Java 17 JRE.  This will resolve issue the issues
with UnsupportedClassVersionError that users have reported.

Issue-ID: SDNC-1836
Change-Id: I2708e64f32ec4f53bbdde7761aaf0bf37cde2d17
Signed-off-by: Dan Timoney <dtimoney@att.com>
---

diff --git a/dgbuilder-docker/src/main/docker/Dockerfile b/dgbuilder-docker/src/main/docker/Dockerfile
index 0ca8c04f..a26ed14f 100644
--- a/dgbuilder-docker/src/main/docker/Dockerfile
+++ b/dgbuilder-docker/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Base standard ONAP java base image with added packages needed for nodered
-FROM onap/ccsdk-alpine-j11-image:${project.docker.latestfulltag.version}
+FROM onap/ccsdk-alpine-j17-image:${project.docker.latestfulltag.version}
 MAINTAINER CCSDK  Team (onap-discuss@lists.onap.org)
 USER root
 
diff --git a/odlsli/src/main/dc/docker-compose.yaml b/odlsli/src/main/dc/docker-compose.yaml
index 61b1bde7..18912f83 100755
--- a/odlsli/src/main/dc/docker-compose.yaml
+++ b/odlsli/src/main/dc/docker-compose.yaml
@@ -40,4 +40,30 @@ services:
         max-size: "30m"
         max-file: "5"
 
+  dgbuilder:
+    image: onap/ccsdk-dgbuilder-image:latest
+    depends_on:
+      - db
+    container_name:  odlsli_dgbuilder
+    entrypoint:
+       - "/bin/bash"
+       - "-c"
+       - "cd /opt/onap/ccsdk/dgbuilder/ && ./start.sh sdnc1.0 && wait"
+    ports:
+      - "3200:3100"
+    links:
+      - db:dbhost
+      - db:sdnctldb01
+      - db:sdnctldb02
+    environment:
+      - MYSQL_ROOT_PASSWORD=MySecretPassword
+      - SDNC_CONFIG_DIR=/opt/onap/ccsdk/data/properties
+      - MYSQL_USER=${MYSQL_USER}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+      - MYSQL_DATABASE=${MYSQL_DATABASE}
+    logging:
+      driver:   "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
 
diff --git a/pom.xml b/pom.xml
index 2c3b579a..1fed5073 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
 
     <properties>
         <application.name>distribution</application.name>
-        <ccsdk.sli.version>1.7.1</ccsdk.sli.version>
+        <ccsdk.sli.version>1.7.3</ccsdk.sli.version>
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
         <ccsdk.distribution.version>${project.version}</ccsdk.distribution.version>