Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enhancement(queue): don't inject default route #492

Merged
merged 2 commits into from
Dec 22, 2021
Merged

enhancement(queue): don't inject default route #492

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcaa432
feat: dont inject default routes
plyr4 Dec 22, 2021
ddb586f
Merge branch 'master' into feat/queue/default-route
plyr4 Dec 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ services:
DATABASE_ENCRYPTION_KEY: 'C639A572E14D5075C526FDDD43E4ECF6'
QUEUE_DRIVER: redis
QUEUE_ADDR: 'redis://redis:6379'
QUEUE_ROUTES: 'docker,local,docker:local'
SCM_DRIVER: github
SCM_CONTEXT: 'continuous-integration/vela'
SECRET_VAULT: 'true'
Expand All @@ -52,8 +51,8 @@ services:
VELA_WEBUI_ADDR: 'http://localhost:8888'
VELA_LOG_LEVEL: trace
VELA_SECRET: 'zB7mrKDTZqNeNTD8z47yG4DHywspAh'
VELA_REFRESH_TOKEN_DURATION: 5m
VELA_ACCESS_TOKEN_DURATION: 1m
VELA_REFRESH_TOKEN_DURATION: 90m
VELA_ACCESS_TOKEN_DURATION: 60m
VELA_DISABLE_WEBHOOK_VALIDATION: 'true'
VELA_ENABLE_SECURE_COOKIE: 'false'
env_file:
Expand All @@ -80,15 +79,14 @@ services:
environment:
QUEUE_DRIVER: redis
QUEUE_ADDR: 'redis://redis:6379'
QUEUE_ROUTES: 'docker,local,docker:local'
VELA_BUILD_LIMIT: 1
VELA_BUILD_TIMEOUT: 30m
VELA_LOG_LEVEL: trace
VELA_RUNTIME_DRIVER: docker
VELA_SERVER_ADDR: 'http://server:8080'
VELA_SERVER_SECRET: 'zB7mrKDTZqNeNTD8z47yG4DHywspAh'
WORKER_ADDR: http://worker:8080
WORKER_CHECK_IN: 1m
WORKER_ADDR: 'http://worker:8080'
WORKER_CHECK_IN: 15m
restart: always
ports:
- '8081:8080'
Expand Down