From be651cee113cef1d9c38daf5a3c5951a637021f7 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Sat, 29 May 2021 00:43:48 +0200 Subject: [PATCH 1/3] Migrate more services to GHCR Signed-off-by: Lukas Reschke --- .drone.yml | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/.drone.yml b/.drone.yml index b0eace8585..fe870e42db 100644 --- a/.drone.yml +++ b/.drone.yml @@ -204,7 +204,7 @@ steps: services: - name: cache - image: redis + image: ghcr.io/nextcloud/continuous-integration-redis:latest trigger: branch: @@ -241,7 +241,7 @@ steps: services: - name: cache - image: redis + image: ghcr.io/nextcloud/continuous-integration-redis:latest trigger: branch: @@ -278,7 +278,7 @@ steps: services: - name: cache - image: redis + image: ghcr.io/nextcloud/continuous-integration-redis:latest trigger: branch: @@ -305,7 +305,7 @@ steps: services: - name: cache - image: redis + image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: mariadb image: mariadb:10.1 environment: @@ -341,7 +341,7 @@ steps: services: - name: cache - image: redis + image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: mariadb image: mariadb:10.2 environment: @@ -376,7 +376,7 @@ steps: services: - name: cache - image: redis + image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: mariadb image: mariadb:10.3 environment: @@ -417,7 +417,7 @@ steps: services: - name: cache - image: redis + image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: mariadb image: mariadb:10.4 environment: @@ -453,9 +453,9 @@ steps: services: - name: cache - image: redis + image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: mysql - image: mysql:8.0 + image: ghcr.io/nextcloud/continuous-integration-mysql-8.0:mysql-8.0 command: [ "--default-authentication-plugin=mysql_native_password" ] environment: MYSQL_ROOT_PASSWORD: owncloud @@ -491,7 +491,7 @@ steps: services: - name: cache - image: redis + image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: postgres-9 image: postgres:9.6 environment: @@ -527,7 +527,7 @@ steps: services: - name: cache - image: redis + image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: postgres-10 image: postgres:10 environment: @@ -562,7 +562,7 @@ steps: services: - name: cache - image: redis + image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: postgres-11 image: postgres:11 environment: @@ -598,7 +598,7 @@ steps: services: - name: cache - image: redis + image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: postgres-12 image: postgres:12 environment: @@ -634,7 +634,7 @@ steps: services: - name: cache - image: redis + image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: postgres-13 image: postgres:13 environment: @@ -674,9 +674,9 @@ steps: services: - name: cache - image: redis + image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: mysqlmb4 - image: mysql:5.7.22 + image: ghcr.io/nextcloud/continuous-integration-mysql-5.7:mysql-5.7.22 environment: MYSQL_ROOT_PASSWORD: owncloud MYSQL_USER: oc_autotest @@ -710,9 +710,9 @@ steps: services: - name: cache - image: redis + image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: mysqlmb4 - image: mysql:5.7.22 + image: ghcr.io/nextcloud/continuous-integration-mysql-5.7:mysql-5.7.22 environment: MYSQL_ROOT_PASSWORD: owncloud MYSQL_USER: oc_autotest @@ -904,7 +904,7 @@ steps: services: - name: cache - image: redis + image: ghcr.io/nextcloud/continuous-integration-redis:latest trigger: branch: @@ -1543,7 +1543,7 @@ steps: services: - name: cache - image: redis + image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: openldap image: ghcr.io/nextcloud/continuous-integration-openldap:openldap-7 environment: @@ -1584,7 +1584,7 @@ steps: services: - name: cache - image: redis + image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: openldap image: ghcr.io/nextcloud/continuous-integration-openldap:openldap-7 environment: @@ -1626,7 +1626,7 @@ steps: services: - name: cache - image: redis + image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: openldap image: ghcr.io/nextcloud/continuous-integration-openldap:openldap-7 environment: @@ -2070,7 +2070,7 @@ steps: services: - name: cache - image: redis + image: ghcr.io/nextcloud/continuous-integration-redis:latest trigger: branch: @@ -2101,7 +2101,7 @@ steps: services: - name: cache - image: redis + image: ghcr.io/nextcloud/continuous-integration-redis:latest trigger: branch: From 93da0cfd381525d66e4b66b787565e80d01100a2 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Sat, 29 May 2021 00:51:30 +0200 Subject: [PATCH 2/3] Move PGSQL to GHCR Signed-off-by: Lukas Reschke --- .drone.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index fe870e42db..35c574d838 100644 --- a/.drone.yml +++ b/.drone.yml @@ -493,7 +493,7 @@ services: - name: cache image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: postgres-9 - image: postgres:9.6 + image: ghcr.io/nextcloud/continuous-integration-postgres-9:postgres-9.6 environment: POSTGRES_USER: oc_autotest POSTGRES_DB: oc_autotest_dummy @@ -529,7 +529,7 @@ services: - name: cache image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: postgres-10 - image: postgres:10 + image: ghcr.io/nextcloud/continuous-integration-postgres-10:postgres-10 environment: POSTGRES_USER: oc_autotest POSTGRES_DB: oc_autotest_dummy @@ -564,7 +564,7 @@ services: - name: cache image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: postgres-11 - image: postgres:11 + image: ghcr.io/nextcloud/continuous-integration-postgres-11:postgres-11 environment: POSTGRES_USER: oc_autotest POSTGRES_DB: oc_autotest_dummy @@ -600,7 +600,7 @@ services: - name: cache image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: postgres-12 - image: postgres:12 + image: ghcr.io/nextcloud/continuous-integration-postgres-12:postgres-12 environment: POSTGRES_USER: oc_autotest POSTGRES_DB: oc_autotest_dummy @@ -636,7 +636,7 @@ services: - name: cache image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: postgres-13 - image: postgres:13 + image: ghcr.io/nextcloud/continuous-integration-postgres-13:postgres-13 environment: POSTGRES_USER: oc_autotest POSTGRES_DB: oc_autotest_dummy From b4d6d8a70d86460a4e622a6ff25cbf231f3ac462 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Sat, 29 May 2021 01:01:19 +0200 Subject: [PATCH 3/3] Use MariaDB from GHCR Signed-off-by: Lukas Reschke --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 35c574d838..6b20f01bca 100644 --- a/.drone.yml +++ b/.drone.yml @@ -307,7 +307,7 @@ services: - name: cache image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: mariadb - image: mariadb:10.1 + image: ghcr.io/nextcloud/continuous-integration-mariadb-10.1:10.1 environment: MYSQL_ROOT_PASSWORD: owncloud MYSQL_USER: oc_autotest @@ -343,7 +343,7 @@ services: - name: cache image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: mariadb - image: mariadb:10.2 + image: ghcr.io/nextcloud/continuous-integration-mariadb-10.2:10.2 environment: MYSQL_ROOT_PASSWORD: owncloud MYSQL_USER: oc_autotest @@ -378,7 +378,7 @@ services: - name: cache image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: mariadb - image: mariadb:10.3 + image: ghcr.io/nextcloud/continuous-integration-mariadb-10.3:10.3 environment: MYSQL_ROOT_PASSWORD: owncloud MYSQL_USER: oc_autotest @@ -419,7 +419,7 @@ services: - name: cache image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: mariadb - image: mariadb:10.4 + image: ghcr.io/nextcloud/continuous-integration-mariadb-10.4:10.4 environment: MYSQL_ROOT_PASSWORD: owncloud MYSQL_USER: oc_autotest