From d78723b6e876f2ff5ed9cc5678218b6138ac6b02 Mon Sep 17 00:00:00 2001 From: Alex Vandiver Date: Thu, 22 Jul 2021 19:33:39 +0000 Subject: [PATCH] ci: Update outdated comments, documentation and gitignore. Use of `Dockerfile.template` and generated `tools/ci/images/` was removed in 16067bc4fc5c. --- .github/workflows/production-suite.yml | 4 ++-- .github/workflows/zulip-ci.yml | 10 ++-------- .gitignore | 3 --- docs/testing/continuous-integration.md | 9 ++++----- 4 files changed, 8 insertions(+), 18 deletions(-) diff --git a/.github/workflows/production-suite.yml b/.github/workflows/production-suite.yml index 35f05d11d6..f2795205a7 100644 --- a/.github/workflows/production-suite.yml +++ b/.github/workflows/production-suite.yml @@ -115,8 +115,8 @@ jobs: fail-fast: false matrix: include: - # Base images are built using `tools/ci/Dockerfile.template`. - # The comments at the top explain how to build and upload these images. + # Docker images are built from 'tools/ci/Dockerfile'; the comments at + # the top explain how to build and upload these images. - docker_image: zulip/ci:bionic name: Bionic production install with custom db name and user is_bionic: true diff --git a/.github/workflows/zulip-ci.yml b/.github/workflows/zulip-ci.yml index 2633b30634..93c853cc15 100644 --- a/.github/workflows/zulip-ci.yml +++ b/.github/workflows/zulip-ci.yml @@ -16,26 +16,20 @@ jobs: fail-fast: false matrix: include: - # This docker image was created by a generated Dockerfile at: - # tools/ci/images/bionic/Dockerfile + # Base images are built using `tools/ci/Dockerfile.prod.template`. + # The comments at the top explain how to build and upload these images. # Bionic ships with Python 3.6. - docker_image: zulip/ci:bionic name: Ubuntu 18.04 Bionic (Python 3.6, backend + frontend) os: bionic is_bionic: true include_frontend_tests: true - - # This docker image was created by a generated Dockerfile at: - # tools/ci/images/focal/Dockerfile # Focal ships with Python 3.8.2. - docker_image: zulip/ci:focal name: Ubuntu 20.04 Focal (Python 3.8, backend) os: focal is_focal: true include_frontend_tests: false - - # This docker image was created by a generated Dockerfile at: - # tools/ci/images/focal/Dockerfile # Bullseye ships with Python 3.9.2. - docker_image: zulip/ci:bullseye name: Debian 11 Bullseye (Python 3.9, backend) diff --git a/.gitignore b/.gitignore index 36363701f0..0f1f62197a 100644 --- a/.gitignore +++ b/.gitignore @@ -34,9 +34,6 @@ package-lock.json /.dmypy.json -# Dockerfiles generated for continuous integration -/tools/ci/images - # Generated i18n data /locale/en /locale/language_options.json diff --git a/docs/testing/continuous-integration.md b/docs/testing/continuous-integration.md index c5d169da14..5f0ef30d23 100644 --- a/docs/testing/continuous-integration.md +++ b/docs/testing/continuous-integration.md @@ -92,11 +92,10 @@ are defined in the `aliases` section at the top of the file. ### Images -GitHub Actions tests are run in containers started from images -maintained by the Zulip team. These images are built by the `docker -build` commands listed in `tools/ci/build-docker-images`. See the -comments in `tools/ci/Dockerfile` and `tools/ci/Dockerfile.prod` for -more information. +GitHub Actions tests are run in containers that are spun off from the +images maintained by Zulip team. The Docker images can be generated by +running `tools/ci/build-docker-images`; see instructions at the top of +`tools/ci/Dockerfile` for more information. ### Performance optimizations