diff options
| -rw-r--r-- | SdncReports/pom.xml | 2 | ||||
| -rw-r--r-- | admportal/pom.xml | 2 | ||||
| -rw-r--r-- | configbackuprestore/pom.xml | 2 | ||||
| -rw-r--r-- | installation/sdnc/pom.xml | 20 | ||||
| -rwxr-xr-x | installation/sdnc/src/main/docker/Dockerfile | 6 | ||||
| -rw-r--r-- | installation/sdnc/src/main/resources/README-custom-certs.md | 3 | ||||
| -rwxr-xr-x | pom.xml | 20 |
7 files changed, 42 insertions, 13 deletions
diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml index ce15a0f1..ff923613 100644 --- 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>2.6.1</version> + <version>2.8.0</version> <relativePath/> </parent> diff --git a/admportal/pom.xml b/admportal/pom.xml index 3218e49b..b02d96c2 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.6.1</version> + <version>2.8.0</version> <relativePath/> </parent> diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml index 43157f2c..f2ea5714 100644 --- 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>2.6.1</version> + <version>2.8.0</version> </parent> <groupId>org.onap.sdnc.oam.vnfbackup</groupId> diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index f7ef8206..906c21bd 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -364,6 +364,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/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. @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.6.1</version> + <version>2.8.0</version> <relativePath/> </parent> @@ -25,18 +25,18 @@ <sdnc.project.version>${project.version}</sdnc.project.version> <!-- All Version definition is placed in org.onap.ccsdk.parent/odlparent-lite --> - <ccsdk.oran.a1adapter.version>1.8.0-SNAPSHOT</ccsdk.oran.a1adapter.version> - <sdnc.northbound.version>2.8.0-SNAPSHOT</sdnc.northbound.version> <!-- Used by installation/sdnc --> - <ccsdk.distribution.version>1.7.0-SNAPSHOT</ccsdk.distribution.version> - <ccsdk.sli.version>1.9.0-SNAPSHOT</ccsdk.sli.version> - <ccsdk.features.version>1.8.0-SNAPSHOT</ccsdk.features.version> + <ccsdk.oran.a1adapter.version>1.8.0</ccsdk.oran.a1adapter.version> + <sdnc.northbound.version>2.8.0</sdnc.northbound.version> <!-- Used by installation/sdnc --> + <ccsdk.distribution.version>1.7.0</ccsdk.distribution.version> + <ccsdk.sli.version>1.9.0</ccsdk.sli.version> + <ccsdk.features.version>1.8.0</ccsdk.features.version> <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>1.7.0-STAGING-latest</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener --> - <ccsdk.docker.odlsli.alpine.version>1.7.0-SNAPSHOT-latest</ccsdk.docker.odlsli.alpine.version> <!-- Used by sdnc --> - <ccsdk.docker.ansible.server.version>1.7.0-STAGING-latest</ccsdk.docker.ansible.server.version> <!-- Used by ansible-server --> - <ccsdk.docker.ubuntu.version>1.7.0-STAGING-latest</ccsdk.docker.ubuntu.version> <!-- Used by admportal --> + <ccsdk.docker.alpine.j11.version>1.7.0</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener --> + <ccsdk.docker.odlsli.alpine.version>1.7.0</ccsdk.docker.odlsli.alpine.version> <!-- Used by sdnc --> + <ccsdk.docker.ansible.server.version>1.7.0</ccsdk.docker.ansible.server.version> <!-- Used by ansible-server --> + <ccsdk.docker.ubuntu.version>1.7.0</ccsdk.docker.ubuntu.version> <!-- Used by admportal --> </properties> <modules> |