ci: Switch to hosting the CI images under Zulip on Dockerhub.

This commit is contained in:
Alex Vandiver
2021-03-31 15:59:59 -07:00
committed by Tim Abbott
parent 21bafe1e1e
commit 0023d561dd
3 changed files with 8 additions and 10 deletions

View File

@@ -36,7 +36,7 @@ jobs:
# This docker image was created by a generated Dockerfile at: # This docker image was created by a generated Dockerfile at:
# tools/ci/images/bionic/Dockerfile # tools/ci/images/bionic/Dockerfile
# Bionic ships with Python 3.6. # Bionic ships with Python 3.6.
container: amanagr/actions:bionic container: zulip/ci:bionic
steps: steps:
- name: Add required permissions - name: Add required permissions
run: | run: |
@@ -110,17 +110,17 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
include: include:
- docker_image: amanagr/actions:bionic - docker_image: zulip/ci:bionic
name: Bionic production install name: Bionic production install
is_bionic: true is_bionic: true
os: bionic os: bionic
- docker_image: amanagr/actions:focal - docker_image: zulip/ci:focal
name: Focal production install name: Focal production install
is_focal: true is_focal: true
os: focal os: focal
- docker_image: ligmitz/actions:buster - docker_image: zulip/ci:buster
name: Buster production install name: Buster production install
is_buster: true is_buster: true
os: buster os: buster

View File

@@ -19,7 +19,7 @@ jobs:
# This docker image was created by a generated Dockerfile at: # This docker image was created by a generated Dockerfile at:
# tools/ci/images/bionic/Dockerfile # tools/ci/images/bionic/Dockerfile
# Bionic ships with Python 3.6. # Bionic ships with Python 3.6.
- docker_image: amanagr/actions: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
@@ -28,7 +28,7 @@ jobs:
# This docker image was created by a generated Dockerfile at: # This docker image was created by a generated Dockerfile at:
# tools/ci/images/focal/Dockerfile # tools/ci/images/focal/Dockerfile
# Focal ships with Python 3.8.2. # Focal ships with Python 3.8.2.
- docker_image: amanagr/actions: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

View File

@@ -22,10 +22,8 @@
# To rebuild from this file for a given release, say bionic: # To rebuild from this file for a given release, say bionic:
# 0. $ tools/ci/generate-dockerfiles # 0. $ tools/ci/generate-dockerfiles
# 1. pick a new image name, like `gregprice/actions:bionic` # 1. $ sudo docker build tools/ci/images/$RELEASE/ --tag zulip/ci:$RELEASE
# 2. $ sudo docker build tools/ci/images/$RELEASE/ --tag $NAME # 2. $ sudo docker push zulip/ci:$RELEASE
# 3. $ sudo docker push $NAME
# 4. update .github/workflows/zulip-ci.yml to refer to the new name
FROM {base_image} FROM {base_image}