diff options
author | k.kedron <k.kedron@partner.samsung.com> | 2019-09-05 17:50:23 +0200 |
---|---|---|
committer | Ofir Sonsino <ofir.sonsino@intl.att.com> | 2019-09-06 09:11:47 +0000 |
commit | 176a760ebe4293c19eeb96cf88269215fce870a9 (patch) | |
tree | c559a1f2bafbf6147612b88a46a0299a579af57f /docker/docker_tools/Dockerfile | |
parent | 64636c2148414c1fa5da4b46a69570cdab003837 (diff) |
Fully HTTPS support in the dcaedt-tools
Fully HTTPS support:
-Updated the onap/base_sdc-jetty docker image version
-Updated the chef script to properly used of the new docker image
-Updated jvm configuration to support call to
the SDC components using HTTPS.
-Added buildRestClient method to create the DcaeRestClient
supporting the SSL connection
-Checkstyle in the recipes adn tools.Main method
-Update the docker_run.sh:
- Change JAVA_OPTIONS
-Update docker_run script
-Add proper dependency in the pom (waiting for solving the SDC-2554 bug)
Issue-ID: SDC-2552
Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com>
Change-Id: Ie8dd1f54619f1101c13de13ae3cbb296bba57210
Diffstat (limited to 'docker/docker_tools/Dockerfile')
-rw-r--r-- | docker/docker_tools/Dockerfile | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/docker/docker_tools/Dockerfile b/docker/docker_tools/Dockerfile index 4a36f7d..d80d62b 100644 --- a/docker/docker_tools/Dockerfile +++ b/docker/docker_tools/Dockerfile @@ -1,20 +1,17 @@ -FROM onap/base_sdc-jetty:1.2.0-SNAPSHOT-latest +FROM onap/base_sdc-jetty:1.4.1 -USER root - -RUN adduser -h /home/dcae -s /bin/sh -D dcae +COPY chef-solo /root/chef-solo/ -COPY target/dcaedt_tools-*.jar /var/opt/dcae-tools/app/dcaedt_tools.jar +COPY chef-repo/cookbooks /root/chef-solo/cookbooks/ -COPY chef-solo /var/opt/dcae-tools/chef-solo/ +ADD --chown=jetty:jetty target/dcaedt_tools-*.jar ${JETTY_BASE}/webapps/dcaedt_tools.jar -COPY startup.sh /var/opt/dcae-tools - -RUN chmod 775 /var/opt/dcae-tools/startup.sh +USER root -RUN chown -R dcae /var/opt/dcae-tools +RUN apk add --no-cache python -USER dcae +COPY startup.sh /root/ -ENTRYPOINT [ "/var/opt/dcae-tools/startup.sh" ] +RUN chmod 770 /root/startup.sh +ENTRYPOINT [ "/root/startup.sh" ] |