use old docker compose service names
refs: DE-1576 Test Plan: QA to be done on 315311 and 315312 Change-Id: If4b480f9ea8e190a8e91e5d4109c7f0b0943fce2 Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/315313 Reviewed-by: Andrea Cirulli <andrea.cirulli@instructure.com> QA-Review: Andrea Cirulli <andrea.cirulli@instructure.com> Product-Review: James Butters <jbutters@instructure.com> Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
This commit is contained in:
parent
2f4da66583
commit
d510b2c88a
|
@ -6,3 +6,4 @@ test:
|
|||
|
||||
development:
|
||||
domain: <%= ENV.fetch('CANVAS_DEV_DOMAIN', 'canvas.docker') %>
|
||||
files_domain: <%= ENV.fetch('CANVAS_DEV_DOMAIN', 'canvas.docker') %>
|
||||
|
|
|
@ -44,7 +44,7 @@ x-base-service: &BASE-SERVICE
|
|||
- "traefik.enable=true"
|
||||
|
||||
services:
|
||||
canvas-web:
|
||||
web:
|
||||
<<: *BASE-SERVICE
|
||||
environment:
|
||||
<<: *BASE-ENV
|
||||
|
@ -57,22 +57,31 @@ services:
|
|||
# AR_QUERY_TRACE_TYPE: 'all' # 'all', 'write', or 'read'
|
||||
# AR_QUERY_TRACE_LINES: 10
|
||||
depends_on:
|
||||
- canvas-postgres
|
||||
- canvas-redis
|
||||
- postgres
|
||||
- redis
|
||||
networks:
|
||||
default:
|
||||
aliases:
|
||||
- canvas-web
|
||||
- canvas-web.$INST_DOMAIN
|
||||
|
||||
canvas-jobs:
|
||||
jobs:
|
||||
<<: *BASE-SERVICE
|
||||
command: bundle exec script/delayed_job run
|
||||
networks:
|
||||
default:
|
||||
aliases:
|
||||
- canvas-jobs
|
||||
|
||||
canvas-webpack:
|
||||
webpack:
|
||||
<<: *BASE-SERVICE
|
||||
command: yarn run webpack
|
||||
networks:
|
||||
default:
|
||||
aliases:
|
||||
- canvas-webpack
|
||||
|
||||
canvas-postgres:
|
||||
postgres:
|
||||
build: ./docker-compose/postgres
|
||||
env_file: .env
|
||||
environment:
|
||||
|
@ -81,14 +90,22 @@ services:
|
|||
- "traefik.enable=true"
|
||||
volumes:
|
||||
- pg_data:/var/lib/postgresql/data
|
||||
networks:
|
||||
default:
|
||||
aliases:
|
||||
- canvas-postgres
|
||||
|
||||
canvas-redis:
|
||||
redis:
|
||||
image: redis:alpine
|
||||
env_file: .env
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
networks:
|
||||
default:
|
||||
aliases:
|
||||
- canvas-redis
|
||||
|
||||
canvas-githook-installer:
|
||||
githook-installer:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: 'Dockerfile.githook'
|
||||
|
@ -97,6 +114,10 @@ services:
|
|||
- ./.git:/tmp/.git
|
||||
- ./hooks:/tmp/hooks
|
||||
- ./script:/tmp/script
|
||||
networks:
|
||||
default:
|
||||
aliases:
|
||||
- canvas-githook-installer
|
||||
|
||||
networks:
|
||||
default:
|
||||
|
|
Loading…
Reference in New Issue