From 7862fb5ae920cc916781184fd78fdbe1a264d08b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vachon?= <fredvac@gmail.com>
Date: Mon, 20 Apr 2015 14:52:15 -0400
Subject: [PATCH] Adapt dockerfile for docker

---
 container/Dockerfile => Dockerfile | 14 +++++++++++---
 Makefile                           |  4 ++--
 2 files changed, 13 insertions(+), 5 deletions(-)
 rename container/Dockerfile => Dockerfile (56%)

diff --git a/container/Dockerfile b/Dockerfile
similarity index 56%
rename from container/Dockerfile
rename to Dockerfile
index be3b066..11ac15f 100644
--- a/container/Dockerfile
+++ b/Dockerfile
@@ -14,11 +14,19 @@ RUN gem install sass
 RUN mkdir -p /var/lock/apache2 /var/run/apache2 /var/run/sshd /var/log/supervisor
 
 # Add supervisor config files
-COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+COPY container/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
 # Configure Apache2 for reverse-proxying
-ADD 000-default.conf etc/apache2/sites-enabled/000-default.conf
-ADD ports.conf etc/apache2/ports.conf
+ADD container/000-default.conf etc/apache2/sites-enabled/000-default.conf
+ADD container/ports.conf etc/apache2/ports.conf
+
+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
+ADD /package.json /opt/adagios-frontend/package.json
+ADD /app /opt/adagios-frontend/app
+
 RUN a2enmod proxy
 RUN a2enmod proxy_http
 
diff --git a/Makefile b/Makefile
index b36bcf6..e6998ae 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,10 @@ all: build daemon
 clean: kill remove
 
 build:
-	sudo docker build -t adg-fe container
+	sudo docker build -t adg-fe .
 
 rebuild:
-	sudo docker build --no-cache -t adg-fe container
+	sudo docker build --no-cache -t adg-fe .
 
 interactive:
 	sudo docker run -p 8080:8080 -v ${PWD}:/opt/adagios-frontend -i -t --name adg-fe adg-fe bash