ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
canvas-lms/docker-compose.new-jenkins-...

10 lines
538 B
YAML
Raw Normal View History

Add linters to new Jenkins This moves eslint, stylelint, and xsslint to be part of our JS build pipeline. It does not account for other linters that are more general like tatl_tael linters and commit messages or non-frontend language specific linters like rubocop. Test Plan: - The linters-and-js build on New Jenkins should run and actually run the linters specified above. closes COREFE-220 flag = none Change-Id: I8f633caf9af025c83bbe68fbd1536276a838c159 Reviewed-on: https://gerrit.instructure.com/206106 Tested-by: Jenkins Reviewed-by: Ed Schiebel <eschiebel@instructure.com> Reviewed-by: Ryan Shaw <ryan@instructure.com> QA-Review: Ryan Shaw <ryan@instructure.com> Product-Review: Ryan Shaw <ryan@instructure.com>
2019-08-22 03:12:19 +08:00
# it is intended that this be used exclusive of all other docker-compose.*yml files in CI
version: "2.1"
services:
web:
image: "${PATCHSET_TAG}"
volumes:
- ".git:/usr/src/app/.git"
Configure databases in a unified manner This patchset removes the much duplicated database.yml and instead defaults to a DATABASE_URL scheme. There is however still present a docker-compose/config/new-jenkins/database.yml file to temporarily allow our internal portal service to still function until such time we can reconfigure it. To set up custom connection options all that is needed is setting DATABASE_URL. See examples of this in docker-compose.yml and docker-compose.new-jenkins.yml. Test Plan ========= Image: - pulling canvas-lms:master image boots without database errors Repo: - given default dev environment where COMPOSE_FILE=docker-compose.yml:docker-compose.override.yml - build the web and postgres images: docker-compose build web postgres (feel free to comment out `yarn install` and `compile_assets` in the Dockerfile since we won't be needing them for this test and this speeds things up) - set a custom DATABASE_URL to change the database name and echo it to see it gets into the image correctly: $ docker run -it -e \ DATABASE_URL=postgres://postgres:sekret@postgres/canvas_custom_env \ $(docker-compose ps -q web) bash -c "echo \$DATABASE_URL" => postgres://postgres:sekret@postgres/canvas_custom_env $ docker-compose run --rm -e \ DATABASE_URL=postgres://postgres:sekret@postgres/canvas_custom_env \ web bash -c "echo \$DATABASE_URL" => postgres://postgres:sekret@postgres/canvas_custom_env - Test that setting a custom database name via DATABASE_URL can create the database $ docker-compose run --rm -e \ DATABASE_URL=postgres://postgres:sekret@postgres/canvas_custom_env \ web bash -c "bin/rails db:create" => Created database 'canvas_custom_env' - This patchset boots on portal Change-Id: Ic6f3819550df94b6c98b17ef05ac2029a578cfe4 Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/234213 Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com> Reviewed-by: Jacob Powell <spowell@instructure.com> Reviewed-by: James Butters <jbutters@instructure.com> QA-Review: Robin Kuss <rkuss@instructure.com> QA-Review: Rex Fleischer <rfleischer@instructure.com> QA-Review: Jacob Powell <spowell@instructure.com> Product-Review: Rex Fleischer <rfleischer@instructure.com>
2020-04-16 02:52:10 +08:00
environment:
DATABASE_URL: postgres://postgres:${POSTGRES_PASSWORD}@postgres:5432/${DATABASE_NAME}?encoding=utf8&timeout=5000&shard_name=public&schema_search_path=''&use_qualified_names=true&shard1=${DATABASE_NAME}_shard_1&shard2=${DATABASE_NAME}_shard_2&test_shard_1=${DATABASE_NAME}_shard_1&test_shard_2=${DATABASE_NAME}_shard_2