truongbb - test ci

.gitlab-ci.yml

@@ -27,6 +27,7 @@ checkout:
   stage: checkout
   only:
     - master
+    - merge_requests
   script:
     - ls # test command
     - cd /root/GitlabRunner/repo/
@@ -41,7 +42,7 @@ compile:
   stage: compile
   only:
     - master
-    # - merge_request
+    - merge_request
   script:
     - cd /root/GitlabRunner/repo/spring-ci-advanced
     - ls
@@ -52,7 +53,7 @@ sonnar_scanner:
   stage: sonnar_scanner
   only:
     - master
-    # - merge_requests
+    - merge_requests
   script:
     - cd /root/GitlabRunner/repo/spring-ci-advanced
     - ls
@@ -77,8 +78,8 @@ check_quality_gate:
 dokcer_build:
   stage: dokcer_build
   only:
-    - master
-  #    - merge_requests
+#    - master
+    - merge_requests
   script:
     - cd /root/GitlabRunner/repo/spring-ci-advanced
     - ls
@@ -90,7 +91,7 @@ send_email:
   stage: send_email
   only:
     - master
-    # - merge_requests
+    - merge_requests
   script:
     - curl --request POST
       --url https://api.sendgrid.com/v3/mail/send

build-test.sh

@@ -79,7 +79,7 @@ sub_docker-up(){
         sub_package
     fi
 
-    docker-compose -f deploy/docker-compose.yml up
+    docker-compose -f deploy/docker-compose.yml up -d
 }
 
 sub_send-email(){

deploy/docker-compose.yml

@@ -12,7 +12,4 @@ services:
     network_mode: "host"
     environment:
       TZ: "Asia/Ho_Chi_Minh"
-    restart: always
-
-
-
+    restart: always
\ No newline at end of file