Use Java 21 alpine base images

Update to dmaap-listener and ueb-listener to use Java 21 base images
and update parent version to pick up deploy plugin version change

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

diff --git a/.gitignore b/.gitignore
index a60d53a..7714522 100755 (executable)
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,6 @@ local-mode-cache
 
 # key/certificate files
 **/src/main/resources/*.pem
+
+# logfiles
+*.log

diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml
index cc08fbe..334e1ca 100644 (file)
--- a/SdncReports/pom.xml
+++ b/SdncReports/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>spring-boot-1-starter-parent</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
         <relativePath/>
     </parent>
 

diff --git a/admportal/pom.xml b/admportal/pom.xml
index 6a746b5..fd336e1 100644 (file)
--- a/admportal/pom.xml
+++ b/admportal/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
         <relativePath/>
     </parent>
 

diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml
index 4436867..8cd5c18 100644 (file)
--- a/configbackuprestore/pom.xml
+++ b/configbackuprestore/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>spring-boot-1-starter-parent</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
 
     <groupId>org.onap.sdnc.oam.vnfbackup</groupId>

diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml
index 37c6024..0a28acc 100644 (file)
--- a/installation/dmaap-listener/pom.xml
+++ b/installation/dmaap-listener/pom.xml
@@ -21,7 +21,6 @@
         <image.name>onap/sdnc-dmaap-listener-image</image.name>
         <sdnc.project.version>${project.version}</sdnc.project.version>
         <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
-        <ccsdk.docker.version>${ccsdk.docker.alpine.j11.version}</ccsdk.docker.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>
@@ -119,6 +118,26 @@
                             </resources>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>copy-certificates</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <includes>
+                                        <include>*.pem</include>
+                                        <include>*.md</include>
+                                    </includes>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>

diff --git a/installation/dmaap-listener/src/main/docker/Dockerfile b/installation/dmaap-listener/src/main/docker/Dockerfile
index 51ae3ad..4d364ef 100644 (file)
--- a/installation/dmaap-listener/src/main/docker/Dockerfile
+++ b/installation/dmaap-listener/src/main/docker/Dockerfile
@@ -1,8 +1,14 @@
 # Base ubuntu with added packages needed for open ecomp
-FROM onap/ccsdk-alpine-j17-image:${ccsdk.docker.version} AS stage0
+FROM onap/${ccsdk.docker.alpine.image}:${ccsdk.docker.alpine.version} AS stage0
 USER root
 ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
 
+# Copy any certs
+COPY *.md *.pem /etc/ssl/certs/
+
+# Install certs
+RUN update-ca-certificates
+
 # copy deliverables to opt
 COPY opt /opt
 
@@ -12,7 +18,7 @@ RUN zip -q -d /opt/onap/sdnc/dmaap-listener/lib/log4j-core-*.jar org/apache/logg
 
 # End of stage 0
 
-FROM onap/ccsdk-alpine-j17-image:${ccsdk.docker.version}
+FROM onap/${ccsdk.docker.alpine.image}:${ccsdk.docker.alpine.version}
 
 MAINTAINER SDNC Team (onap-sdnc@lists.onap.org)
 

diff --git a/installation/dmaap-listener/src/main/resources/README-custom-certs.md b/installation/dmaap-listener/src/main/resources/README-custom-certs.md
new file mode 100644 (file)
index 0000000..ac414c1
--- /dev/null
+++ b/installation/dmaap-listener/src/main/resources/README-custom-certs.md
@@ -0,0 +1,3 @@
+Any .pem files in this directory will be copied to /etc/ssl/certs on the
+docker container and installed prior to running apk.  This might be needed,
+for example, for docker builds to work properly behind a corporate firewall.

diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml
index b62a8aa..d1bd87f 100644 (file)
--- a/installation/ueb-listener/pom.xml
+++ b/installation/ueb-listener/pom.xml
@@ -21,7 +21,6 @@
         <image.name>onap/sdnc-ueb-listener-image</image.name>
         <sdnc.project.version>${project.version}</sdnc.project.version>
         <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
-        <ccsdk.docker.version>${ccsdk.docker.alpine.j11.version}</ccsdk.docker.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>
@@ -119,6 +118,26 @@
                             </resources>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>copy-certificates</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <includes>
+                                        <include>*.pem</include>
+                                        <include>*.md</include>
+                                    </includes>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>

diff --git a/installation/ueb-listener/src/main/docker/Dockerfile b/installation/ueb-listener/src/main/docker/Dockerfile
index 746c6c5..8e1be78 100644 (file)
--- a/installation/ueb-listener/src/main/docker/Dockerfile
+++ b/installation/ueb-listener/src/main/docker/Dockerfile
@@ -1,8 +1,13 @@
 # Base alpine with added packages needed for open ecomp
-FROM onap/ccsdk-alpine-j17-image:${ccsdk.docker.version} AS stage0
+FROM onap/${ccsdk.docker.alpine.image}:${ccsdk.docker.alpine.version} AS stage0
 USER root
 ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
 
+# Copy any certs
+COPY *.md *.pem /etc/ssl/certs/
+
+# Install certs
+RUN update-ca-certificates
 
 # copy deliverables to opt
 COPY opt /opt
@@ -15,7 +20,7 @@ RUN zip -q -d /opt/onap/sdnc/ueb-listener/lib/log4j-core-*.jar org/apache/loggin
 
 # End of stage0
 
-FROM onap/ccsdk-alpine-j17-image:${ccsdk.docker.version}
+FROM onap/${ccsdk.docker.alpine.image}:${ccsdk.docker.alpine.version}
 MAINTAINER SDNC Team (onap-sdnc@lists.onap.org)
 
 ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties

diff --git a/installation/ueb-listener/src/main/resources/README-custom-certs.md b/installation/ueb-listener/src/main/resources/README-custom-certs.md
new file mode 100644 (file)
index 0000000..ac414c1
--- /dev/null
+++ b/installation/ueb-listener/src/main/resources/README-custom-certs.md
@@ -0,0 +1,3 @@
+Any .pem files in this directory will be copied to /etc/ssl/certs on the
+docker container and installed prior to running apk.  This might be needed,
+for example, for docker builds to work properly behind a corporate firewall.

diff --git a/pom.xml b/pom.xml
index e8f3b28..75356d0 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
         <relativePath/>
     </parent>
 
@@ -33,7 +33,8 @@
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>
         <ccsdk.bierman.api.version>1.0.0</ccsdk.bierman.api.version>
         <!-- docker images versions -->
-        <ccsdk.docker.alpine.j11.version>2.2.0</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener -->
+        <ccsdk.docker.alpine.image>ccsdk-alpine-j21-image</ccsdk.docker.alpine.image>
+        <ccsdk.docker.alpine.version>2.2.0</ccsdk.docker.alpine.version> <!-- Used by dmaap-listener, ueb-listener -->
         <ccsdk.docker.odlsli.alpine.version>2.2.0</ccsdk.docker.odlsli.alpine.version> <!-- Used by sdnc -->
         <ccsdk.docker.ansible.server.version>2.2.0</ccsdk.docker.ansible.server.version> <!-- Used by ansible-server -->
         <ccsdk.docker.ubuntu.version>2.2.0</ccsdk.docker.ubuntu.version> <!-- Used by admportal -->