Merge pull request #39 from svscorp/master

Refactoring; html folder creation added - fixes container start failure (target not found: /usr/share/nging/html)
Accenture · Aug 7, 2017 · 8fec90c · 8fec90c
2 parents 5f4d98d + 6794ff5
commit 8fec90c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/resources/configuration/sites-enabled/service-extension/service-extension.conf.template b/resources/configuration/sites-enabled/service-extension/service-extension.conf.template
@@ -1,3 +1,3 @@
 location /<service-name>{
-   proxy_pass  http://<service-container>:<port>
+   proxy_pass  http://<service-container>:<port>;
 }
diff --git a/resources/configuration/sites-enabled/tools-context.conf b/resources/configuration/sites-enabled/tools-context.conf
@@ -96,6 +96,6 @@ server {
         proxy_redirect off;
         proxy_pass http://ldap-phpadmin;
     }
-    include /etc/nginx/sites-enabled/service-extension/*.conf;
 
+    include /etc/nginx/sites-enabled/service-extension/*.conf;
 }
diff --git a/resources/scripts/entrypoint.sh b/resources/scripts/entrypoint.sh
@@ -2,7 +2,7 @@
 set -e
 
 cp -R /resources/configuration/* /etc/nginx/
-cp -R /resources/release_note/* /usr/share/nginx/html/
+mkdir -p /usr/share/nginx/html/ && cp -R /resources/release_note/* /usr/share/nginx/html/
 
 # Auto populate the release note page with the blueprints
 /resources/scripts/reload_release_notes.sh