diff options
| author |   k.kedron <k.kedron@partner.samsung.com> | 2019-08-28 14:31:52 +0200 |
|---|---|---|
| committer |   Ofir Sonsino <ofir.sonsino@intl.att.com> | 2019-08-30 07:46:34 +0000 |
| commit | 64636c2148414c1fa5da4b46a69570cdab003837 (patch) | |
| tree | ada4dc163443427420217de5e716b532329ff255 /docker/docker_be/Dockerfile | |
| parent | 5a4e1827b867a2de46c14f32449b37d0ff60d1fd (diff) | |
Fully HTTPS support in the dcaedt-be
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.
-Add support for change the http to https in the python script
-Added buildRestClient method to create the CloseableHttpClient
supporting the SSL connection
-Checkstyle in the recipes
-Update the docker_run.sh:
- Change JAVA_OPTIONS
- Used the secure connection to do health check
Issue-ID: SDC-2477
Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com>
Change-Id: I7bf3d307e5765fa75a37ba0a4b41fd7fa87d28ab
Diffstat (limited to 'docker/docker_be/Dockerfile')
| -rw-r--r-- | docker/docker_be/Dockerfile | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/docker/docker_be/Dockerfile b/docker/docker_be/Dockerfile index ae6826c..c9eccf6 100644 --- a/docker/docker_be/Dockerfile +++ b/docker/docker_be/Dockerfile @@ -1,25 +1,17 @@ -FROM onap/base_sdc-jetty:1.2.0-SNAPSHOT-latest +FROM onap/base_sdc-jetty:1.4.1 -COPY chef-solo /var/opt/dcae-be/chef-solo/ +COPY chef-solo /root/chef-solo/ -COPY startup.sh /var/opt/dcae-be/ +COPY chef-repo/cookbooks /root/chef-solo/cookbooks/ -ADD target/dcae.war ${JETTY_BASE}/webapps/ +ADD --chown=jetty:jetty target/dcae.war ${JETTY_BASE}/webapps/ USER root -COPY set_user.sh /tmp/set_user.sh +RUN apk add --no-cache python -RUN sh -x /tmp/set_user.sh && rm -f /tmp/set_user.sh +COPY startup.sh /root/ -RUN mkdir -p /opt/logs/be +RUN chmod 770 /root/startup.sh -RUN chown -R jetty:jetty ${JETTY_BASE}/webapps /var/opt/dcae-be /opt/logs /var/lib/jetty - -RUN chmod 770 /var/opt/dcae-be/startup.sh - -EXPOSE 8082 8444 - -USER jetty - -ENTRYPOINT [ "/var/opt/dcae-be/startup.sh" ] +ENTRYPOINT [ "/root/startup.sh" ] |