Fix frontend docker
Fix the frontend docker in Nginx with https for backend in https as well
Issue-ID: CLAMP-486
Change-Id: I33fd89289618affa5e734c80991aaefece31309e
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
diff --git a/src/main/docker/frontend/Dockerfile b/src/main/docker/frontend/Dockerfile
index 8c755b0..8cdad30 100644
--- a/src/main/docker/frontend/Dockerfile
+++ b/src/main/docker/frontend/Dockerfile
@@ -46,7 +46,9 @@
RUN chmod a+rwx /var/log/onap
COPY --from=build /app/build /usr/share/nginx/html
+COPY --from=build /app/ssl /etc/ssl
RUN rm /etc/nginx/conf.d/default.conf
-COPY onap-clamp-frontend/nginx/nginx.conf /etc/nginx/conf.d
-EXPOSE 80
+#COPY onap-clamp-frontend/nginx/nginx.conf /etc/nginx/conf.d
+COPY nginx/nginx.conf /etc/nginx/conf.d
+EXPOSE 443
CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
diff --git a/src/main/docker/frontend/frontend-files.xml b/src/main/docker/frontend/frontend-files.xml
index 2610e82..aaf32be 100644
--- a/src/main/docker/frontend/frontend-files.xml
+++ b/src/main/docker/frontend/frontend-files.xml
@@ -17,7 +17,7 @@
limitations under the License.
============LICENSE_END=========================================================
-->
-
+
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -35,8 +35,13 @@
<excludes>
<exclude>node_modules</exclude>
</excludes>
- <directory>${project.basedir}/ui-react</directory>
- <outputDirectory>/</outputDirectory>
+ <directory>${project.build.directory}/${ui.react.src}</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ <!-- include ssl certificates files obtain from aaf p12 -->
+ <fileSet>
+ <directory>${project.basedir}/src/main/resources/clds/aaf/ssl</directory>
+ <outputDirectory>ssl</outputDirectory>
</fileSet>
</fileSets>
diff --git a/src/main/docker/frontend/nginx/nginx.conf b/src/main/docker/frontend/nginx/nginx.conf
new file mode 100644
index 0000000..5bcac5c
--- /dev/null
+++ b/src/main/docker/frontend/nginx/nginx.conf
@@ -0,0 +1,23 @@
+server {
+
+ listen 443 default ssl;
+ ssl_protocols TLSv1.2;
+ ssl_certificate /etc/ssl/clamp.pem;
+ ssl_certificate_key /etc/ssl/clamp.key;
+ location /restservices/clds/ {
+ proxy_pass https://clamp-backend:8443;
+ }
+
+ location / {
+ root /usr/share/nginx/html;
+ index index.html index.htm;
+ try_files $uri $uri/ /index.html;
+ }
+
+ error_page 500 502 503 504 /50x.html;
+
+ location = /50x.html {
+ root /usr/share/nginx/html;
+ }
+
+}
\ No newline at end of file