depends_on:
- clamp-backend
ports:
- - "443:443"
+ - "2443:2443"
db:
image: mariadb:10.4.7
volumes:
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.clamp</groupId>
<artifactId>clds</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.1-SNAPSHOT</version>
<name>clamp</name>
COPY --from=build /app/ssl /etc/ssl\r
RUN rm /etc/nginx/conf.d/default.conf\r
RUN ln -sf /dev/stdout /var/log/nginx/access.log && ln -sf /dev/stderr /var/log/nginx/error.log\r
-COPY nginx/nginx.conf /etc/nginx/conf.d\r
-EXPOSE 443\r
+\r
+COPY nginx/nginx.conf /etc/nginx/nginx.conf\r
+COPY nginx/default.conf /etc/nginx/conf.d/default.conf\r
+\r
+WORKDIR /app\r
+\r
+RUN chown -R clamp:onap /app && chmod -R 755 /app && \\r
+ chown -R clamp:onap /var/cache/nginx && \\r
+ chown -R clamp:onap /var/log/nginx && \\r
+ chown -R clamp:onap /etc/nginx/conf.d\r
+RUN touch /var/run/nginx.pid && \\r
+ chown -R clamp:onap /var/run/nginx.pid\r
+\r
USER clamp\r
+EXPOSE 2443\r
CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
--- /dev/null
+server {
+
+ listen 2443 default ssl;
+ ssl_protocols TLSv1.2;
+ ssl_certificate /etc/ssl/clamp.pem;
+ ssl_certificate_key /etc/ssl/clamp.key;
+ ssl_verify_client optional_no_ca;
+ location /restservices/clds/ {
+ proxy_pass https://clamp-backend:8443;
+ proxy_set_header X-SSL-Cert $ssl_client_escaped_cert;
+ }
+
+ 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
-server {
-
- listen 443 default ssl;
- ssl_protocols TLSv1.2;
- ssl_certificate /etc/ssl/clamp.pem;
- ssl_certificate_key /etc/ssl/clamp.key;
- ssl_verify_client optional_no_ca;
- location /restservices/clds/ {
- proxy_pass https://clamp-backend:8443;
- proxy_set_header X-SSL-Cert $ssl_client_escaped_cert;
- }
-
- 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
+worker_processes 1;
+pid /var/run/nginx.pid;
+error_log /dev/stdout info;
+events {
+}
+http {
+ include /etc/nginx/mime.types;
+ default_type application/octet-stream;
+ log_format main '$remote_addr - $remote_user [$time_local] "$request" '
+ '$status $body_bytes_sent "$http_referer" '
+ '"$http_user_agent" "$http_x_forwarded_for"';
+ access_log /var/log/nginx/access.log main;
+ sendfile on;
+ #tcp_nopush on;
+ keepalive_timeout 65;
+ #gzip on;
+ include /etc/nginx/conf.d/*.conf;
+ }
\ No newline at end of file
major=5
minor=0
-patch=0
+patch=1
base_version=${major}.${minor}.${patch}