From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Thu, 18 Mar 2021 08:19:33 +0000 (+0100)
Subject: circleci: use upstream docker images instead of the circleci forks
X-Git-Tag: rec-4.5.0-beta1~18^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F10187%2Fhead;p=thirdparty%2Fpdns.git

circleci: use upstream docker images instead of the circleci forks
---

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