opendev/system-config
Code Issues Proposed changes

Merge "Revert "Move system-config irc bots into quay.io""

Browse Source
This commit is contained in:
Zuul 2023-05-25 17:27:34 +00:00 committed by Gerrit Code Review
commit a72693015c
10 changed files with 24 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/accessbot/Dockerfile
View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM quay.io/opendevorg/python-base:3.11-bullseye
FROM docker.io/opendevorg/python-base:3.11-bullseye
RUN pip install pyyaml irc
COPY accessbot.py /usr/local/bin/accessbot.py

4
docker/ircbot/Dockerfile
View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM quay.io/opendevorg/python-builder:3.9-bullseye as builder
FROM docker.io/opendevorg/python-builder:3.9-bullseye as builder
ARG ZUUL_SIBLINGS=""
RUN apt-get update \
@ -25,7 +25,7 @@ COPY . /tmp/src
RUN assemble
FROM quay.io/opendevorg/python-base:3.9-bullseye as ircbot
FROM docker.io/opendevorg/python-base:3.9-bullseye as ircbot
COPY --from=builder /output /output

4
docker/matrix-eavesdrop/Dockerfile
View File

@ -13,12 +13,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM quay.io/opendevorg/python-builder:3.9-bullseye as builder
FROM docker.io/opendevorg/python-builder:3.9-bullseye as builder
COPY src /tmp/src
RUN assemble
FROM quay.io/opendevorg/python-base:3.9-bullseye as eavesdrop
FROM docker.io/opendevorg/python-base:3.9-bullseye as eavesdrop
COPY --from=builder /output/ /output
RUN /output/install-from-bindep \

2
playbooks/roles/accessbot/files/accessbot
View File

@ -17,4 +17,4 @@
exec docker run --rm --net=host \
-v/etc/accessbot:/etc/accessbot \
-v/var/log/accessbot:/var/log/accessbot \
quay.io/opendevorg/accessbot
docker.io/opendevorg/accessbot

2
playbooks/roles/accessbot/tasks/main.yaml
View File

@ -33,4 +33,4 @@
logrotate_file_name: /var/log/accessbot/accessbot.log
- name: Pull latest image
command: docker pull quay.io/opendevorg/accessbot
command: docker pull docker.io/opendevorg/accessbot

2
playbooks/roles/limnoria/files/docker-compose.yaml
View File

@ -4,7 +4,7 @@ version: '2'
services:
ircbot:
image: quay.io/opendevorg/ircbot:latest
image: docker.io/opendevorg/ircbot:latest
network_mode: host
restart: always
logging:

2
playbooks/roles/matrix-eavesdrop/files/docker-compose.yaml
View File

@ -4,7 +4,7 @@ version: '2'
services:
eavesdrop:
image: quay.io/opendevorg/matrix-eavesdrop:latest
image: docker.io/opendevorg/matrix-eavesdrop:latest
network_mode: host
restart: always
logging:

15
zuul.d/docker-images/accessbot.yaml
View File

@ -2,18 +2,13 @@
- job:
name: system-config-build-image-accessbot
description: Build a accessbot image.
parent: system-config-build-container-image
parent: system-config-build-image
requires: python-base-3.11-bullseye-container-image
provides: accessbot-container-image
vars: &accessbot_vars
promote_container_image_job: system-config-upload-image-accessbot
container_images:
docker_images:
- context: docker/accessbot
registry: quay.io
repository: quay.io/opendevorg/accessbot
namespace: opendevorg
repo_shortname: accessbot
repo_description: IRC acl management bot
repository: opendevorg/accessbot
files: &accessbot_files
- docker/accessbot/
- docker/python-base/
@ -21,7 +16,7 @@
- job:
name: system-config-upload-image-accessbot
description: Build and upload a accessbot image.
parent: system-config-upload-container-image
parent: system-config-upload-image
requires: python-base-3.11-bullseye-container-image
provides: accessbot-container-image
vars: *accessbot_vars
@ -30,6 +25,6 @@
- job:
name: system-config-promote-image-accessbot
description: Promote a previously published accessbot image to latest.
parent: system-config-promote-container-image
parent: system-config-promote-image
vars: *accessbot_vars
files: *accessbot_files

15
zuul.d/docker-images/eavesdrop.yaml
View File

@ -2,27 +2,22 @@
- job:
name: system-config-build-image-matrix-eavesdrop
description: Build a matrix-eavesdrop image.
parent: system-config-build-container-image
parent: system-config-build-image
requires: &matrix-eavesdrop_requires
- python-base-3.9-bullseye-container-image
- python-builder-3.9-bullseye-container-image
provides: matrix-eavesdrop-container-image
vars: &matrix-eavesdrop_vars
promote_container_image_job: system-config-upload-image-matrix-eavesdrop
container_images:
docker_images:
- context: docker/matrix-eavesdrop
registry: quay.io
repository: quay.io/opendevorg/matrix-eavesdrop
namespace: opendevorg
repo_shortname: matrix-eavesdrop
repo_description: A matrix log collection bot.
repository: opendevorg/matrix-eavesdrop
files: &matrix-eavesdrop_files
- docker/matrix-eavesdrop/.*
- job:
name: system-config-upload-image-matrix-eavesdrop
description: Build and upload a matrix-eavesdrop image.
parent: system-config-upload-container-image
parent: system-config-upload-image
requires: *matrix-eavesdrop_requires
provides: matrix-eavesdrop-container-image
vars: *matrix-eavesdrop_vars
@ -31,6 +26,6 @@
- job:
name: system-config-promote-image-matrix-eavesdrop
description: Promote a previously published matrix-eavesdrop image to latest.
parent: system-config-promote-container-image
parent: system-config-promote-image
vars: *matrix-eavesdrop_vars
files: *matrix-eavesdrop_files

15
zuul.d/docker-images/ircbot.yaml
View File

@ -2,7 +2,7 @@
- job:
name: system-config-build-image-ircbot
description: Build a ircbot image.
parent: system-config-build-container-image
parent: system-config-build-image
requires: &ircbot_requires
- python-base-3.9-bullseye-container-image
- python-builder-3.9-bullseye-container-image
@ -10,15 +10,10 @@
required-projects: &ircbot_required_projects
- opendev/meetbot
vars: &ircbot_vars
promote_container_image_job: system-config-upload-image-ircbot
container_images:
docker_images:
- context: docker/ircbot
target: ircbot
registry: quay.io
repository: quay.io/opendevorg/ircbot
namespace: opendevorg
repo_shortname: ircbot
repo_description: A limnoria + meetbot IRC bot
repository: opendevorg/ircbot
siblings:
- opendev.org/opendev/meetbot
files: &ircbot_files
@ -26,7 +21,7 @@
- job:
name: system-config-upload-image-ircbot
description: Build and upload a ircbot image.
parent: system-config-upload-container-image
parent: system-config-upload-image
requires: *ircbot_requires
provides: ircbot-container-image
required-projects: *ircbot_required_projects
@ -36,6 +31,6 @@
- job:
name: system-config-promote-image-ircbot
description: Promote a previously published ircbot image to latest.
parent: system-config-promote-container-image
parent: system-config-promote-image
vars: *ircbot_vars
files: *ircbot_files