diff options
| author |   sebdet <sebastien.determe@intl.att.com> | 2019-08-27 17:56:04 -0700 |
|---|---|---|
| committer | sebdet <sebastien.determe@intl.att.com> | 2019-08-28 15:59:05 +0200 |
| commit | 1e86592650fc695615e0fa34c947b32693d03466 (patch) | |
| tree | e970e02d2cb56c94276971a271f028db9471f0ac /src/main/docker | |
| parent | 56f5c144cfff229235817feda9baf4036b22156a (diff) | |
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>
Diffstat (limited to 'src/main/docker')
| -rw-r--r-- | src/main/docker/backend/backend-files.xml | 2 | ||||
| -rw-r--r-- | src/main/docker/frontend/Dockerfile | 6 | ||||
| -rw-r--r-- | src/main/docker/frontend/frontend-files.xml | 11 | ||||
| -rw-r--r-- | src/main/docker/frontend/nginx/nginx.conf | 23 |
4 files changed, 36 insertions, 6 deletions
diff --git a/src/main/docker/backend/backend-files.xml b/src/main/docker/backend/backend-files.xml index 7a9c6f530..c73c47f64 100644 --- a/src/main/docker/backend/backend-files.xml +++ b/src/main/docker/backend/backend-files.xml @@ -36,7 +36,7 @@ <include>${project.build.finalName}.jar</include> </includes> <directory>${project.build.directory}</directory> - <outputDirectory>/</outputDirectory> + <outputDirectory></outputDirectory> </fileSet> </fileSets> diff --git a/src/main/docker/frontend/Dockerfile b/src/main/docker/frontend/Dockerfile index 8c755b039..8cdad3088 100644 --- a/src/main/docker/frontend/Dockerfile +++ b/src/main/docker/frontend/Dockerfile @@ -46,7 +46,9 @@ RUN mkdir /var/log/onap 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 2610e828e..aaf32be81 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 000000000..5bcac5cfc --- /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 |