diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml index ce15a0f15..ff9236137 100644 --- a/SdncReports/pom.xml +++ b/SdncReports/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent spring-boot-1-starter-parent - 2.6.1 + 2.8.0 diff --git a/admportal/pom.xml b/admportal/pom.xml index 3218e49be..b02d96c25 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.6.1 + 2.8.0 diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml index 43157f2c0..f2ea5714b 100644 --- a/configbackuprestore/pom.xml +++ b/configbackuprestore/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent spring-boot-1-starter-parent - 2.6.1 + 2.8.0 org.onap.sdnc.oam.vnfbackup diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index f7ef8206b..906c21bdf 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -364,6 +364,26 @@ + + copy-certificates + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main/resources + + *.pem + *.md + + false + + + + diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile index e281d16ba..4946dfe1e 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 000000000..ac414c11c --- /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 6461989ee..34a54cbfe 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.6.1 + 2.8.0 @@ -25,18 +25,18 @@ ${project.version} - 1.8.0-SNAPSHOT - 2.8.0-SNAPSHOT - 1.7.0-SNAPSHOT - 1.9.0-SNAPSHOT - 1.8.0-SNAPSHOT + 1.8.0 + 2.8.0 + 1.7.0 + 1.9.0 + 1.8.0 ${ccsdk.sli.version} 1.0.0 - 1.7.0-STAGING-latest - 1.7.0-SNAPSHOT-latest - 1.7.0-STAGING-latest - 1.7.0-STAGING-latest + 1.7.0 + 1.7.0 + 1.7.0 + 1.7.0