Skip to content

Commit

Permalink
Merge pull request #44 from bmf-san/feature/update-gobel-env
Browse files Browse the repository at this point in the history
Update envs related gobel
  • Loading branch information
bmf-san authored Aug 26, 2023
2 parents 3ca9338 + febcb06 commit 8ff7629
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 12 deletions.
8 changes: 2 additions & 6 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,13 @@ GOBEL_API_IMAGE_TAG=latest
GOBEL_API_CONTAINER_NAME=gobel-api
GOBEL_API_HOST_PORT=82
GOBEL_API_CONTAINER_PORT=82
GOBEL_API_TIME_ZONE=Asia/Tokyo
GOBEL_API_ALLOW_ORIGIN='*'
GOBEL_API_JWT_ACCESS_TOKEN_SECRET=gobel-access-token
GOBEL_API_JWT_REFRESH_TOKEN_SECRET=gobel-refresh-token
GOBEL_API_DB_DRIVER=mysql
GOBEL_API_DB_USER=root
GOBEL_API_DB_PASSWORD=password
GOBEL_API_LOG_THRESHOLD=1
GOBEL_API_LOG_TIME_ZONE_OFFSET=32400
GOBEL_API_LOG_LEVEL=0 # -4: Debug 0: Info 4: Warn 8: Error
GOBEL_API_HTTP_API_SCHEME=https
GOBEL_API_LOGGING_TAG=gobel.api

Expand All @@ -82,9 +80,7 @@ GOBEL_CLIENT_IMAGE_TAG=latest
GOBEL_CLIENT_CONTAINER_NAME=gobel-client
GOBEL_CLIENT_HOST_PORT=81
GOBEL_CLIENT_CONTAINER_PORT=81
GOBEL_CLIENT_TIME_ZONE=Asia/Tokyo
GOBEL_CLIENT_LOG_THRESHOLD=1
GOBEL_CLIENT_LOG_TIME_ZONE_OFFSET=32400
GOBEL_CLIENT_LOG_LEVEL=0 # -4: Debug 0: Info 4: Warn 8: Error
GOBEL_CLIENT_LOGGING_TAG=gobel.client

GOBEL_LOKI_CONTAINER_NAME=gobel-loki
Expand Down
8 changes: 2 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ services:
container_name: "${GOBEL_API_CONTAINER_NAME}"
environment:
- SERVER_PORT=${GOBEL_API_CONTAINER_PORT}
- TIME_ZONE=${GOBEL_API_TIME_ZONE}
- ALLOW_ORIGIN=${GOBEL_API_ALLOW_ORIGIN}
- JWT_ACCESS_TOKEN_SECRET=${GOBEL_API_JWT_ACCESS_TOKEN_SECRET}
- JWT_REFRESH_TOKEN_SECRET=${GOBEL_API_JWT_REFRESH_TOKEN_SECRET}
Expand All @@ -172,8 +171,7 @@ services:
- REDIS_HOST=${GOBEL_REDIS_CONTAINER_NAME}
- REDIS_PORT=${GOBEL_REDIS_CONTAINER_PORT}
- REDIS_PASSWORD=${GOBEL_REDIS_PASSWORD}
- LOG_THRESHOLD=${GOBEL_API_LOG_THRESHOLD} # NOTE: 0:info 1:warn 2:error 3:fatal
- LOG_TIME_ZONE_OFFSET=${GOBEL_API_LOG_TIME_ZONE_OFFSET}
- LOG_LEVEL=${GOBEL_API_LOG_LEVEL} # -4: Debug 0: Info 4: Warn 8: Error
build:
context: "./gobel-api"
dockerfile: "Dockerfile"
Expand Down Expand Up @@ -207,11 +205,9 @@ services:
container_name: "${GOBEL_CLIENT_CONTAINER_NAME}"
environment:
- SERVER_PORT=${GOBEL_CLIENT_CONTAINER_PORT}
- TIME_ZONE=${GOBEL_CLIENT_TIME_ZONE}
- HTTP_API_SCHEME=http
- HTTP_API_HOST=${GOBEL_API_CONTAINER_NAME}:${GOBEL_API_CONTAINER_PORT}
- LOG_THRESHOLD=${GOBEL_CLIENT_LOG_THRESHOLD} # NOTE: 0:info 1:warn 2:error 3:fatal
- LOG_TIME_ZONE_OFFSET=${GOBEL_CLIENT_LOG_TIME_ZONE_OFFSET}
- LOG_LEVEL=${GOBEL_CLIENT_LOG_LEVEL} # -4: Debug 0: Info 4: Warn 8: Error
build:
context: "./gobel-client"
dockerfile: "Dockerfile"
Expand Down

0 comments on commit 8ff7629

Please sign in to comment.