diff --git a/.bowerrc b/.bowerrc
index 8c58c8e..273e1f1 100644
--- a/.bowerrc
+++ b/.bowerrc
@@ -1,3 +1,5 @@
{
- "directory": "app/bower_components"
-}
\ No newline at end of file
+ "directory": "app/bower_components",
+ "allow_root": true,
+ "analytics": true
+}
diff --git a/Dockerfile b/Dockerfile
index 8f9af5d..61a326b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,9 +7,8 @@ ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
-RUN apt-get update
-RUN apt-get install -yq apache2 npm nodejs-legacy supervisor ruby
-RUN npm install -g grunt-cli
+RUN apt-get update && apt-get install -yq git apache2 npm nodejs-legacy supervisor ruby
+RUN npm install -g grunt-cli bower
RUN gem install sass
RUN mkdir -p /var/lock/apache2 /var/run/apache2 /var/run/sshd /var/log/supervisor
@@ -21,11 +20,11 @@ ADD container/000-default.conf etc/apache2/sites-enabled/000-default.conf
ADD container/ports.conf etc/apache2/ports.conf
ADD /package.json /opt/adagios-frontend/package.json
-RUN cd /opt/adagios-frontend/ && npm install
ADD /.bowerrc /opt/adagios-frontend/.bowerrc
ADD /.jshintrc /opt/adagios-frontend/.jshintrc
ADD /Gruntfile.js /opt/adagios-frontend/Gruntfile.js
ADD /bower.json /opt/adagios-frontend/bower.json
+RUN cd /opt/adagios-frontend/ && npm install --unsafe-perm
ADD /app /opt/adagios-frontend/app
RUN a2enmod proxy
diff --git a/container/000-default.conf b/container/000-default.conf
old mode 100644
new mode 100755
index 8a5c53a..5efb39f
--- a/container/000-default.conf
+++ b/container/000-default.conf
@@ -1,16 +1,14 @@
+
+ Order allow,deny
+ Allow from all
+ Require all granted
+
+
+ Alias / /opt/adagios-frontend/app/
+
ProxyPreserveHost On
- # Servers to proxy the connection, or;
- # List of application servers:
- # Usage:
- # ProxyPass / http://[IP Addr.]:[port]/
- # ProxyPassReverse / http://[IP Addr.]:[port]/
- # Example:
- ProxyPass / http://localhost:8000/app/
- ProxyPassReverse / http://localhost:8000/app/
-
- ProxyPass /surveil http://surveil:8080/
- ProxyPassReverse /surveil http://surveil:8080/
-
+ ProxyPass /surveil/ http://surveil:8080/
+ ProxyPassReverse /surveil/ http://surveil:8080/
diff --git a/container/supervisord.conf b/container/supervisord.conf
old mode 100644
new mode 100755
index 7f56a35..6052d46
--- a/container/supervisord.conf
+++ b/container/supervisord.conf
@@ -4,9 +4,6 @@ nodaemon=true
[program:apache2]
command=/bin/bash -c "source /etc/apache2/envvars && exec /usr/sbin/apache2 -DFOREGROUND"
-[program:npm]
-command=/bin/bash -c "npm start /opt/adagios-frontend"
-
[program:grunt]
command=/bin/bash -c "cd /opt/adagios-frontend && grunt sass && grunt uglify && grunt"