Skip to content

Commit 119a36d

Browse files
committed
Add TB_ prefix for all ENV variables
1 parent ecd2e57 commit 119a36d

28 files changed

+228
-243
lines changed

.env

+30-36
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ COMPOSE_SP_PLUGSIN_SW=${PLUGSIN_SW:-OFF}
7373
# default: COMPOSE_SP_PLUGSIN_SW
7474
COMPOSE_SP_SERVER_ADDRESS=${SERVER_ADDRESS:-localhost}
7575
# default: COMPOSE_SP_SERVER_ADDRESS=localhost
76-
COMPOSE_SP_API_USERNAME=${SP_API_USERNAME:-}
77-
# default: COMPOSE_SP_API_USERNAME=
78-
# Note - Use SP_API_USERNAME instead of API_USERNAME because API_USERNAME is used in CB-Tumblebug
76+
COMPOSE_SP_TB_API_USERNAME=${SP_TB_API_USERNAME:-}
77+
# default: COMPOSE_SP_TB_API_USERNAME=
78+
# Note - Use SP_TB_API_USERNAME instead of TB_API_USERNAME because TB_API_USERNAME is used in CB-Tumblebug
7979
COMPOSE_SP_API_PASSWORD=${SP_API_PASSWORD:-}
8080
# default: COMPOSE_SP_API_PASSWORD=
81-
# Note - Use SP_API_PASSWORD instead of API_PASSWORD because API_PASSWORD is used in CB-Tumblebug
81+
# Note - Use SP_API_PASSWORD instead of TB_API_PASSWORD because TB_API_PASSWORD is used in CB-Tumblebug
8282
COMPOSE_SP_LOG_LEVEL=${LOG_LEVEL:-error}
8383
# default: COMPOSE_SP_LOG_LEVEL=error
8484
COMPOSE_SP_HISCALL_LOG_LEVEL=${HISCALL_LOG_LEVEL:-error}
@@ -96,24 +96,20 @@ COMPOSE_TB_VOLUME_HOST_PATH=${TB_VOLUME_HOST_PATH:-./container-volume/cb-tumbleb
9696
# default: COMPOSE_TB_VOLUME_HOST_PATH=./container-volume/cb-tumblebug-container
9797
COMPOSE_TB_VOLUME_CONTAINTER_PATH=${TB_VOLUME_CONTAINTER_PATH:-/app}
9898
# default: COMPOSE_TB_VOLUME_CONTAINTER_PATH=/app
99-
COMPOSE_TB_CBTUMBLEBUG_ROOT=${CBTUMBLEBUG_ROOT:-/app}
100-
# default: COMPOSE_TB_CBTUMBLEBUG_ROOT=/app
101-
COMPOSE_TB_SPIDER_CALL_METHOD=${SPIDER_CALL_METHOD:-REST}
102-
# default: COMPOSE_TB_SPIDER_CALL_METHOD=REST
99+
COMPOSE_TB_ROOT_PATH=${TB_ROOT_PATH:-/app}
100+
# default: COMPOSE_TB_ROOT_PATH=/app
103101
COMPOSE_TB_SPIDER_REST_URL=http://cb-spider:1024/spider
104102
# default: COMPOSE_TB_SPIDER_REST_URL=http://cb-spider:1024/spider
105-
COMPOSE_TB_DRAGONFLY_CALL_METHOD=${DRAGONFLY_CALL_METHOD:-REST}
106-
# default: COMPOSE_TB_DRAGONFLY_CALL_METHOD=REST
107103
COMPOSE_TB_DRAGONFLY_REST_URL=http://cb-dragonfly:9090/dragonfly
108104
# default: COMPOSE_TB_DRAGONFLY_REST_URL=http://cb-dragonfly:9090/dragonfly
109-
COMPOSE_TB_DB_URL=${DB_URL:-localhost:3306}
110-
# default: COMPOSE_TB_DB_URL=localhost:3306
111-
COMPOSE_TB_DB_DATABASE=${DB_DATABASE:-cb_tumblebug}
112-
# default: COMPOSE_TB_DB_DATABASE=cb_tumblebug
113-
COMPOSE_TB_DB_USER=${DB_USER:-cb_tumblebug}
114-
# default: COMPOSE_TB_DB_USER=cb_tumblebug
115-
COMPOSE_TB_DB_PASSWORD=${DB_PASSWORD:-cb_tumblebug}
116-
# default: COMPOSE_TB_DB_PASSWORD=cb_tumblebug
105+
COMPOSE_TB_SQLITE_URL=${TB_SQLITE_URL:-localhost:3306}
106+
# default: COMPOSE_TB_SQLITE_URL=localhost:3306
107+
COMPOSE_TB_SQLITE_DATABASE=${TB_SQLITE_DATABASE:-cb_tumblebug}
108+
# default: COMPOSE_TB_SQLITE_DATABASE=cb_tumblebug
109+
COMPOSE_TB_SQLITE_USER=${TB_SQLITE_USER:-cb_tumblebug}
110+
# default: COMPOSE_TB_SQLITE_USER=cb_tumblebug
111+
COMPOSE_TB_SQLITE_PASSWORD=${TB_SQLITE_PASSWORD:-cb_tumblebug}
112+
# default: COMPOSE_TB_SQLITE_PASSWORD=cb_tumblebug
117113
COMPOSE_TB_ETCD_ENDPOINTS=http://etcd:2379
118114
# default: COMPOSE_TB_ETCD_ENDPOINTS=http://etcd:2379
119115
COMPOSE_TB_ETCD_AUTH_ENABLED=${TB_ETCD_AUTH_ENABLED:-true}
@@ -122,39 +118,37 @@ COMPOSE_TB_ETCD_USERNAME=${TB_ETCD_USERNAME:-default}
122118
# default: COMPOSE_TB_ETCD_USERNAME=default
123119
COMPOSE_TB_ETCD_PASSWORD=${TB_ETCD_PASSWORD:-default}
124120
# default: COMPOSE_TB_ETCD_PASSWORD=default
125-
COMPOSE_TB_ALLOW_ORIGINS=${ALLOW_ORIGINS:-*}
121+
COMPOSE_TB_ALLOW_ORIGINS=${TB_ALLOW_ORIGINS:-*}
126122
# default: COMPOSE_TB_ALLOW_ORIGINS=*
127-
COMPOSE_TB_AUTH_ENABLED=${AUTH_ENABLED:-true}
123+
COMPOSE_TB_AUTH_ENABLED=${TB_AUTH_ENABLED:-true}
128124
# default: COMPOSE_TB_AUTH_ENABLED=true
129-
COMPOSE_TB_API_USERNAME=${API_USERNAME:-default}
125+
COMPOSE_TB_API_USERNAME=${TB_API_USERNAME:-default}
130126
# default: COMPOSE_TB_API_USERNAME=default
131-
COMPOSE_TB_API_PASSWORD=${API_PASSWORD:-default}
127+
COMPOSE_TB_API_PASSWORD=${TB_API_PASSWORD:-default}
132128
# default: COMPOSE_TB_API_PASSWORD=default
133-
COMPOSE_TB_AUTOCONTROL_DURATION_MS=${AUTOCONTROL_DURATION_MS:-10000}
129+
COMPOSE_TB_AUTOCONTROL_DURATION_MS=${TB_AUTOCONTROL_DURATION_MS:-10000}
134130
# default: COMPOSE_TB_AUTOCONTROL_DURATION_MS=10000
135-
COMPOSE_TB_SELF_ENDPOINT=${SELF_ENDPOINT:-localhost:1323}
131+
COMPOSE_TB_SELF_ENDPOINT=${TB_SELF_ENDPOINT:-localhost:1323}
136132
# default: COMPOSE_TB_SELF_ENDPOINT=localhost:1323
137-
COMPOSE_TB_API_DOC_PATH=${API_DOC_PATH:-/app/src/api/rest/docs/swagger.json}
138-
# default: COMPOSE_TB_API_DOC_PATH=/app/src/api/rest/docs/swagger.json
139-
COMPOSE_TB_DEFAULT_NAMESPACE=${DEFAULT_NAMESPACE:-ns01}
133+
COMPOSE_TB_DEFAULT_NAMESPACE=${TB_DEFAULT_NAMESPACE:-ns01}
140134
# default: COMPOSE_TB_DEFAULT_NAMESPACE=ns01
141-
COMPOSE_TB_DEFAULT_CREDENTIALHOLDER=${DEFAULT_CREDENTIALHOLDER:-admin}
135+
COMPOSE_TB_DEFAULT_CREDENTIALHOLDER=${TB_DEFAULT_CREDENTIALHOLDER:-admin}
142136
# default: COMPOSE_TB_DEFAULT_CREDENTIALHOLDER=admin
143-
COMPOSE_TB_LOGFILE_PATH=${LOGFILE_PATH:-/app/log/tumblebug.log}
137+
COMPOSE_TB_LOGFILE_PATH=${TB_LOGFILE_PATH:-/app/log/tumblebug.log}
144138
# default: COMPOSE_TB_LOGFILE_PATH=/app/log/tumblebug.log
145-
COMPOSE_TB_LOGFILE_MAXSIZE=${LOGFILE_MAXSIZE:-10}
139+
COMPOSE_TB_LOGFILE_MAXSIZE=${TB_LOGFILE_MAXSIZE:-10}
146140
# default: COMPOSE_TB_LOGFILE_MAXSIZE=10
147-
COMPOSE_TB_LOGFILE_MAXBACKUPS=${LOGFILE_MAXBACKUPS:-3}
141+
COMPOSE_TB_LOGFILE_MAXBACKUPS=${TB_LOGFILE_MAXBACKUPS:-3}
148142
# default: COMPOSE_TB_LOGFILE_MAXBACKUPS=3
149-
COMPOSE_TB_LOGFILE_MAXAGE=${LOGFILE_MAXAGE:-30}
143+
COMPOSE_TB_LOGFILE_MAXAGE=${TB_LOGFILE_MAXAGE:-30}
150144
# default: COMPOSE_TB_LOGFILE_MAXAGE=30
151-
COMPOSE_TB_LOGFILE_COMPRESS=${LOGFILE_COMPRESS:-false}
145+
COMPOSE_TB_LOGFILE_COMPRESS=${TB_LOGFILE_COMPRESS:-false}
152146
# default: COMPOSE_TB_LOGFILE_COMPRESS=false
153-
COMPOSE_TB_LOGLEVEL=${LOGLEVEL:-debug}
147+
COMPOSE_TB_LOGLEVEL=${TB_LOGLEVEL:-debug}
154148
# default: COMPOSE_TB_LOGLEVEL=debug
155-
COMPOSE_TB_LOGWRITER=${LOGWRITER:-both}
149+
COMPOSE_TB_LOGWRITER=${TB_LOGWRITER:-both}
156150
# default: COMPOSE_TB_LOGWRITER=both
157-
COMPOSE_TB_NODE_ENV=${NODE_ENV:-development}
151+
COMPOSE_TB_NODE_ENV=${TB_NODE_ENV:-development}
158152
# default: COMPOSE_TB_NODE_ENV=development
159153

160154

Dockerfile

+22-22
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ COPY --from=builder /go/src/github.com/cloud-barista/cb-tumblebug/conf/ /app/con
4343
COPY --from=builder /go/src/github.com/cloud-barista/cb-tumblebug/src/cb-tumblebug /app/src/
4444

4545
# Setting various environment variables required by the application
46-
ENV CBTUMBLEBUG_ROOT=/app \
47-
SPIDER_REST_URL=http://cb-spider:1024/spider \
48-
DRAGONFLY_REST_URL=http://cb-dragonfly:9090/dragonfly \
46+
ENV TB_ROOT_PATH=/app \
47+
TB_SPIDER_REST_URL=http://cb-spider:1024/spider \
48+
TB_DRAGONFLY_REST_URL=http://cb-dragonfly:9090/dragonfly \
4949
TB_SQLITE_URL=localhost:3306 \
5050
TB_SQLITE_DATABASE=cb_tumblebug \
5151
TB_SQLITE_USER=cb_tumblebug \
@@ -54,25 +54,25 @@ ENV CBTUMBLEBUG_ROOT=/app \
5454
TB_ETCD_AUTH_ENABLED=true \
5555
TB_ETCD_USERNAME=default \
5656
TB_ETCD_PASSWORD=default \
57-
ALLOW_ORIGINS=* \
58-
AUTH_ENABLED=true \
59-
AUTH_MODE=basic \
60-
AUTH_JWT_SIGNING_METHOD=RS256 \
61-
AUTH_JWT_PUBLICKEY= \
62-
API_USERNAME=default \
63-
API_PASSWORD=default \
64-
AUTOCONTROL_DURATION_MS=10000 \
65-
SELF_ENDPOINT=localhost:1323 \
66-
DEFAULT_NAMESPACE=ns01 \
67-
DEFAULT_CREDENTIALHOLDER=admin \
68-
LOGFILE_PATH=/app/log/tumblebug.log \
69-
LOGFILE_MAXSIZE=10 \
70-
LOGFILE_MAXBACKUPS=3 \
71-
LOGFILE_MAXAGE=30 \
72-
LOGFILE_COMPRESS=false \
73-
LOGLEVEL=debug \
74-
LOGWRITER=both \
75-
NODE_ENV=development
57+
TB_ALLOW_ORIGINS=* \
58+
TB_AUTH_ENABLED=true \
59+
TB_AUTH_MODE=basic \
60+
TB_AUTH_JWT_SIGNING_METHOD=RS256 \
61+
TB_AUTH_JWT_PUBLICKEY= \
62+
TB_API_USERNAME=default \
63+
TB_API_PASSWORD=default \
64+
TB_AUTOCONTROL_DURATION_MS=10000 \
65+
TB_SELF_ENDPOINT=localhost:1323 \
66+
TB_DEFAULT_NAMESPACE=ns01 \
67+
TB_DEFAULT_CREDENTIALHOLDER=admin \
68+
TB_LOGFILE_PATH=/app/log/tumblebug.log \
69+
TB_LOGFILE_MAXSIZE=10 \
70+
TB_LOGFILE_MAXBACKUPS=3 \
71+
TB_LOGFILE_MAXAGE=30 \
72+
TB_LOGFILE_COMPRESS=false \
73+
TB_LOGLEVEL=debug \
74+
TB_LOGWRITER=both \
75+
TB_NODE_ENV=development
7676

7777
# Setting the entrypoint for the application
7878
ENTRYPOINT [ "/app/src/cb-tumblebug" ]

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ Check out [CONTRIBUTING](https://github.com/cloud-barista/cb-tumblebug/blob/main
216216
cd ~/go/src/github.com/cloud-barista/cb-tumblebug
217217
source conf/setup.env
218218
```
219-
- (Note) Automatically set the SELF_ENDPOINT environment variable (an externally accessible address) using a script if needed
219+
- (Note) Automatically set the TB_SELF_ENDPOINT environment variable (an externally accessible address) using a script if needed
220220
- This is necessary if you want to access and control the Swagger API Dashboard from outside when CB-TB is running
221221
```bash
222222
cd ~/go/src/github.com/cloud-barista/cb-tumblebug

conf/setup.env

+34-43
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,33 @@
1-
# Set CBTUMBLEBUG_ROOT based on path of setup.env relatively
1+
# Set TB_ROOT_PATH based on path of setup.env relatively
22
SCRIPT_DIR=`dirname ${BASH_SOURCE[0]-$0}`
3-
export CBTUMBLEBUG_ROOT=`cd $SCRIPT_DIR && cd .. && pwd`
4-
# Use CBTUMBLEBUG_ROOT directly if the SCRIPT_DIR does not work
5-
# export CBTUMBLEBUG_ROOT=$HOME/go/src/github.com/cloud-barista/cb-tumblebug
3+
export TB_ROOT_PATH=`cd $SCRIPT_DIR && cd .. && pwd`
4+
# Use TB_ROOT_PATH directly if the SCRIPT_DIR does not work
5+
# export TB_ROOT_PATH=$HOME/go/src/github.com/cloud-barista/cb-tumblebug
66

77
# Set API access config
8-
export API_USERNAME=default
9-
export API_PASSWORD=default
10-
## ALLOW_ORIGINS (ex: https://cloud-barista.org,http://localhost:8080 or * for all)
11-
export ALLOW_ORIGINS=*
12-
## Set AUTH_ENABLED=true currently for basic auth for all routes (i.e., url or path)
13-
export AUTH_ENABLED=true
14-
## Set AUTH_MODE=basic or jwt
15-
export AUTH_MODE=basic
16-
17-
## Set SELF_ENDPOINT, to access Swagger API dashboard outside (Ex: export SELF_ENDPOINT=x.x.x.x:1323)
18-
export SELF_ENDPOINT=localhost:1323
8+
export TB_API_USERNAME=default
9+
export TB_API_PASSWORD=default
10+
## TB_ALLOW_ORIGINS (ex: https://cloud-barista.org,http://localhost:8080 or * for all)
11+
export TB_ALLOW_ORIGINS=*
12+
## Set TB_AUTH_ENABLED=true currently for basic auth for all routes (i.e., url or path)
13+
export TB_AUTH_ENABLED=true
14+
## Set TB_AUTH_MODE=basic or jwt
15+
export TB_AUTH_MODE=basic
16+
17+
## Set TB_SELF_ENDPOINT, to access Swagger API dashboard outside (Ex: export TB_SELF_ENDPOINT=x.x.x.x:1323)
18+
export TB_SELF_ENDPOINT=localhost:1323
1919

2020
# Set system endpoints
21-
export SPIDER_CALL_METHOD=REST
22-
export SPIDER_REST_URL=http://localhost:1024/spider
23-
export DRAGONFLY_CALL_METHOD=REST
24-
export DRAGONFLY_REST_URL=http://localhost:9090/dragonfly
25-
export TERRARIUM_CALL_METHOD=REST
26-
export TERRARIUM_REST_URL=http://localhost:8888/terrarium
27-
export IAM_MANAGER_CALL_METHOD=REST
28-
export IAM_MANAGER_REST_URL=https://localhost:5000
29-
21+
export TB_SPIDER_REST_URL=http://localhost:1024/spider
22+
export TB_DRAGONFLY_REST_URL=http://localhost:9090/dragonfly
23+
export TB_TERRARIUM_REST_URL=http://localhost:8888/terrarium
24+
export TB_IAM_MANAGER_REST_URL=https://localhost:5000
3025

3126
## Set internal DB config (SQLlite)
32-
export DB_URL=localhost:3306
33-
export DB_DATABASE=cb_tumblebug
34-
export DB_USER=cb_tumblebug
35-
export DB_PASSWORD=cb_tumblebug
27+
export TB_SQLITE_URL=localhost:3306
28+
export TB_SQLITE_DATABASE=cb_tumblebug
29+
export TB_SQLITE_USER=cb_tumblebug
30+
export TB_SQLITE_PASSWORD=cb_tumblebug
3631

3732
## Set etcd cluster
3833
export TB_ETCD_ENDPOINTS=http://localhost:2379
@@ -41,26 +36,22 @@ export TB_ETCD_USERNAME=default
4136
export TB_ETCD_PASSWORD=default
4237

4338
## Set period for auto control goroutine invocation
44-
export AUTOCONTROL_DURATION_MS=10000
39+
export TB_AUTOCONTROL_DURATION_MS=10000
4540

4641
## Set name of default objects
47-
export DEFAULT_NAMESPACE=ns01
48-
export DEFAULT_CREDENTIALHOLDER=admin
42+
export TB_DEFAULT_NAMESPACE=ns01
43+
export TB_DEFAULT_CREDENTIALHOLDER=admin
4944

5045
## Logger configuration
5146
# Set log file path (default logfile path: ./log/tumblebug.log)
52-
export LOGFILE_PATH=$CBTUMBLEBUG_ROOT/log/tumblebug.log
53-
export LOGFILE_MAXSIZE=10
54-
export LOGFILE_MAXBACKUPS=3
55-
export LOGFILE_MAXAGE=30
56-
export LOGFILE_COMPRESS=false
47+
export TB_LOGFILE_PATH=$TB_ROOT_PATH/log/tumblebug.log
48+
export TB_LOGFILE_MAXSIZE=10
49+
export TB_LOGFILE_MAXBACKUPS=3
50+
export TB_LOGFILE_MAXAGE=30
51+
export TB_LOGFILE_COMPRESS=false
5752
# Set log level, such as trace, debug, info, warn, error, fatal, and panic
58-
export LOGLEVEL=debug
53+
export TB_LOGLEVEL=debug
5954
# Set log writer, such as file, stdout, or both
60-
export LOGWRITER=both
55+
export TB_LOGWRITER=both
6156
# Set execution environment, such as development or production
62-
export NODE_ENV=development
63-
64-
# Environment variables that you don't need to touch
65-
## Swagger UI API document file path
66-
export API_DOC_PATH=$CBTUMBLEBUG_ROOT/src/api/rest/docs/swagger.json
57+
export TB_NODE_ENV=development

docker-compose-custom.yaml

+23-23
Original file line numberDiff line numberDiff line change
@@ -124,33 +124,33 @@ services:
124124
- ${COMPOSE_TB_VOLUME_HOST_PATH}/meta_db/:${COMPOSE_TB_VOLUME_CONTAINTER_PATH}/meta_db/
125125
- ${COMPOSE_TB_VOLUME_HOST_PATH}/log/:${COMPOSE_TB_VOLUME_CONTAINTER_PATH}/log/
126126
environment:
127-
- CBTUMBLEBUG_ROOT=${COMPOSE_TB_CBTUMBLEBUG_ROOT}
128-
- SPIDER_REST_URL=${COMPOSE_TB_SPIDER_REST_URL}
129-
- DRAGONFLY_REST_URL=${COMPOSE_TB_DRAGONFLY_REST_URL}
130-
- TB_SQLITE_URL=${COMPOSE_TB_TB_SQLITE_URL}
131-
- TB_SQLITE_DATABASE=${COMPOSE_TB_TB_SQLITE_DATABASE}
132-
- TB_SQLITE_USER=${COMPOSE_TB_TB_SQLITE_USER}
133-
- TB_SQLITE_PASSWORD=${COMPOSE_TB_TB_SQLITE_PASSWORD}
127+
- TB_ROOT_PATH=${COMPOSE_TB_ROOT_PATH}
128+
- TB_SPIDER_REST_URL=${COMPOSE_TB_SPIDER_REST_URL}
129+
- TB_DRAGONFLY_REST_URL=${COMPOSE_TB_DRAGONFLY_REST_URL}
130+
- TB_SQLITE_URL=${COMPOSE_TB_SQLITE_URL}
131+
- TB_SQLITE_DATABASE=${COMPOSE_TB_SQLITE_DATABASE}
132+
- TB_SQLITE_USER=${COMPOSE_TB_SQLITE_USER}
133+
- TB_SQLITE_PASSWORD=${COMPOSE_TB_SQLITE_PASSWORD}
134134
- TB_ETCD_ENDPOINTS=${COMPOSE_TB_ETCD_ENDPOINTS}
135135
- TB_ETCD_AUTH_ENABLED=${COMPOSE_TB_ETCD_AUTH_ENABLED}
136136
- TB_ETCD_USERNAME=${COMPOSE_TB_ETCD_USERNAME}
137137
- TB_ETCD_PASSWORD=${COMPOSE_TB_ETCD_PASSWORD}
138-
- ALLOW_ORIGINS=${COMPOSE_TB_ALLOW_ORIGINS}
139-
- AUTH_ENABLED=${COMPOSE_TB_AUTH_ENABLED}
140-
- API_USERNAME=${COMPOSE_TB_API_USERNAME}
141-
- API_PASSWORD=${COMPOSE_TB_API_PASSWORD}
142-
- AUTOCONTROL_DURATION_MS=${COMPOSE_TB_AUTOCONTROL_DURATION_MS}
143-
- SELF_ENDPOINT=${COMPOSE_TB_SELF_ENDPOINT}
144-
- DEFAULT_NAMESPACE=${COMPOSE_TB_DEFAULT_NAMESPACE}
145-
- DEFAULT_CREDENTIALHOLDER=${COMPOSE_TB_DEFAULT_CREDENTIALHOLDER}
146-
- LOGFILE_PATH=${COMPOSE_TB_LOGFILE_PATH}
147-
- LOGFILE_MAXSIZE=${COMPOSE_TB_LOGFILE_MAXSIZE}
148-
- LOGFILE_MAXBACKUPS=${COMPOSE_TB_LOGFILE_MAXBACKUPS}
149-
- LOGFILE_MAXAGE=${COMPOSE_TB_LOGFILE_MAXAGE}
150-
- LOGFILE_COMPRESS=${COMPOSE_TB_LOGFILE_COMPRESS}
151-
- LOGLEVEL=${COMPOSE_TB_LOGLEVEL}
152-
- LOGWRITER=${COMPOSE_TB_LOGWRITER}
153-
- NODE_ENV=${COMPOSE_TB_NODE_ENV}
138+
- TB_ALLOW_ORIGINS=${COMPOSE_TB_ALLOW_ORIGINS}
139+
- TB_AUTH_ENABLED=${COMPOSE_TB_AUTH_ENABLED}
140+
- TB_API_USERNAME=${COMPOSE_TB_API_USERNAME}
141+
- TB_API_PASSWORD=${COMPOSE_TB_API_PASSWORD}
142+
- TB_AUTOCONTROL_DURATION_MS=${COMPOSE_TB_AUTOCONTROL_DURATION_MS}
143+
- TB_SELF_ENDPOINT=${COMPOSE_TB_SELF_ENDPOINT}
144+
- TB_DEFAULT_NAMESPACE=${COMPOSE_TB_DEFAULT_NAMESPACE}
145+
- TB_DEFAULT_CREDENTIALHOLDER=${COMPOSE_TB_DEFAULT_CREDENTIALHOLDER}
146+
- TB_LOGFILE_PATH=${COMPOSE_TB_LOGFILE_PATH}
147+
- TB_LOGFILE_MAXSIZE=${COMPOSE_TB_LOGFILE_MAXSIZE}
148+
- TB_LOGFILE_MAXBACKUPS=${COMPOSE_TB_LOGFILE_MAXBACKUPS}
149+
- TB_LOGFILE_MAXAGE=${COMPOSE_TB_LOGFILE_MAXAGE}
150+
- TB_LOGFILE_COMPRESS=${COMPOSE_TB_LOGFILE_COMPRESS}
151+
- TB_LOGLEVEL=${COMPOSE_TB_LOGLEVEL}
152+
- TB_LOGWRITER=${COMPOSE_TB_LOGWRITER}
153+
- TB_NODE_ENV=${COMPOSE_TB_NODE_ENV}
154154
healthcheck: # for CB-Tumblebug
155155
test: [ "CMD", "curl", "-f", "http://localhost:1323/tumblebug/readyz" ]
156156
interval: 1m

docker-compose.yaml

+19-19
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ services:
122122
- ./container-volume/cb-tumblebug-container/meta_db/:/app/meta_db/
123123
- ./container-volume/cb-tumblebug-container/log/:/app/log/
124124
environment:
125-
# - CBTUMBLEBUG_ROOT=/app
126-
- SPIDER_REST_URL=http://cb-spider:1024/spider
127-
- DRAGONFLY_REST_URL=http://cb-dragonfly:9090/dragonfly
125+
# - TB_ROOT_PATH=/app
126+
- TB_SPIDER_REST_URL=http://cb-spider:1024/spider
127+
- TB_DRAGONFLY_REST_URL=http://cb-dragonfly:9090/dragonfly
128128
# - TB_SQLITE_URL=localhost:3306
129129
# - TB_SQLITE_DATABASE=cb_tumblebug
130130
# - TB_SQLITE_USER=cb_tumblebug
@@ -133,22 +133,22 @@ services:
133133
# - TB_ETCD_AUTH_ENABLED=true
134134
# - TB_ETCD_USERNAME=default
135135
# - TB_ETCD_PASSWORD=default
136-
# - ALLOW_ORIGINS=*
137-
# - AUTH_ENABLED=true
138-
# - API_USERNAME=default
139-
# - API_PASSWORD=default
140-
# - AUTOCONTROL_DURATION_MS=10000
141-
- SELF_ENDPOINT=localhost:1323
142-
# - DEFAULT_NAMESPACE=ns01
143-
# - DEFAULT_CREDENTIALHOLDER=admin
144-
# - LOGFILE_PATH=/app/log/tumblebug.log
145-
# - LOGFILE_MAXSIZE=10
146-
# - LOGFILE_MAXBACKUPS=3
147-
# - LOGFILE_MAXAGE=30
148-
# - LOGFILE_COMPRESS=false
149-
# - LOGLEVEL=debug
150-
# - LOGWRITER=both
151-
# - NODE_ENV=development
136+
# - TB_ALLOW_ORIGINS=*
137+
# - TB_AUTH_ENABLED=true
138+
# - TB_API_USERNAME=default
139+
# - TB_API_PASSWORD=default
140+
# - TB_AUTOCONTROL_DURATION_MS=10000
141+
- TB_SELF_ENDPOINT=localhost:1323
142+
# - TB_DEFAULT_NAMESPACE=ns01
143+
# - TB_DEFAULT_CREDENTIALHOLDER=admin
144+
# - TB_LOGFILE_PATH=/app/log/tumblebug.log
145+
# - TB_LOGFILE_MAXSIZE=10
146+
# - TB_LOGFILE_MAXBACKUPS=3
147+
# - TB_LOGFILE_MAXAGE=30
148+
# - TB_LOGFILE_COMPRESS=false
149+
# - TB_LOGLEVEL=debug
150+
# - TB_LOGWRITER=both
151+
# - TB_NODE_ENV=development
152152
healthcheck: # for CB-Tumblebug
153153
test: [ "CMD", "curl", "-f", "http://localhost:1323/tumblebug/readyz" ]
154154
interval: 1m

0 commit comments

Comments
 (0)