Switch CircleCI to remote docker

Use remote docker rather than machine image and docker-compose
to run integration tests.
* Update MariaDB supported versions.

Signed-off-by: Ben Kochie <superq@gmail.com>

Author: SuperQ

.circleci/config.yml

@@ -2,7 +2,7 @@
 version: 2.1
 
 orbs:
-  prometheus: prometheus/prometheus@0.5.0
+  prometheus: prometheus/prometheus@0.8.0
 
 executors:
   # Whenever the Go version is updated here, .promu.yml
@@ -22,23 +22,24 @@ jobs:
         file: mysqld_exporter
 
   integration:
-    machine:
-      image: ubuntu-1604:202004-01
+    docker:
+    - image: circleci/golang:1.15
+    - image: << parameters.mysql_image >>
+      environment:
+        MYSQL_ALLOW_EMPTY_PASSWORD: yes
+        MYSQL_ROOT_HOST: '%'
 
     parameters:
       mysql_image:
         type: string
 
     steps:
     - checkout
+    - setup_remote_docker
     - run: docker version
     - run: docker-compose --version
     - run: make build
-    - run:
-        name: Run integration test
-        command: |
-          MYSQL_IMAGE=<< parameters.mysql_image >> docker-compose up -d
-          make test
+    - run: make test
 
   codespell:
     docker:
@@ -74,10 +75,10 @@ workflows:
             - mysql/mysql-server:5.6
             - mysql/mysql-server:5.7
             - mysql/mysql-server:8.0
-            - mariadb:10.1
             - mariadb:10.2
             - mariadb:10.3
             - mariadb:10.4
+            - mariadb:10.5
     - prometheus/build:
         name: build
         filters:

README.md

@@ -9,7 +9,7 @@ Prometheus exporter for MySQL server metrics.
 
 Supported versions:
 * MySQL >= 5.6.
-* MariaDB >= 10.1
+* MariaDB >= 10.2
 
 NOTE: Not all collection methods are supported on MySQL/MariaDB < 5.6
 

collector/exporter_test.go

@@ -83,6 +83,6 @@ func TestGetMySQLVersion(t *testing.T) {
 		convey.So(err, convey.ShouldBeNil)
 		defer db.Close()
 
-		convey.So(getMySQLVersion(db, logger), convey.ShouldBeBetweenOrEqual, 5.6, 10.4)
+		convey.So(getMySQLVersion(db, logger), convey.ShouldBeBetweenOrEqual, 5.6, 10.5)
 	})
 }