ci: Update outdated comments, documentation and gitignore.

Use of `Dockerfile.template` and generated `tools/ci/images/` was
removed in 16067bc4fc.
This commit is contained in:
Alex Vandiver 2021-07-22 19:33:39 +00:00 committed by Tim Abbott
parent d0b3801596
commit d78723b6e8
4 changed files with 8 additions and 18 deletions

View File

@ -115,8 +115,8 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
include: include:
# Base images are built using `tools/ci/Dockerfile.template`. # Docker images are built from 'tools/ci/Dockerfile'; the comments at
# The comments at the top explain how to build and upload these images. # the top explain how to build and upload these images.
- docker_image: zulip/ci:bionic - docker_image: zulip/ci:bionic
name: Bionic production install with custom db name and user name: Bionic production install with custom db name and user
is_bionic: true is_bionic: true

View File

@ -16,26 +16,20 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
include: include:
# This docker image was created by a generated Dockerfile at: # Base images are built using `tools/ci/Dockerfile.prod.template`.
# tools/ci/images/bionic/Dockerfile # The comments at the top explain how to build and upload these images.
# Bionic ships with Python 3.6. # Bionic ships with Python 3.6.
- docker_image: zulip/ci:bionic - docker_image: zulip/ci:bionic
name: Ubuntu 18.04 Bionic (Python 3.6, backend + frontend) name: Ubuntu 18.04 Bionic (Python 3.6, backend + frontend)
os: bionic os: bionic
is_bionic: true is_bionic: true
include_frontend_tests: 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. # Focal ships with Python 3.8.2.
- docker_image: zulip/ci:focal - docker_image: zulip/ci:focal
name: Ubuntu 20.04 Focal (Python 3.8, backend) name: Ubuntu 20.04 Focal (Python 3.8, backend)
os: focal os: focal
is_focal: true is_focal: true
include_frontend_tests: false 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. # Bullseye ships with Python 3.9.2.
- docker_image: zulip/ci:bullseye - docker_image: zulip/ci:bullseye
name: Debian 11 Bullseye (Python 3.9, backend) name: Debian 11 Bullseye (Python 3.9, backend)

3
.gitignore vendored
View File

@ -34,9 +34,6 @@ package-lock.json
/.dmypy.json /.dmypy.json
# Dockerfiles generated for continuous integration
/tools/ci/images
# Generated i18n data # Generated i18n data
/locale/en /locale/en
/locale/language_options.json /locale/language_options.json

View File

@ -92,11 +92,10 @@ are defined in the `aliases` section at the top of the file.
### Images ### Images
GitHub Actions tests are run in containers started from images GitHub Actions tests are run in containers that are spun off from the
maintained by the Zulip team. These images are built by the `docker images maintained by Zulip team. The Docker images can be generated by
build` commands listed in `tools/ci/build-docker-images`. See the running `tools/ci/build-docker-images`; see instructions at the top of
comments in `tools/ci/Dockerfile` and `tools/ci/Dockerfile.prod` for `tools/ci/Dockerfile` for more information.
more information.
### Performance optimizations ### Performance optimizations