Skip to content

S
spring-ci-advanced
Commit 1431be24 authored by Bùi Bá Trường's avatar Bùi Bá Trường
Browse files
Options

Merge branch 'master' into 'test_MR' 

# Conflicts:
#   .gitlab-ci.yml
parents 7f0ea971 6ac2b66c
Pipeline #416 passed with stages
              in 2 minutes and 10 seconds
              Show whitespace changes
              Inline Side-by-side
              Showing with 2 additions and 5 deletions
              build-test.sh
              View file @ 1431be24
              ...@@ -79,7 +79,7 @@ sub_docker-up(){ ...@@ -79,7 +79,7 @@ sub_docker-up(){
              sub_package sub_package
              fi fi
              docker-compose -f deploy/docker-compose.yml up docker-compose -f deploy/docker-compose.yml up -d
              } }
              sub_send-email(){ sub_send-email(){
              ......
              deploy/docker-compose.yml
              View file @ 1431be24
              ...@@ -13,6 +13,3 @@ services: ...@@ -13,6 +13,3 @@ services:
              environment: environment:
              TZ: "Asia/Ho_Chi_Minh" TZ: "Asia/Ho_Chi_Minh"
              restart: always restart: always
              Markdown is supported
              0% or
              You are about to add 0 people to the discussion. Proceed with caution.
              Finish editing this message first!
              Please register or to comment