Update docker registry

This commit is contained in:
mmontes11
2024-07-23 10:34:43 +02:00
committed by Martin Montes
parent e39c15ac3e
commit 2e776fcd62
5 changed files with 17 additions and 17 deletions

View File

@ -145,12 +145,12 @@ jobs:
go-version-file: "go.mod"
cache: true
- name: Login GCR
- name: Login Docker MariaDB
uses: docker/login-action@v3
with:
registry: us-central1-docker.pkg.dev
username: _json_key
password: ${{ secrets.GCR_JSON_KEY }}
registry: docker-registry.mariadb.com
username: ${{ secrets.DOCKER_MARIADB_USER }}
password: ${{ secrets.DOCKER_MARIADB_PASSWORD }}
- name: Cluster
run: |

View File

@ -66,12 +66,12 @@ jobs:
username: ${{ secrets.DOCKERHUB_USER }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Login GCR
- name: Login Docker MariaDB
uses: docker/login-action@v3
with:
registry: us-central1-docker.pkg.dev
username: _json_key
password: ${{ secrets.GCR_JSON_KEY }}
registry: docker-registry.mariadb.com
username: ${{ secrets.DOCKER_MARIADB_USER }}
password: ${{ secrets.DOCKER_MARIADB_PASSWORD }}
- name: Create cluster for scorecard tests
run: make cluster

View File

@ -22,12 +22,12 @@ jobs:
go-version-file: "go.mod"
cache: true
- name: Login GCR
- name: Login Docker MariaDB
uses: docker/login-action@v3
with:
registry: us-central1-docker.pkg.dev
username: _json_key
password: ${{ secrets.GCR_JSON_KEY }}
registry: docker-registry.mariadb.com
username: ${{ secrets.DOCKER_MARIADB_USER }}
password: ${{ secrets.DOCKER_MARIADB_PASSWORD }}
- name: Cluster
run: |

8
.vscode/launch.json vendored
View File

@ -45,13 +45,13 @@
"MARIADB_OPERATOR_NAME": "mariadb-operator",
"MARIADB_OPERATOR_NAMESPACE": "default",
"MARIADB_OPERATOR_SA_PATH": "/tmp/mariadb-operator/token",
"MARIADB_OPERATOR_IMAGE": "mariadb/mariadb-operator-enterprise:v0.0.26",
"RELATED_IMAGE_MARIADB": "us-central1-docker.pkg.dev/mariadb-es-docker-registry/enterprise-docker/enterprise-server:10.6",
"MARIADB_OPERATOR_IMAGE": "mariadb/mariadb-operator-enterprise:v0.0.29",
"RELATED_IMAGE_MARIADB": "docker-registry.mariadb.com/enterprise-server:10.6.18-14",
"RELATED_IMAGE_MAXSCALE": "mariadb/maxscale:23.08",
"RELATED_IMAGE_EXPORTER": "prom/mysqld-exporter:v0.15.1",
"RELATED_IMAGE_EXPORTER_MAXSCALE": "mariadb/maxscale-prometheus-exporter-ubi:latest",
"MARIADB_GALERA_INIT_IMAGE": "mariadb/mariadb-operator-enterprise:v0.0.26",
"MARIADB_GALERA_AGENT_IMAGE": "mariadb/mariadb-operator-enterprise:v0.0.26",
"MARIADB_GALERA_INIT_IMAGE": "mariadb/mariadb-operator-enterprise:v0.0.29",
"MARIADB_GALERA_AGENT_IMAGE": "mariadb/mariadb-operator-enterprise:v0.0.29",
"MARIADB_GALERA_LIB_PATH": "/usr/lib/galera/libgalera_enterprise_smm.so",
"MARIADB_ENTRYPOINT_VERSION": "10.11",
}

View File

@ -122,7 +122,7 @@ openshift-registry-add: oc jq ## Add catalog registry in OpenShift global config
.PHONY: openshift-registry
openshift-registry: openshift-ctx ## Setup registries in OpenShift global config.
$(MAKE) openshift-registry-add OCP_REGISTRY_URL=https://index.docker.io/v1/
$(MAKE) openshift-registry-add OCP_REGISTRY_URL=us-central1-docker.pkg.dev
$(MAKE) openshift-registry-add OCP_REGISTRY_URL=docker-registry.mariadb.com
CERTIFIED_REPO ?= "https://github.com/mariadb-operator/certified-operators"
CERTIFIED_BRANCH ?= cert-test