From 073968ee68167f3960ec5d82a37dc9168427788d Mon Sep 17 00:00:00 2001
From: FORESTIER Fabien <fabien.forestier@soprasteria.com>
Date: Fri, 13 Apr 2018 17:29:21 +0200
Subject: [PATCH] Adding CI conf for development and staging

---
 .gitlab-ci.yml                  | 22 ++++++++++++++++++++--
 docker-compose-development.yml  | 11 +++++++++++
 docker-compose-staging.yml      |  2 +-
 webapp-nginx.conf => nginx.conf |  0
 4 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 docker-compose-development.yml
 rename webapp-nginx.conf => nginx.conf (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 852b1b30..894aa409 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,16 +2,34 @@ stages:
   - build
   - deploy
 
-build:
+build_development:
+  stage: build
+  only:
+    - master
+  script:
+    - docker-compose -f docker-compose-development.yml build
+    
+deploy_development:
+  stage: deploy
+  only:
+    - master
+  script:
+    - docker-compose -f docker-compose-development.yml up -d
+  environment:
+    name: development
+
+build_staging:
   stage: build
   only:
     - staging
   script:
     - docker-compose -f docker-compose-staging.yml build
     
-deploy:
+deploy_staging:
   stage: deploy
   only:
     - staging
   script:
     - docker-compose -f docker-compose-staging.yml up -d
+  environment:
+    name: staging
diff --git a/docker-compose-development.yml b/docker-compose-development.yml
new file mode 100644
index 00000000..c7628bc2
--- /dev/null
+++ b/docker-compose-development.yml
@@ -0,0 +1,11 @@
+version: "2"
+
+services:
+  nginx-app:
+    build:
+      context: ./
+    volumes: 
+      - ./nginx.conf:/etc/nginx/conf.d/default.conf
+    ports: 
+      - 8081:8080
+  
\ No newline at end of file
diff --git a/docker-compose-staging.yml b/docker-compose-staging.yml
index 22482ced..73cbe80d 100644
--- a/docker-compose-staging.yml
+++ b/docker-compose-staging.yml
@@ -5,7 +5,7 @@ services:
     build:
       context: ./
     volumes: 
-      - ./webapp-nginx.conf:/etc/nginx/conf.d/default.conf
+      - ./nginx.conf:/etc/nginx/conf.d/default.conf
     ports: 
       - 8080:8080
   
\ No newline at end of file
diff --git a/webapp-nginx.conf b/nginx.conf
similarity index 100%
rename from webapp-nginx.conf
rename to nginx.conf
-- 
GitLab