Merge pull request #110 from luismayta/feature/#107

Feature/#107
luismayta · Nov 23, 2017 · cf7d45d · cf7d45d
2 parents ca77b8e + 832a46c
commit cf7d45d
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 23 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-files = VERSION .bumpversion.cfg README.rst docs/conf.py
+files = VERSION .bumpversion.cfg README.rst docs/conf.py Dockerfile
 commit = True
 tag = False
 current_version = 0.1.0

diff --git a/Dockerfile b/Dockerfile
@@ -56,11 +56,11 @@ RUN apk add --update --no-cache --virtual .build-deps \
     && rm -rf /etc/nginx/conf.d/default.conf
 
 # Copy the modified Nginx conf
-COPY docker/templates/etc/nginx/nginx.conf /etc/nginx/nginx.conf
-COPY docker/templates/etc/nginx/conf.d/nginx.conf /etc/nginx/conf.d/
+COPY provision/docker/templates/etc/nginx/nginx.conf /etc/nginx/nginx.conf
+COPY provision/docker/templates/etc/nginx/conf.d/nginx.conf /etc/nginx/conf.d/
 # Custom Supervisord config
-COPY docker/templates/etc/supervisord.conf /etc/
-COPY docker/templates/etc/supervisor/conf.d/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+COPY provision/docker/templates/etc/supervisord.conf /etc/
+COPY provision/docker/templates/etc/supervisor/conf.d/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
 EXPOSE 80
 

diff --git a/Makefile b/Makefile
@@ -27,6 +27,8 @@ EXTRAS_DIR:= $(ROOT_DIR)/extras
 SCRIPT_DIR=$(EXTRAS_DIR)/scripts
 SOURCE_DIR=$(ROOT_DIR)/
 REQUIREMENTS_DIR=$(ROOT_DIR)/requirements/
+PROVISION_DIR=$(ROOT_DIR)/provision/
+DOCKER_COMPOSE_DIR=$(PROVISION_DIR)/docker-compose/
 FILE_README=$(ROOT_DIR)/README.rst
 
 include *.mk

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -15,7 +15,7 @@ services:
       - APP_NAME=python-facebook-chatbot
     build:
       context: .
-      dockerfile: docker/app/Dockerfile
+      dockerfile: provision/docker/app/Dockerfile
     volumes:
       - .:/usr/src
     env_file:
@@ -26,7 +26,7 @@ services:
     image: labpositiva/latex:3.6.1
     build:
       context: .
-      dockerfile: docker/docs/Dockerfile
+      dockerfile: provision/docker/docs/Dockerfile
     volumes:
       - .:/usr/src
     env_file:

diff --git a/docker.mk b/docker.mk
@@ -7,23 +7,23 @@ docker.run: clean
 	@if [ "${env}" == "" ]; then \
 		docker-compose run --rm --service-ports "${service}" bash; \
 	else \
-		docker-compose -f docker-compose.yml -f docker-compose/"${env}".yml run --rm --service-ports "${service}" bash; \
+		docker-compose -f docker-compose.yml -f $(DOCKER_COMPOSE_DIR)/"${env}".yml run --rm --service-ports "${service}" bash; \
 	fi
 
 docker.build: clean
 	@echo $(MESSAGE) "Building environment: ${env}"
 	@if [ "${env}" == "" ]; then \
 		docker-compose build; \
 	else \
-		docker-compose -f docker-compose.yml -f docker-compose/"${env}".yml build; \
+		docker-compose -f docker-compose.yml -f $(DOCKER_COMPOSE_DIR)/"${env}".yml build; \
 	fi
 
 docker.down: clean
 	@echo $(MESSAGE) "Down Services Environment: ${env}"
 	@if [ "${env}" == "" ]; then \
 		docker-compose -p "${PROJECT}" down --remove-orphans; \
 	else \
-		docker-compose -f docker-compose.yml -f docker-compose/"${env}".yml down --remove-orphans; \
+		docker-compose -f docker-compose.yml -f $(DOCKER_COMPOSE_DIR)/"${env}".yml down --remove-orphans; \
 	fi
 
 docker.ssh: clean
@@ -34,15 +34,15 @@ docker.status: clean
 	@if [ "${env}" == "" ]; then \
 		docker-compose -p "${PROJECT}" ps; \
 	else \
-		docker-compose -p "${PROJECT}" -f docker-compose.yml -f docker-compose/"${env}".yml ps; \
+		docker-compose -p "${PROJECT}" -f docker-compose.yml -f $(DOCKER_COMPOSE_DIR)/"${env}".yml ps; \
 	fi
 
 docker.stop: clean
 	@echo $(MESSAGE) "Stop Services: ${env}"
 	@if [ "${env}" == "" ]; then \
 		docker-compose -p "${PROJECT}" stop; \
 	else \
-		docker-compose -f docker-compose.yml -f docker-compose/"${env}".yml stop; \
+		docker-compose -f docker-compose.yml -f $(DOCKER_COMPOSE_DIR)/"${env}".yml stop; \
 	fi
 
 docker.cleanup: clean
