diff options
| author |   k.kedron <k.kedron@partner.samsung.com> | 2019-08-23 17:11:51 +0200 |
|---|---|---|
| committer | k.kedron <k.kedron@partner.samsung.com> | 2019-08-27 17:57:22 +0200 |
| commit | 6fd60f573407abcd258ca4463836328ba039f50e (patch) | |
| tree | 871d5531c0a137d24d28af643edb65ed4ca47625 /docker/Dockerfile | |
| parent | c69e72cb78fb8e6d7a4f3698f6598f418fdcb727 (diff) | |
Implement HTTPS calls into DCAE-DS FE
Implemented HTTPS calls into dcae-ds fe:
-Added p12 keystore certificate.
-Updated application configuration.
-Added trust-store.
-Updated the onap/base_sdc-jetty docker image version
-Updated the chef script to properly used of the new docker image
Issue-ID: SDC-2533
Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com>
Change-Id: I1bac50ff08aa4f703de458661c9d52f985c4a75d
Diffstat (limited to 'docker/Dockerfile')
| -rw-r--r-- | docker/Dockerfile | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index e6b9a36..ed54b2b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,26 +1,15 @@ -FROM onap/base_sdc-jetty:1.2.0-SNAPSHOT-latest +FROM onap/base_sdc-jetty:1.4.1 -COPY chef-solo /var/opt/dcae-fe/chef-solo/ +COPY chef-solo /root/chef-solo/ -COPY startup.sh /var/opt/dcae-fe/ +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 -RUN mkdir -p /opt/logs/fe +COPY startup.sh /root/ -COPY set_user.sh /tmp/set_user.sh - -RUN sh -x /tmp/set_user.sh && rm -f /tmp/set_user.sh - -RUN chown -R jetty:jetty ${JETTY_BASE}/webapps /var/opt/dcae-fe /opt/logs /var/lib/jetty - -RUN chmod 770 /var/opt/dcae-fe/startup.sh - -EXPOSE 8082 8444 - -USER jetty - -ENTRYPOINT [ "/var/opt/dcae-fe/startup.sh" ] +RUN chmod 770 /root/startup.sh +ENTRYPOINT [ "/root/startup.sh" ] |