From aa13efc651bf7bef4047c9a832622896894da685 Mon Sep 17 00:00:00 2001
From: Sebastian Frank <frank@basiskonfiguration.de>
Date: Fri, 8 Sep 2017 12:23:34 +0200
Subject: [PATCH] review via docker app

---
 .gitlab-ci.yml | 117 ++++++++++++++++++++++++++++---------------------
 1 file changed, 68 insertions(+), 49 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 43d5fe7..b71396d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 stages:
     - build
 #    - test
-    - deploy
+    - review
 
 build_ui:
     image: node
@@ -23,62 +23,81 @@ build_ui:
             - build
             - conf
             - index.html
+            - Dockerfile
+            - docker-compose.yml
+
+
+#start_review:
+#    image: mwienk/docker-lftp
+#    tags:
+#        - docker
+#    dependencies:
+#        - build_ui
+#    stage: deploy
+#    script:
+#        - cat index.html
+#        - mkdir _for_upload
+#        - mv assets build conf index.html _for_upload
+#        - lftp -c "set sftp:auto-confirm yes; open -u intern_basispanel_ui,$FTP_PASSWORD sftp://ftp.basehosts.de;mkdir -f /$CI_COMMIT_REF_NAME; mirror -v -n -e -R -L _for_upload/ /$CI_COMMIT_REF_NAME"
+#    environment:
+#        name: review/$CI_COMMIT_REF_NAME
+#        url: http://ui.basispanel.de/$CI_COMMIT_REF_NAME/
+#        on_stop: stop_review
+#        
+#stop_review:
+#    image: mwienk/docker-lftp
+#    tags:
+#        - docker
+#    stage: deploy
+#    variables:
+#        GIT_STRATEGY: none
+#    script:
+#        - echo stopping env
+#    environment:
+#        name: review/$CI_COMMIT_REF_NAME
+#        action: stop
+#    when: manual
+#
+#
+#
+#fullsync_review:
+#    image: mwienk/docker-lftp
+#    tags:
+#        - docker
+#    dependencies:
+#        - build_ui
+#    stage: deploy
+#    script:
+#        - mkdir _for_upload
+#        - mv assets build conf index.html _for_upload
+#        - lftp -c "set sftp:auto-confirm yes; open -u intern_basispanel_ui,$FTP_PASSWORD sftp://ftp.basehosts.de;mkdir -f /$CI_COMMIT_REF_NAME; mirror -v --transfer-all -e -R -L _for_upload/ /$CI_COMMIT_REF_NAME"
+#    when: manual
 
 
 start_review:
-    image: mwienk/docker-lftp
-    tags:
-        - docker
-    dependencies:
-        - build_ui
-    stage: deploy
-    script:
-        - cat index.html
-        - mkdir _for_upload
-        - mv assets build conf index.html _for_upload
-        - lftp -c "set sftp:auto-confirm yes; open -u intern_basispanel_ui,$FTP_PASSWORD sftp://ftp.basehosts.de;mkdir -f /$CI_COMMIT_REF_NAME; mirror -v -n -e -R -L _for_upload/ /$CI_COMMIT_REF_NAME"
-    environment:
-        name: review/$CI_COMMIT_REF_NAME
-        url: http://ui.basispanel.de/$CI_COMMIT_REF_NAME/
-        on_stop: stop_review
-        
-stop_review:
-    image: mwienk/docker-lftp
-    tags:
-        - docker
-    stage: deploy
-    variables:
-        GIT_STRATEGY: none
-    script:
-        - echo stopping env
-    environment:
-        name: review/$CI_COMMIT_REF_NAME
-        action: stop
-    when: manual
-
-
-
-fullsync_review:
-    image: mwienk/docker-lftp
-    tags:
-        - docker
-    dependencies:
-        - build_ui
-    stage: deploy
-    script:
-        - mkdir _for_upload
-        - mv assets build conf index.html _for_upload
-        - lftp -c "set sftp:auto-confirm yes; open -u intern_basispanel_ui,$FTP_PASSWORD sftp://ftp.basehosts.de;mkdir -f /$CI_COMMIT_REF_NAME; mirror -v --transfer-all -e -R -L _for_upload/ /$CI_COMMIT_REF_NAME"
-    when: manual
-
-
-docker_test:
     tags:
         - shell
     dependencies:
         - build_ui
-    stage: deploy
+    stage: review
     script:
         - mkdir _for_docker
         - mv assets build conf index.html _for_docker
         - docker-compose -p ${CI_PROJECT_NAME}_${CI_COMMIT_REF_NAME} up -d --build
+    environment:
+        name: review/$CI_COMMIT_REF_NAME
+        url: http://${CI_COMMIT_REF_NAME}.${CI_PROJECT_NAME}.dev.basehosts.de/
+        on_stop: stop_review
+
+stop_review:
+    tags:
+        - shell
+    variables:
+        GIT_STRATEGY: none
+    stage: review
+    when: manual
+    script:
+        - docker-compose -p ${CI_PROJECT_NAME}_${CI_COMMIT_REF_NAME} down
+    environment:
+        name: review/$CI_COMMIT_REF_NAME
+        action: stop