From 8eac98ab2e6d1443c5b2e5603bc76541e56d3721 Mon Sep 17 00:00:00 2001 From: Derek Bender Date: Tue, 16 Jun 2020 07:52:05 -0500 Subject: [PATCH] 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 Reviewed-by: James Butters Tested-by: Service Cloud Jenkins QA-Review: James Butters Product-Review: James Butters --- config/docker-compose.override.yml.example | 1 + docker-compose.new-jenkins-flakey-spec-catcher.yml | 2 +- docker-compose.new-jenkins-karma.yml | 1 + docker-compose.new-jenkins-selenium.yml | 2 ++ docker-compose.new-jenkins.canvas.yml | 1 + docker-compose.new-jenkins.consumer.yml | 6 +++++- docker-compose.new-jenkins.multiple-processes.yml | 5 +++++ docker-compose.new-jenkins.vendored-gems.yml | 1 + docker-compose.new-jenkins.yml | 7 ++++++- 9 files changed, 23 insertions(+), 3 deletions(-) diff --git a/config/docker-compose.override.yml.example b/config/docker-compose.override.yml.example index 1650e7a6fe3..3ead31ad344 100644 --- a/config/docker-compose.override.yml.example +++ b/config/docker-compose.override.yml.example @@ -46,6 +46,7 @@ services: environment: &BASE-ENV ENCRYPTION_KEY: facdd3a131ddd8988b14f6e4e01039c93cfa0160 RAILS_ENV: development + init: true webpack: <<: *BASE diff --git a/docker-compose.new-jenkins-flakey-spec-catcher.yml b/docker-compose.new-jenkins-flakey-spec-catcher.yml index 4e5f0f62079..ee4cfe1597f 100644 --- a/docker-compose.new-jenkins-flakey-spec-catcher.yml +++ b/docker-compose.new-jenkins-flakey-spec-catcher.yml @@ -4,4 +4,4 @@ services: canvas: volumes: - "./.git:/usr/src/app/.git" - + init: true diff --git a/docker-compose.new-jenkins-karma.yml b/docker-compose.new-jenkins-karma.yml index 3d3a52a3bef..68078e42bde 100644 --- a/docker-compose.new-jenkins-karma.yml +++ b/docker-compose.new-jenkins-karma.yml @@ -8,3 +8,4 @@ services: dockerfile: ./build/new-jenkins/js/Dockerfile-karma args: image_name: $PATCHSET_TAG + init: true diff --git a/docker-compose.new-jenkins-selenium.yml b/docker-compose.new-jenkins-selenium.yml index 29b82a411fa..97159c12152 100644 --- a/docker-compose.new-jenkins-selenium.yml +++ b/docker-compose.new-jenkins-selenium.yml @@ -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 diff --git a/docker-compose.new-jenkins.canvas.yml b/docker-compose.new-jenkins.canvas.yml index fb08822f845..002f2a6aeda 100644 --- a/docker-compose.new-jenkins.canvas.yml +++ b/docker-compose.new-jenkins.canvas.yml @@ -7,3 +7,4 @@ services: - .git:/usr/src/app/.git environment: RAILS_ENV: test + init: true diff --git a/docker-compose.new-jenkins.consumer.yml b/docker-compose.new-jenkins.consumer.yml index 809d1394d61..556c2627735 100644 --- a/docker-compose.new-jenkins.consumer.yml +++ b/docker-compose.new-jenkins.consumer.yml @@ -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 diff --git a/docker-compose.new-jenkins.multiple-processes.yml b/docker-compose.new-jenkins.multiple-processes.yml index b9d4d0b410d..132dafc2005 100644 --- a/docker-compose.new-jenkins.multiple-processes.yml +++ b/docker-compose.new-jenkins.multiple-processes.yml @@ -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 diff --git a/docker-compose.new-jenkins.vendored-gems.yml b/docker-compose.new-jenkins.vendored-gems.yml index d66cfdb4532..7bcaee4edef 100644 --- a/docker-compose.new-jenkins.vendored-gems.yml +++ b/docker-compose.new-jenkins.vendored-gems.yml @@ -4,3 +4,4 @@ services: canvas: environment: DATABASE_URL: postgres://postgres:${POSTGRES_PASSWORD}@postgres:5432/canvas_test + init: true diff --git a/docker-compose.new-jenkins.yml b/docker-compose.new-jenkins.yml index a8e67dcd561..20478f0c1b3 100644 --- a/docker-compose.new-jenkins.yml +++ b/docker-compose.new-jenkins.yml @@ -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