diff options
| author |   Dan Timoney <dtimoney@att.com> | 2024-06-03 15:14:02 -0400 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2024-06-03 15:14:02 -0400 |
| commit | bcbcbb926d0c7a686b4eba7475710e4054d084c6 (patch) | |
| tree | 406aa8639e2e65e13d5338a13060c0a36c1bfb1c /installation | |
| parent | d8df924a5b636ccc0ea51bbddc24f269226c1245 (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>
Diffstat (limited to 'installation')
| -rw-r--r-- | installation/sdnc/pom.xml | 21 | ||||
| -rwxr-xr-x | installation/sdnc/src/main/docker/Dockerfile | 6 | ||||
| -rw-r--r-- | installation/sdnc/src/main/resources/README-custom-certs.md | 3 |
3 files changed, 30 insertions, 0 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. |