Skip to content
This repository has been archived by the owner on Feb 7, 2023. It is now read-only.

Commit

Permalink
Updates to container image registries (#460)
Browse files Browse the repository at this point in the history
* switch to quay.io for aht-tools

We saw some rate limiting errors when pulling from docker.io, so
switch to pulling from quay.io for this container to try to alleviate
the issue.

* update base image registries

Change `centos` to come from CentOS registry
Update Fedora base images
  • Loading branch information
miabbott authored Aug 3, 2020
1 parent 01b3e4a commit a7089e9
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion roles/booted_deployment_set_fact/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ allow_duplicates: true

dependencies:
- role: docker_pull
dp_image: docker.io/miabbott/aht-tools:latest
dp_image: quay.io/miabbott/aht-tools:latest
2 changes: 1 addition & 1 deletion roles/rpm_ostree_status/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ allow_duplicates: true

dependencies:
- role: docker_pull
dp_image: docker.io/miabbott/aht-tools:latest
dp_image: quay.io/miabbott/aht-tools:latest
2 changes: 1 addition & 1 deletion roles/rpm_ostree_status/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
- name: Get rpm-ostree status output
shell: >
rpm-ostree status --json |
docker run --rm -i docker.io/miabbott/aht-tools
docker run --rm -i quay.io/miabbott/aht-tools
jq 'del(.deployments[]["layered-commit-meta"]["rpmostree.rpmdb.pkglist"],
.deployments[]["base-commit-meta"]["rpmostree.rpmdb.pkglist"])'
register: ros
Expand Down
6 changes: 3 additions & 3 deletions tests/docker-build-httpd/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ removed.
The following base images are tested:
- docker.io/alpine
- docker.io/busybox
- docker.io/centos
- registry.centos.org/centos
- docker.io/debian
- docker.io/httpd
- registry.fedoraproject.org/fedora24
- registry.fedoraproject.org/fedora25
- registry.fedoraproject.org/fedora:31
- registry.fedoraproject.org/fedora:32
- docker.io/nginx
- registry.access.redhat.com/rhel6 (RHEL only)
- registry.access.redhat.com/rhel7 (RHEL only)
Expand Down
2 changes: 1 addition & 1 deletion tests/docker-build-httpd/files/centos_httpd/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/centos
FROM registry.centos.org/centos
MAINTAINER Micah Abbott <micah@redhat.com>

LABEL Version=1.2
Expand Down
6 changes: 3 additions & 3 deletions tests/docker-build-httpd/vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
base_images:
- docker.io/alpine
- docker.io/busybox
- docker.io/centos
- registry.centos.org/centos
- docker.io/debian
- docker.io/httpd
- registry.fedoraproject.org/fedora:29
- registry.fedoraproject.org/fedora:30
- registry.fedoraproject.org/fedora:31
- registry.fedoraproject.org/fedora:32
- docker.io/nginx
- docker.io/ubuntu
rhel_base_images:
Expand Down
2 changes: 1 addition & 1 deletion tests/pkg-layering/gpg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
docker run -d -p 80:80
-v /srv/localrepo:/srv/localrepo:z
-w /srv/localrepo
docker.io/miabbott/aht-tools
quay.io/miabbott/aht-tools
/bin/bash -c 'createrepo_c .; python -m SimpleHTTPServer 80'
- name: Wait for port 80 to open
Expand Down
4 changes: 2 additions & 2 deletions tests/rpm-ostree/compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@
when: ansible_distribution == "Fedora"
command: >
docker run -v {{ base_dir }}:{{ base_dir }}:z
docker.io/miabbott/aht-tools /bin/bash -c
quay.io/miabbott/aht-tools /bin/bash -c
"git clone {{ repo_url }} {{ base_dir }}/{{ repo_name }};
cd {{ base_dir }}/{{ repo_name }}; git checkout f27"
- name: Clone sig-atomic-buildscripts repo
when: ansible_distribution == "CentOSDev"
command: >
docker run -v {{ base_dir }}:{{ base_dir }}:z
docker.io/miabbott/aht-tools /bin/bash -c
quay.io/miabbott/aht-tools /bin/bash -c
"git clone {{ repo_url }} {{ base_dir }}/{{ repo_name }};
cd {{ base_dir }}/{{ repo_name }};"
Expand Down
4 changes: 2 additions & 2 deletions tools/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ As of 22-Mar-2018, the following utilities/packages are installed

To run the container:

`# docker run -i docker.io/miabbott/aht-tools <command> <cmd_args>`
`# docker run -i quay.io/miabbott/aht-tools <command> <cmd_args>`

For example:

`# rpm-ostree status --json | docker run -i docker.io/miabbott/aht-tools jq '.'`
`# rpm-ostree status --json | docker run -i quay.io/miabbott/aht-tools jq '.'`

0 comments on commit a7089e9

Please sign in to comment.