From 9ed29355f0e28716b8cd644065ce9b1c1fab0544 Mon Sep 17 00:00:00 2001 From: Martin Gruner Date: Wed, 22 Dec 2021 09:25:09 +0100 Subject: [PATCH] Maintenance: Switch from a hardcoded registry URL to $CI_REGISTRY. --- .gitlab-ci.yml | 2 +- .gitlab/ci/base.yml | 16 +++---- .../ci/browser-integration/otrs_chrome.yml | 8 ++-- .gitlab/ci/integration/otrs.yml | 48 +++++++++---------- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8ad6f8a5f..d6a00604e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ default: - image: registry.znuny.com/docker/zammad-ci:2.7.4 + image: $CI_REGISTRY/docker/zammad-ci:2.7.4 include: - local: '/.gitlab/ci/base.yml' diff --git a/.gitlab/ci/base.yml b/.gitlab/ci/base.yml index 9f5c65042..2c999e26c 100644 --- a/.gitlab/ci/base.yml +++ b/.gitlab/ci/base.yml @@ -74,35 +74,35 @@ # DB Docker .docker_mysql: &docker_mysql - name: registry.znuny.com/docker/zammad-mysql:stable + name: $CI_REGISTRY/docker/zammad-mysql:stable alias: mysql .docker_postgresql: &docker_postgresql - name: registry.znuny.com/docker/zammad-postgresql:stable + name: $CI_REGISTRY/docker/zammad-postgresql:stable alias: postgresql .docker_elasticsearch: &docker_elasticsearch - name: registry.znuny.com/docker/zammad-elasticsearch:$ELASTICSEARCH_TAG + name: $CI_REGISTRY/docker/zammad-elasticsearch:$ELASTICSEARCH_TAG alias: elasticsearch .docker_selenium_chrome: &docker_selenium_chrome - name: registry.znuny.com/docker/zammad-selenium-chrome:stable + name: $CI_REGISTRY/docker/zammad-selenium-chrome:stable alias: selenium-chrome .docker_selenium_firefox: &docker_selenium_firefox - name: registry.znuny.com/docker/zammad-selenium-firefox:stable + name: $CI_REGISTRY/docker/zammad-selenium-firefox:stable alias: selenium-firefox .docker_imap: &docker_imap - name: registry.znuny.com/docker/zammad-imap:stable + name: $CI_REGISTRY/docker/zammad-imap:stable alias: mail .docker_redis: &docker_redis - name: registry.znuny.com/docker/zammad-redis:stable + name: $CI_REGISTRY/docker/zammad-redis:stable alias: redis .docker_memcached: &docker_memcached - name: registry.znuny.com/docker/zammad-memcached:stable + name: $CI_REGISTRY/docker/zammad-memcached:stable alias: memcached command: ["memcached", "-m", "256M"] diff --git a/.gitlab/ci/browser-integration/otrs_chrome.yml b/.gitlab/ci/browser-integration/otrs_chrome.yml index 6f96953aa..79ae8ed9a 100644 --- a/.gitlab/ci/browser-integration/otrs_chrome.yml +++ b/.gitlab/ci/browser-integration/otrs_chrome.yml @@ -7,11 +7,11 @@ otrs_chrome: IMPORT_OTRS_ENDPOINT: "http://zammad-ci-otrsimport-app/otrs/public.pl?Action=ZammadMigrator" TZ: "Europe/Berlin" # Required for the zammad-ci-otrsimport-app containers services: - - name: registry.znuny.com/docker/zammad-postgresql:stable + - name: $CI_REGISTRY/docker/zammad-postgresql:stable alias: postgresql - - name: registry.znuny.com/docker/zammad-selenium-chrome:stable + - name: $CI_REGISTRY/docker/zammad-selenium-chrome:stable alias: selenium-chrome - - name: registry.znuny.com/docker/zammad-ci-otrsimport-db:otrs6 + - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-db:otrs6 alias: zammad-ci-otrsimport-db - - name: registry.znuny.com/docker/zammad-ci-otrsimport-app:otrs6 + - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-app:otrs6 alias: zammad-ci-otrsimport-app diff --git a/.gitlab/ci/integration/otrs.yml b/.gitlab/ci/integration/otrs.yml index 2eddc231e..040520306 100644 --- a/.gitlab/ci/integration/otrs.yml +++ b/.gitlab/ci/integration/otrs.yml @@ -12,71 +12,71 @@ otrs:6: <<: *template_integration_otrs services: - - name: registry.znuny.com/docker/zammad-mysql:stable + - name: $CI_REGISTRY/docker/zammad-mysql:stable alias: mysql - - name: registry.znuny.com/docker/zammad-postgresql:stable + - name: $CI_REGISTRY/docker/zammad-postgresql:stable alias: postgresql - - name: registry.znuny.com/docker/zammad-ci-otrsimport-db:otrs6 + - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-db:otrs6 alias: zammad-ci-otrsimport-db - - name: registry.znuny.com/docker/zammad-ci-otrsimport-app:otrs6 + - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-app:otrs6 alias: zammad-ci-otrsimport-app otrs:5: <<: *template_integration_otrs services: - - name: registry.znuny.com/docker/zammad-mysql:stable + - name: $CI_REGISTRY/docker/zammad-mysql:stable alias: mysql - - name: registry.znuny.com/docker/zammad-postgresql:stable + - name: $CI_REGISTRY/docker/zammad-postgresql:stable alias: postgresql - - name: registry.znuny.com/docker/zammad-ci-otrsimport-db:otrs5 + - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-db:otrs5 alias: zammad-ci-otrsimport-db - - name: registry.znuny.com/docker/zammad-ci-otrsimport-app:otrs5 + - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-app:otrs5 alias: zammad-ci-otrsimport-app otrs:4: <<: *template_integration_otrs services: - - name: registry.znuny.com/docker/zammad-mysql:stable + - name: $CI_REGISTRY/docker/zammad-mysql:stable alias: mysql - - name: registry.znuny.com/docker/zammad-postgresql:stable + - name: $CI_REGISTRY/docker/zammad-postgresql:stable alias: postgresql - - name: registry.znuny.com/docker/zammad-ci-otrsimport-db:otrs4 + - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-db:otrs4 alias: zammad-ci-otrsimport-db - - name: registry.znuny.com/docker/zammad-ci-otrsimport-app:otrs4 + - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-app:otrs4 alias: zammad-ci-otrsimport-app otrs:33: <<: *template_integration_otrs services: - - name: registry.znuny.com/docker/zammad-mysql:stable + - name: $CI_REGISTRY/docker/zammad-mysql:stable alias: mysql - - name: registry.znuny.com/docker/zammad-postgresql:stable + - name: $CI_REGISTRY/docker/zammad-postgresql:stable alias: postgresql - - name: registry.znuny.com/docker/zammad-ci-otrsimport-db:otrs33 + - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-db:otrs33 alias: zammad-ci-otrsimport-db - - name: registry.znuny.com/docker/zammad-ci-otrsimport-app:otrs33 + - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-app:otrs33 alias: zammad-ci-otrsimport-app otrs:32: <<: *template_integration_otrs services: - - name: registry.znuny.com/docker/zammad-mysql:stable + - name: $CI_REGISTRY/docker/zammad-mysql:stable alias: mysql - - name: registry.znuny.com/docker/zammad-postgresql:stable + - name: $CI_REGISTRY/docker/zammad-postgresql:stable alias: postgresql - - name: registry.znuny.com/docker/zammad-ci-otrsimport-db:otrs32 + - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-db:otrs32 alias: zammad-ci-otrsimport-db - - name: registry.znuny.com/docker/zammad-ci-otrsimport-app:otrs32 + - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-app:otrs32 alias: zammad-ci-otrsimport-app otrs:31: <<: *template_integration_otrs services: - - name: registry.znuny.com/docker/zammad-mysql:stable + - name: $CI_REGISTRY/docker/zammad-mysql:stable alias: mysql - - name: registry.znuny.com/docker/zammad-postgresql:stable + - name: $CI_REGISTRY/docker/zammad-postgresql:stable alias: postgresql - - name: registry.znuny.com/docker/zammad-ci-otrsimport-db:otrs31 + - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-db:otrs31 alias: zammad-ci-otrsimport-db - - name: registry.znuny.com/docker/zammad-ci-otrsimport-app:otrs31 + - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-app:otrs31 alias: zammad-ci-otrsimport-app