File tree Expand file tree Collapse file tree 3 files changed +2
-15
lines changed Expand file tree Collapse file tree 3 files changed +2
-15
lines changed Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ builddeploy_steps: &builddeploy_steps
31
31
- run : *install_dependency
32
32
- run : *install_deploysuite
33
33
# - restore_cache: *restore_cache_settings_for_build
34
- - run : ./build.sh ${APPNAME} ${CI_DEPLOY_TOKEN} ${LOGICAL_ENV} ${BRANCH} ${TIDEWAYS_ENVIRONMENT}
34
+ - run : ./build.sh ${APPNAME} ${CI_DEPLOY_TOKEN} ${LOGICAL_ENV} ${BRANCH}
35
35
# - save_cache: *save_cache_settings
36
36
- deploy :
37
37
name : Running MasterScript.
54
54
APPNAME : " vanilla-forums"
55
55
CI_DEPLOY_TOKEN : $CI_DEPLOY_TOKEN
56
56
BRANCH : " develop"
57
- TIDEWAYS_ENV : " dev"
58
57
steps : *builddeploy_steps
59
58
60
59
" build-prod " :
65
64
APPNAME : " vanilla-forums"
66
65
CI_DEPLOY_TOKEN : $CI_DEPLOY_TOKEN
67
66
BRANCH : " master"
68
- TIDEWAYS_ENV : " production"
69
67
steps : *builddeploy_steps
70
68
71
69
workflows :
Original file line number Diff line number Diff line change @@ -4,8 +4,7 @@ APP_NAME=$1
4
4
CI_DEPLOY_TOKEN=$2
5
5
ENV=$3
6
6
BRANCH=$4
7
- TIDEWAYS_ENV=$5
8
7
UPDATE_CACHE=" "
9
8
echo " " > vanilla.env
10
- ENV=$ENV CI_DEPLOY_TOKEN=$CI_DEPLOY_TOKEN BRANCH=$BRANCH TIDEWAYS_ENV= $TIDEWAYS_ENV docker-compose -f docker-compose.yml -f docker-compose.dev.yml build $APP_NAME
9
+ ENV=$ENV CI_DEPLOY_TOKEN=$CI_DEPLOY_TOKEN BRANCH=$BRANCH docker-compose -f docker-compose.yml -f docker-compose.dev.yml build $APP_NAME
11
10
# docker create --name app $APP_NAME:latest
Original file line number Diff line number Diff line change 1
1
version : ' 3'
2
2
services :
3
3
vanilla-forums :
4
- links :
5
- - tideways-daemon
6
- tideways-daemon :
7
- container_name : tideways-daemon
8
- build :
9
- context : ./tideways-daemon
10
- args :
11
- - TIDEWAYS_ENV
12
- ports :
13
- - 9135:9135
You can’t perform that action at this time.
0 commit comments