ci: Update Circle CI images.

Removed postgresql and python 2 packages when creating docker images
for Circle CI. Updated the images.

.circleci/config.yml

@@ -170,7 +170,7 @@ jobs:
     docker:
       # This is built from tools/circleci/images/bionic/Dockerfile .
       # Bionic ships with Python 3.6.
-      - image: amanagr/circleci:bionic-python-2.test
+      - image: arpit551/circleci:bionic-python-test
 
     working_directory: ~/zulip
 
@@ -220,7 +220,7 @@ jobs:
       docker:
         # This is built from tools/circleci/images/focal/Dockerfile.
         # Focal ships with Python 3.8.2.
-        - image: arpit551/circleci:focal-test
+        - image: arpit551/circleci:focal-python-test
 
       working_directory: ~/zulip
 
@@ -243,7 +243,7 @@ jobs:
 
   "xenial-legacy":
     docker:
-      - image: gregprice/circleci:xenial-python-4.test
+      - image: arpit551/circleci:xenial-python-test
 
     working_directory: ~/zulip
 
@@ -258,7 +258,7 @@ jobs:
     docker:
         # This is built from tools/circleci/images/bionic/Dockerfile .
         # Bionic ships with Python 3.6.
-        - image: amanagr/circleci:bionic-python-2.test
+        - image: arpit551/circleci:bionic-python-test
 
     working_directory: ~/zulip
 
@@ -298,7 +298,7 @@ jobs:
     docker:
         # This is built from tools/circleci/images/bionic/Dockerfile .
         # Bionic ships with Python 3.6.
-        - image: amanagr/circleci:bionic-python-2.test
+        - image: arpit551/circleci:bionic-python-test
 
     working_directory: ~/zulip
 
@@ -320,7 +320,7 @@ jobs:
     docker:
         # This is built from tools/circleci/images/focal/Dockerfile.
         # Focal ships with Python 3.8.2.
-        - image: arpit551/circleci:focal-test
+        - image: arpit551/circleci:focal-python-test
 
     working_directory: ~/zulip
 

tools/circleci/Dockerfile.template

@@ -91,9 +91,9 @@ RUN apt-get update \
   && apt-get install --no-install-recommends \
     memcached rabbitmq-server redis-server \
     hunspell-en-us supervisor libssl-dev puppet \
-    gettext libffi-dev libfreetype6-dev zlib1g-dev libjpeg-dev \
-    libldap2-dev libmemcached-dev python-pip \
-    python-six libxml2-dev libxslt1-dev libpq-dev \
+    gettext libffi-dev libfreetype6-dev zlib1g-dev \
+    libjpeg-dev libldap2-dev libmemcached-dev \
+    libxml2-dev libxslt1-dev libpq-dev \
     {extra_packages}
 
 RUN groupadd --gid 3434 circleci \

tools/circleci/images.yml

@@ -1,7 +1,7 @@
 bionic:
   base_image: buildpack-deps:bionic-scm
-  extra_packages: postgresql-10 python-dev
+  extra_packages: python-dev
 
 focal:
   base_image: buildpack-deps:focal-scm
-  extra_packages: postgresql-12 python2-dev
+  extra_packages: python2-dev