Spec: add `init: true` to jenkins builds

This will allow use to rely upon builtin "tini" functionality
without needing to manually invoke it like before. This should
ensure that stopping containers is faster across the board.

Change-Id: I101770a6ddcf5cdc216b612bde83156d40198127
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/240309
Reviewed-by: Aaron Ogata <aogata@instructure.com>
Reviewed-by: James Butters <jbutters@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: James Butters <jbutters@instructure.com>
Product-Review: James Butters <jbutters@instructure.com>
This commit is contained in:
Derek Bender 2020-06-16 07:52:05 -05:00
parent 9f11af9b77
commit 8eac98ab2e
9 changed files with 23 additions and 3 deletions

View File

@ -46,6 +46,7 @@ services:
environment: &BASE-ENV
ENCRYPTION_KEY: facdd3a131ddd8988b14f6e4e01039c93cfa0160
RAILS_ENV: development
init: true
webpack:
<<: *BASE

View File

@ -4,4 +4,4 @@ services:
canvas:
volumes:
- "./.git:/usr/src/app/.git"
init: true

View File

@ -8,3 +8,4 @@ services:
dockerfile: ./build/new-jenkins/js/Dockerfile-karma
args:
image_name: $PATCHSET_TAG
init: true

View File

@ -18,6 +18,7 @@ services:
environment:
SCREEN_WIDTH: 1680
SCREEN_HEIGHT: 1050
init: true
canvasrceapi:
image: starlord.inscloudgate.net/jeremyp/canvas-rce-api_web
@ -29,3 +30,4 @@ services:
PASSENGER_MIN_INSTANCES: 2
PASSENGER_MAX_POOL_SIZE: 6
NGINX_WORKER_CONNECTIONS: 2048
init: true

View File

@ -7,3 +7,4 @@ services:
- .git:/usr/src/app/.git
environment:
RAILS_ENV: test
init: true

View File

@ -7,8 +7,9 @@ services:
- redis
environment:
RAILS_ENV: development
ports:
ports:
- "8181:80"
init: true
jobs:
image: $PATCHSET_TAG
@ -18,11 +19,14 @@ services:
environment:
RAILS_ENV: development
command: bundle exec script/delayed_job run
init: true
postgres:
image: starlord.inscloudgate.net/jenkins/postgis:$POSTGRES-2.5
environment:
POSTGRES_PASSWORD: sekret
init: true
redis:
image: starlord.inscloudgate.net/jenkins/redis:alpine
init: true

View File

@ -23,20 +23,25 @@ services:
- cassandra
- redis
- dynamodb
init: true
redis:
image: starlord.inscloudgate.net/jenkins/redis:alpine
init: true
postgres:
image: starlord.inscloudgate.net/jenkins/postgis:$POSTGRES-${POSTGIS:-2.5}
environment:
POSTGRES_PASSWORD: sekret
init: true
cassandra:
image: starlord.inscloudgate.net/jenkins/cassandra:2.2
environment:
CASSANDRA_START_RPC: 'true'
init: true
dynamodb:
image: starlord.inscloudgate.net/jenkins/dynamodb-local
command: -jar DynamoDBLocal.jar
init: true

View File

@ -4,3 +4,4 @@ services:
canvas:
environment:
DATABASE_URL: postgres://postgres:${POSTGRES_PASSWORD}@postgres:5432/canvas_test
init: true

View File

@ -25,10 +25,12 @@ services:
EXCLUDE_TESTS:
TEST_PATTERN:
# this will stop passenger from booting so the container isn't running anything at all once up
command: /tini -- sleep infinity
command: sleep infinity
init: true
redis:
image: starlord.inscloudgate.net/jenkins/redis:alpine
init: true
postgres:
image: starlord.inscloudgate.net/jenkins/postgis:$POSTGRES-${POSTGIS:-2.5}
@ -37,12 +39,15 @@ services:
# parallel_tests
DOCKER_PROCESSES:
init: true
cassandra:
image: starlord.inscloudgate.net/jenkins/cassandra:2.2
environment:
CASSANDRA_START_RPC: 'true'
init: true
dynamodb:
image: starlord.inscloudgate.net/jenkins/dynamodb-local
command: -jar DynamoDBLocal.jar #-dbPath /home/dynamodblocal
init: true