paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 14:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: Update Circle CI images.

Browse Source 
Removed postgresql and python 2 packages when creating docker images
for Circle CI. Updated the images.
This commit is contained in:
arpit551
2020-06-24 19:09:19 +05:30
committed by Tim Abbott
parent 136c005f3f
commit e19aef569a
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.circleci/config.yml
View File

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

6
tools/circleci/Dockerfile.template
View File

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

4
tools/circleci/images.yml
View File

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