zuul/zuul
Code Issues Proposed changes

Example docker-compose: support podman

Browse Source 
Podman can be used to deploy the example compose instead of Docker.
Podman enforces short name resolution by default, so specify domain
name for the images pulled by the compose.

Change-Id: Ida4033bb48ec98b08a9ce1c54e2675beeff1e44b
This commit is contained in:
Matthieu Huin 2021-10-25 15:38:09 +02:00
parent b3b0c213a7
commit 95f9a6ab06
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
doc/source/examples/docker-compose.yaml
View File

@ -4,14 +4,14 @@ version: '2'
services: services:
gerrit: gerrit:
image: gerritcodereview/gerrit image: docker.io/gerritcodereview/gerrit
ports: ports:
- "8080:8080" - "8080:8080"
- "29418:29418" - "29418:29418"
environment: environment:
- CANONICAL_WEB_URL=http://localhost:8080/ - CANONICAL_WEB_URL=http://localhost:8080/
gerritconfig: gerritconfig:
image: zuul/zuul-executor image: docker.io/zuul/zuul-executor
environment: environment:
- http_proxy - http_proxy
- https_proxy - https_proxy
@ -28,7 +28,7 @@ services:
# default version of ansible for Zuul. # default version of ansible for Zuul.
command: "/usr/local/lib/zuul/ansible/2.9/bin/ansible-playbook /var/playbooks/setup.yaml" command: "/usr/local/lib/zuul/ansible/2.9/bin/ansible-playbook /var/playbooks/setup.yaml"
zk: zk:
image: zookeeper image: docker.io/zookeeper
hostname: examples_zk_1.examples_default hostname: examples_zk_1.examples_default
volumes: volumes:
- "./playbooks/:/var/playbooks/:z" - "./playbooks/:/var/playbooks/:z"
@ -36,7 +36,7 @@ services:
- "./zoo.cfg:/conf/zoo.cfg:z" - "./zoo.cfg:/conf/zoo.cfg:z"
command: "sh -c '/var/playbooks/wait-to-start-certs.sh && zkServer.sh start-foreground'" command: "sh -c '/var/playbooks/wait-to-start-certs.sh && zkServer.sh start-foreground'"
mysql: mysql:
image: mariadb image: docker.io/mariadb
environment: environment:
MYSQL_ROOT_PASSWORD: rootpassword MYSQL_ROOT_PASSWORD: rootpassword
MYSQL_DATABASE: zuul MYSQL_DATABASE: zuul
@ -60,7 +60,7 @@ services:
zuul-scheduler -f' zuul-scheduler -f'
# FIXME: The scheduler has no ansible anymore so use the executor image. # FIXME: The scheduler has no ansible anymore so use the executor image.
# This needs to be changes such that ansible is not required for startup. # This needs to be changes such that ansible is not required for startup.
image: zuul/zuul-scheduler image: docker.io/zuul/zuul-scheduler
volumes: volumes:
- "./etc_zuul/:/etc/zuul/:z" - "./etc_zuul/:/etc/zuul/:z"
- "./playbooks/:/var/playbooks/:z" - "./playbooks/:/var/playbooks/:z"
@ -76,7 +76,7 @@ services:
- mysql - mysql
ports: ports:
- "9000:9000" - "9000:9000"
image: zuul/zuul-web image: docker.io/zuul/zuul-web
environment: environment:
ZUUL_MYSQL_PASSWORD: secret ZUUL_MYSQL_PASSWORD: secret
volumes: volumes:
@ -92,7 +92,7 @@ services:
- ZUUL_MYSQL_PASSWORD=secret - ZUUL_MYSQL_PASSWORD=secret
depends_on: depends_on:
- scheduler - scheduler
image: zuul/zuul-executor image: docker.io/zuul/zuul-executor
volumes: volumes:
- "./etc_zuul/:/etc/zuul/:z" - "./etc_zuul/:/etc/zuul/:z"
- "./playbooks/:/var/playbooks/:z" - "./playbooks/:/var/playbooks/:z"
@ -113,7 +113,7 @@ services:
launcher: launcher:
depends_on: depends_on:
- zk - zk
image: zuul/nodepool-launcher image: docker.io/zuul/nodepool-launcher
volumes: volumes:
- "./playbooks/:/var/playbooks/:z" - "./playbooks/:/var/playbooks/:z"
- "./etc_nodepool/:/etc/nodepool/:z" - "./etc_nodepool/:/etc/nodepool/:z"

2
doc/source/examples/logs-Dockerfile
View File

@ -1,3 +1,3 @@
FROM httpd:alpine FROM docker.io/httpd:alpine
COPY ./httpd.conf /usr/local/apache2/conf/httpd.conf COPY ./httpd.conf /usr/local/apache2/conf/httpd.conf

2
doc/source/examples/node-Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:20.04 FROM docker.io/ubuntu:20.04
RUN apt-get update \ RUN apt-get update \
&& DEBIAN_FRONTEND="noninteractive" apt-get -y install \ && DEBIAN_FRONTEND="noninteractive" apt-get -y install \