tools: Move CI docker images files into tools/ci.

.circleci/config.yml

@@ -168,7 +168,7 @@ aliases:
 jobs:
   "bionic-backend-frontend":
     docker:
-      # This is built from tools/circleci/images/bionic/Dockerfile .
+      # This is built from tools/ci/images/bionic/Dockerfile .
       # Bionic ships with Python 3.6.
       - image: arpit551/circleci:bionic-python-test
 
@@ -218,7 +218,7 @@ jobs:
 
   "focal-backend":
       docker:
-        # This is built from tools/circleci/images/focal/Dockerfile.
+        # This is built from tools/ci/images/focal/Dockerfile.
         # Focal ships with Python 3.8.2.
         - image: arpit551/circleci:focal-python-test
 
@@ -256,7 +256,7 @@ jobs:
 
   "bionic-production-build":
     docker:
-        # This is built from tools/circleci/images/bionic/Dockerfile .
+        # This is built from tools/ci/images/bionic/Dockerfile .
         # Bionic ships with Python 3.6.
         - image: arpit551/circleci:bionic-python-test
 
@@ -296,7 +296,7 @@ jobs:
 
   "bionic-production-install":
     docker:
-        # This is built from tools/circleci/images/bionic/Dockerfile .
+        # This is built from tools/ci/images/bionic/Dockerfile .
         # Bionic ships with Python 3.6.
         - image: arpit551/circleci:bionic-python-test
 
@@ -318,7 +318,7 @@ jobs:
 
   "focal-production-install":
     docker:
-        # This is built from tools/circleci/images/focal/Dockerfile.
+        # This is built from tools/ci/images/focal/Dockerfile.
         # Focal ships with Python 3.8.2.
         - image: arpit551/circleci:focal-python-test
 

.gitignore

@@ -32,7 +32,7 @@ package-lock.json
 /.dmypy.json
 
 # Dockerfiles generated for CircleCI
-/tools/circleci/images
+/tools/ci/images
 
 # Generated i18n data
 /locale/en

docs/testing/continuous-integration.md

@@ -106,10 +106,10 @@ are defined in the `aliases` section at the top of the file.
 
 CircleCI tests are run in containers that are spun off from the images
 maintained by Zulip team. The Dockerfiles for the various images can be
-generated by running `./tools/circleci/generate-dockerfiles`. This command
+generated by running `./tools/ci/generate-dockerfiles`. This command
 will generate the Dockerfiles of the three Ubuntu releases in
-`./tools/circleci/images/{release_name}` directories. Take a look at
+`./tools/ci/images/{release_name}` directories. Take a look at
-`./tools/circleci/images.yml` to see how the Dockerfiles for the three
+`./tools/ci/images.yml` to see how the Dockerfiles for the three
 releases differ from each other. To further generate images from the
 Dockerfiles and upload it to Docker Hub follow the instructions in the
 generated Dockerfiles.

tools/ci/Dockerfile.template

@@ -20,12 +20,12 @@
 # (but much simpler, with a couple of packages from the distro), and
 # then borrows from the CircleCI Dockerfile.
 
-# To rebuild from this file for a given release, say trusty:
+# To rebuild from this file for a given release, say bionic:
-#   0. $ tools/circleci/generate-dockerfiles
+#   0. $ tools/ci/generate-dockerfiles
-#   1. pick a new image name, like `gregprice/circleci:trusty-python-3.test`
+#   1. pick a new image name, like `gregprice/actions:bionic`
-#   2. $ sudo docker build tools/circleci/images/$RELEASE/ --tag $NAME
+#   2. $ sudo docker build tools/ci/images/$RELEASE/ --tag $NAME
 #   3. $ sudo docker push $NAME
-#   4. update .circleci/config.yml to refer to the new name
+#   4. update .github/workflows/zulip-ci.yml to refer to the new name
 
 FROM {base_image}
 

tools/ci/generate-dockerfiles

@@ -19,7 +19,7 @@ if __name__ == "__main__":
         with open(dockerfile_path, "w") as f:
             f.write("""\
 # THIS IS A GENERATED FILE. DO NOT EDIT.
-# See template: tools/circleci/Dockerfile.template
+# See template: tools/ci/Dockerfile.template
 
 """)
             f.write(docker_template.format_map(dockerfile_settings[distro]))