@@ -59,13 +59,13 @@ docker.up: clean
 	@if [ "${env}" == "" ]; then \
 		docker-compose -p "${PROJECT}" up --remove-orphans; \
 	else \
-		docker-compose -f docker-compose.yml -f docker-compose/"${env}".yml up --remove-orphans; \
+		docker-compose -f docker-compose.yml -f $(DOCKER_COMPOSE_DIR)/"${env}".yml up --remove-orphans; \
 	fi
 
 docker.list: clean
 	@echo $(MESSAGE) "List Services: ${env}"
 	@if [ "${env}" == "" ]; then \
 		docker-compose -p "${PROJECT_DEV}" ps; \
 	else \
-		docker-compose -f docker-compose.yml -f docker-compose/"${env}".yml ps; \
+		docker-compose -f docker-compose.yml -f $(DOCKER_COMPOSE_DIR)/"${env}".yml ps; \
 	fi
diff --git a/docker-compose/prod.yml → provision/docker-compose/prod.yml b/docker-compose/prod.yml → provision/docker-compose/prod.yml
diff --git a/docker-compose/stage.yml → provision/docker-compose/stage.yml b/docker-compose/stage.yml → provision/docker-compose/stage.yml
diff --git a/docker-compose/test.yml → provision/docker-compose/test.yml b/docker-compose/test.yml → provision/docker-compose/test.yml
@@ -10,4 +10,4 @@ services:
       - APP_NAME=python-facebook-chatbot
     build:
       context: .
-      dockerfile: docker/app-test/Dockerfile
+      dockerfile: provision/docker/app-test/Dockerfile
diff --git a/docker/app-test/Dockerfile → provision/docker/app-test/Dockerfile b/docker/app-test/Dockerfile → provision/docker/app-test/Dockerfile
@@ -56,11 +56,11 @@ RUN apk add --update --no-cache --virtual .build-deps \
     && rm -rf /etc/nginx/conf.d/default.conf
 
 # Copy the modified Nginx conf
-COPY docker/templates/etc/nginx/nginx.conf /etc/nginx/nginx.conf
-COPY docker/templates/etc/nginx/conf.d/nginx.conf /etc/nginx/conf.d/
+COPY provision/docker/templates/etc/nginx/nginx.conf /etc/nginx/nginx.conf
+COPY provision/docker/templates/etc/nginx/conf.d/nginx.conf /etc/nginx/conf.d/
 # Custom Supervisord config
-COPY docker/templates/etc/supervisord.conf /etc/
-COPY docker/templates/etc/supervisor/conf.d/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+COPY provision/docker/templates/etc/supervisord.conf /etc/
+COPY provision/docker/templates/etc/supervisor/conf.d/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
 EXPOSE 80
 

diff --git a/docker/app/Dockerfile → provision/docker/app/Dockerfile b/docker/app/Dockerfile → provision/docker/app/Dockerfile
@@ -56,11 +56,11 @@ RUN apk add --update --no-cache --virtual .build-deps \
     && rm -rf /etc/nginx/conf.d/default.conf
 
 # Copy the modified Nginx conf
-COPY docker/templates/etc/nginx/nginx.conf /etc/nginx/nginx.conf
-COPY docker/templates/etc/nginx/conf.d/nginx.conf /etc/nginx/conf.d/
+COPY provision/docker/templates/etc/nginx/nginx.conf /etc/nginx/nginx.conf
+COPY provision/docker/templates/etc/nginx/conf.d/nginx.conf /etc/nginx/conf.d/
 # Custom Supervisord config
-COPY docker/templates/etc/supervisord.conf /etc/
-COPY docker/templates/etc/supervisor/conf.d/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+COPY provision/docker/templates/etc/supervisord.conf /etc/
+COPY provision/docker/templates/etc/supervisor/conf.d/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
 EXPOSE 80
 

diff --git a/docker/docs/Dockerfile → provision/docker/docs/Dockerfile b/docker/docs/Dockerfile → provision/docker/docs/Dockerfile
diff --git a/docker/templates/etc/nginx/conf.d/nginx.conf → ...ker/templates/etc/nginx/conf.d/nginx.conf b/docker/templates/etc/nginx/conf.d/nginx.conf → ...ker/templates/etc/nginx/conf.d/nginx.conf
diff --git a/docker/templates/etc/nginx/nginx.conf → ...ion/docker/templates/etc/nginx/nginx.conf b/docker/templates/etc/nginx/nginx.conf → ...ion/docker/templates/etc/nginx/nginx.conf
diff --git a/...es/etc/supervisor/conf.d/supervisord.conf → ...es/etc/supervisor/conf.d/supervisord.conf b/...es/etc/supervisor/conf.d/supervisord.conf → ...es/etc/supervisor/conf.d/supervisord.conf
diff --git a/docker/templates/etc/supervisord.conf → ...ion/docker/templates/etc/supervisord.conf b/docker/templates/etc/supervisord.conf → ...ion/docker/templates/etc/supervisord.conf