summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2024-06-03 15:14:02 -0400
committerDan Timoney <dtimoney@att.com>2024-06-03 15:14:02 -0400
commitbcbcbb926d0c7a686b4eba7475710e4054d084c6 (patch)
tree406aa8639e2e65e13d5338a13060c0a36c1bfb1c
parentd8df924a5b636ccc0ea51bbddc24f269226c1245 (diff)
Update versions2.6.1
Update versions to install latest Montreal patches Issue-ID: CCSDK-4004 Change-Id: I2516633ed55b278f0c64771089b87814dc9c008a Signed-off-by: Dan Timoney <dtimoney@att.com>
-rw-r--r--installation/sdnc/pom.xml21
-rwxr-xr-xinstallation/sdnc/src/main/docker/Dockerfile6
-rw-r--r--installation/sdnc/src/main/resources/README-custom-certs.md3
-rwxr-xr-xpom.xml14
4 files changed, 37 insertions, 7 deletions
diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index 12f6bdd3..6dfac5af 100644
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -361,6 +361,27 @@
</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/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile
index e281d16b..4946dfe1 100755
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@ -16,6 +16,12 @@ ENV SDNC_SECUREPORT ${sdnc.secureport}
ARG AAF=false
+# Copy any certs
+COPY *.md *.pem /etc/ssl/certs/
+
+# Install certs
+RUN update-ca-certificates
+
# Copy deliverables to opt
COPY opt /opt
RUN test -L /opt/sdnc || ln -s /opt/onap/sdnc /opt/sdnc
diff --git a/installation/sdnc/src/main/resources/README-custom-certs.md b/installation/sdnc/src/main/resources/README-custom-certs.md
new file mode 100644
index 00000000..ac414c11
--- /dev/null
+++ b/installation/sdnc/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 be31018b..9f610d13 100755
--- a/pom.xml
+++ b/pom.xml
@@ -27,16 +27,16 @@
<!-- All Version definition is placed in org.onap.ccsdk.parent/odlparent-lite -->
<ccsdk.oran.a1adapter.version>1.6.1</ccsdk.oran.a1adapter.version>
<sdnc.northbound.version>2.6.0</sdnc.northbound.version> <!-- Used by installation/sdnc -->
- <ccsdk.distribution.version>1.6.1</ccsdk.distribution.version>
- <ccsdk.sli.version>1.7.1</ccsdk.sli.version>
- <ccsdk.features.version>1.6.3-SNAPSHOT</ccsdk.features.version>
+ <ccsdk.distribution.version>1.6.2</ccsdk.distribution.version>
+ <ccsdk.sli.version>1.7.3</ccsdk.sli.version>
+ <ccsdk.features.version>1.6.3</ccsdk.features.version>
<ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>
<ccsdk.bierman.api.version>1.1.0</ccsdk.bierman.api.version>
<!-- docker images versions -->
- <ccsdk.docker.alpine.j11.version>1.6.1-STAGING-latest</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener -->
- <ccsdk.docker.odlsli.alpine.version>1.6.1-SNAPSHOT-latest</ccsdk.docker.odlsli.alpine.version> <!-- Used by sdnc -->
- <ccsdk.docker.ansible.server.version>1.6.1-STAGING-latest</ccsdk.docker.ansible.server.version> <!-- Used by ansible-server -->
- <ccsdk.docker.ubuntu.version>1.6.1-STAGING-latest</ccsdk.docker.ubuntu.version> <!-- Used by admportal -->
+ <ccsdk.docker.alpine.j11.version>1.6.2</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener -->
+ <ccsdk.docker.odlsli.alpine.version>1.6.2</ccsdk.docker.odlsli.alpine.version> <!-- Used by sdnc -->
+ <ccsdk.docker.ansible.server.version>1.6.2</ccsdk.docker.ansible.server.version> <!-- Used by ansible-server -->
+ <ccsdk.docker.ubuntu.version>1.6.2</ccsdk.docker.ubuntu.version> <!-- Used by admportal -->
</properties>
<modules>