Merge branch 'master' into 'test_MR'

# Conflicts: # .gitlab-ci.yml

Merge branch 'master' into 'test_MR'
# Conflicts: # .gitlab-ci.yml
1431be24 · Bùi Bá Trường · 7f0ea971 · 6ac2b66c · 1431be24 · 1431be24
Commit 1431be24 authored Jul 31, 2019 by Bùi Bá Trường
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

build-test.sh build-test.sh +1 -1

deploy/docker-compose.yml deploy/docker-compose.yml +1 -4

No files found.
--- a/build-test.sh
+++ b/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(){

--- a/deploy/docker-compose.yml
+++ b/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