Skip to content

Commit 323efa9

Browse files
committed
Cleanup removal of tideways
1 parent 10884a8 commit 323efa9

File tree

3 files changed

+2
-15
lines changed

3 files changed

+2
-15
lines changed

.circleci/config.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ builddeploy_steps: &builddeploy_steps
3131
- run: *install_dependency
3232
- run: *install_deploysuite
3333
#- 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}
3535
#- save_cache: *save_cache_settings
3636
- deploy:
3737
name: Running MasterScript.
@@ -54,7 +54,6 @@ jobs:
5454
APPNAME: "vanilla-forums"
5555
CI_DEPLOY_TOKEN: $CI_DEPLOY_TOKEN
5656
BRANCH: "develop"
57-
TIDEWAYS_ENV: "dev"
5857
steps: *builddeploy_steps
5958

6059
"build-prod":
@@ -65,7 +64,6 @@ jobs:
6564
APPNAME: "vanilla-forums"
6665
CI_DEPLOY_TOKEN: $CI_DEPLOY_TOKEN
6766
BRANCH: "master"
68-
TIDEWAYS_ENV: "production"
6967
steps: *builddeploy_steps
7068

7169
workflows:

build.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ APP_NAME=$1
44
CI_DEPLOY_TOKEN=$2
55
ENV=$3
66
BRANCH=$4
7-
TIDEWAYS_ENV=$5
87
UPDATE_CACHE=""
98
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
1110
#docker create --name app $APP_NAME:latest

docker-compose.dev.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
11
version: '3'
22
services:
33
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

0 commit comments

Comments
 (0)