ci: remove docker mirror configuration

Instead of using a mirror, the CI registry is now pupulated with
container images that get pulled and tagged as if they get from Docker
Hub or other locations.

This is more of a manual mirror, as the Docker Registry mirror
functionality is not flexible enough for our usecase (push images
without providing them on docker.io).

Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2020-11-26 17:10:22 +01:00 committed by mergify[bot]
parent 468b6cd67d
commit 7cac1f7609
3 changed files with 0 additions and 54 deletions

View File

@ -1,17 +0,0 @@
# /etc/containers/registries.conf
#
# This file contains the registry that is hosted in the CentOS CI OpenShift
# deployment for Ceph-CSI.
#
# By overwriting /etc/containers/registries.conf, short-names for
# container-images can NOT be used anymore.
#
# The CI jobs do a "podman login" for the local registry. Only after that, the
# local mirror is accessible.
#
[[registry]]
prefix = "docker.io"
location = "docker.io"
[[registry.mirror]]
location = "registry-ceph-csi.apps.ocp.ci.centos.org"

View File

@ -49,8 +49,6 @@ spec:
volumeMounts: volumeMounts:
- name: container-images - name: container-images
mountPath: /var/lib/registry mountPath: /var/lib/registry
- name: config
mountPath: /etc/docker/registry
- name: htpasswd - name: htpasswd
mountPath: /auth mountPath: /auth
env: env:
@ -64,9 +62,6 @@ spec:
- name: container-images - name: container-images
persistentVolumeClaim: persistentVolumeClaim:
claimName: ceph-csi-image-registry claimName: ceph-csi-image-registry
- name: config
secret:
secretName: container-registry-config
- name: htpasswd - name: htpasswd
secret: secret:
secretName: container-registry-auth secretName: container-registry-auth

View File

@ -1,32 +0,0 @@
---
apiVersion: v1
kind: Secret
metadata:
name: container-registry-config
labels:
app: container-registry
stringData:
# /etc/docker/registry/config.yml
config.yml: |-
version: 0.1
log:
fields:
service: registry
storage:
cache:
blobdescriptor: inmemory
filesystem:
rootdirectory: /var/lib/registry
http:
addr: :5000
headers:
X-Content-Type-Options: [nosniff]
health:
storagedriver:
enabled: true
interval: 10s
threshold: 3
proxy:
remoteurl: https://docker.io
username: @@USERNAME@@
password: @@PASSWD@@