From b5e12b95e593ea2b666fa3302271784e15ae9532 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Thu, 18 Mar 2021 09:19:33 +0100 Subject: [PATCH] circleci: use upstream docker images instead of the circleci forks --- .circleci/config.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c43545f02e..e9f82ac417 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -759,7 +759,9 @@ jobs: environment: UBSAN_OPTIONS: 'print_stacktrace=1:halt_on_error=1' ASAN_OPTIONS: detect_leaks=0 - - image: circleci/mysql:5 # for the hybrid test + - image: mysql:5 # for the hybrid test + environment: + MYSQL_ALLOW_EMPTY_PASSWORD: 1 auth: username: powerdnsreadonly password: $DOCKERHUB_PASSWORD @@ -805,7 +807,9 @@ jobs: environment: UBSAN_OPTIONS: 'print_stacktrace=1:halt_on_error=1' ASAN_OPTIONS: detect_leaks=0 - - image: circleci/mysql:5 + - image: mysql:5 + environment: + MYSQL_ALLOW_EMPTY_PASSWORD: 1 auth: username: powerdnsreadonly password: $DOCKERHUB_PASSWORD @@ -848,7 +852,7 @@ jobs: environment: UBSAN_OPTIONS: 'print_stacktrace=1:halt_on_error=1' ASAN_OPTIONS: detect_leaks=0 - - image: circleci/postgres:9 + - image: postgres:9 auth: username: powerdnsreadonly password: $DOCKERHUB_PASSWORD @@ -1072,7 +1076,9 @@ jobs: environment: UBSAN_OPTIONS: 'print_stacktrace=1:halt_on_error=1' ASAN_OPTIONS: detect_leaks=0 - - image: circleci/mysql:5 + - image: mysql:5 + environment: + MYSQL_ALLOW_EMPTY_PASSWORD: 1 auth: username: powerdnsreadonly password: $DOCKERHUB_PASSWORD @@ -1108,7 +1114,7 @@ jobs: environment: UBSAN_OPTIONS: 'print_stacktrace=1:halt_on_error=1' ASAN_OPTIONS: detect_leaks=0 - - image: circleci/postgres:9 + - image: postgres:9 auth: username: powerdnsreadonly password: $DOCKERHUB_PASSWORD -- 2.47.2