From bb232a27b7cac17b691a5188062b6c2eeeab4df5 Mon Sep 17 00:00:00 2001 From: Armando Miani Date: Thu, 14 Sep 2023 12:43:42 +0200 Subject: [PATCH 1/3] [mysql] Docker images updates - 2023-09-14-124342 --- exporter/Dockerfile | 4 ++-- versions.yaml | 21 +++++++++++---------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/exporter/Dockerfile b/exporter/Dockerfile index 2489175..08acfbd 100644 --- a/exporter/Dockerfile +++ b/exporter/Dockerfile @@ -2,8 +2,8 @@ FROM marketplace.gcr.io/google/c2d-debian11 as exporter-builder ENV GOPATH /usr/local -ENV EXPORTER_VERSION 0.14.0 -ENV EXPORTER_SHA256 c17402137a4e9745f593127f162c1003298910cb8aa7d05bee3384738de094ae +ENV EXPORTER_VERSION 0.15.0 +ENV EXPORTER_SHA256 3973db1c46b0323a957a43916b759ee71ddab9096958ce78401fdff894b0dc51 # Installs packages RUN set -eux \ diff --git a/versions.yaml b/versions.yaml index c9dec24..1524527 100644 --- a/versions.yaml +++ b/versions.yaml @@ -40,8 +40,8 @@ versions: - '8' - latest templateArgs: - distroMajor: '11' distroCodename: bullseye + distroMajor: '11' templateSubDir: debian11 - dir: 5/debian11/5.7 excludeTests: @@ -65,8 +65,8 @@ versions: - '5' - latest templateArgs: - distroMajor: '10' distroCodename: buster + distroMajor: '10' templateSubDir: debian11 - dir: exporter excludeTests: @@ -75,13 +75,13 @@ versions: from: marketplace.gcr.io/google/c2d-debian11 packages: mysqld_exporter: - sha256: c17402137a4e9745f593127f162c1003298910cb8aa7d05bee3384738de094ae - version: 0.14.0 + sha256: 3973db1c46b0323a957a43916b759ee71ddab9096958ce78401fdff894b0dc51 + version: 0.15.0 repo: mysql8 tags: - exporter - - exporter-0.14 - - exporter-0.14.0 + - exporter-0.15 + - exporter-0.15.0 templateSubDir: exporter - dir: exporter excludeTests: @@ -90,11 +90,12 @@ versions: from: marketplace.gcr.io/google/c2d-debian11 packages: mysqld_exporter: - sha256: c17402137a4e9745f593127f162c1003298910cb8aa7d05bee3384738de094ae - version: 0.14.0 + sha256: 3973db1c46b0323a957a43916b759ee71ddab9096958ce78401fdff894b0dc51 + version: 0.15.0 repo: mysql5 tags: - exporter - - exporter-0.14 - - exporter-0.14.0 + - exporter-0.15 + - exporter-0.15.0 templateSubDir: exporter + From 0514cc9dbf6bf7e75207936c9aa1a4ea905b0ceb Mon Sep 17 00:00:00 2001 From: Armando Miani Date: Mon, 18 Sep 2023 13:01:21 +0200 Subject: [PATCH 2/3] Fix tests --- tests/functional_tests/mysqld_exporter_test.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/functional_tests/mysqld_exporter_test.yaml b/tests/functional_tests/mysqld_exporter_test.yaml index 93fc99d..729bdd1 100644 --- a/tests/functional_tests/mysqld_exporter_test.yaml +++ b/tests/functional_tests/mysqld_exporter_test.yaml @@ -1,4 +1,4 @@ -# Copyright (C) 2019 Google Inc. +# Copyright (C) 2023 Google Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,9 +16,9 @@ setup: - command: [docker, network, create, -d, bridge, testbridge-$UNIQUE-id] -- command: [docker, run, --net, testbridge-$UNIQUE-id, --name, mysql-server-$UNIQUE-id, -e, 'MYSQL_ROOT_PASSWORD=example-password', -d, 'launcher.gcr.io/google/mysql5'] +- command: [docker, run, --net, testbridge-$UNIQUE-id, --name, mysql-server-$UNIQUE-id, -e, 'MYSQL_ROOT_PASSWORD=example-password', -d, 'marketplace.gcr.io/google/mysql8'] - command: [sleep, 30s] -- command: [docker, run, --net, testbridge-$UNIQUE-id, --name, mysqld-exporter-$UNIQUE-id, -e, 'DATA_SOURCE_NAME=root:example-password@(mysql-server-$UNIQUE-id:3306)/', -d, '$IMAGE'] +- command: [docker, run, --net, testbridge-$UNIQUE-id, --name, mysqld-exporter-$UNIQUE-id, -e, 'MYSQLD_EXPORTER_PASSWORD=example-password', -d, '$IMAGE', '--mysqld.address="mysql-server-$UNIQUE-id:3306" --mysqld.username=root'] - command: [sleep, 10s] - command: [docker, exec, mysqld-exporter-$UNIQUE-id, apt, update] - command: [docker, exec, mysqld-exporter-$UNIQUE-id, apt, install, curl, -y] From dceb89d7447cb1199c1507372aac72185626eb84 Mon Sep 17 00:00:00 2001 From: Armando Miani Date: Mon, 18 Sep 2023 15:08:13 +0200 Subject: [PATCH 3/3] Fix tests --- tests/functional_tests/mysqld_exporter_test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/functional_tests/mysqld_exporter_test.yaml b/tests/functional_tests/mysqld_exporter_test.yaml index 729bdd1..cae8cb9 100644 --- a/tests/functional_tests/mysqld_exporter_test.yaml +++ b/tests/functional_tests/mysqld_exporter_test.yaml @@ -18,7 +18,7 @@ setup: - command: [docker, network, create, -d, bridge, testbridge-$UNIQUE-id] - command: [docker, run, --net, testbridge-$UNIQUE-id, --name, mysql-server-$UNIQUE-id, -e, 'MYSQL_ROOT_PASSWORD=example-password', -d, 'marketplace.gcr.io/google/mysql8'] - command: [sleep, 30s] -- command: [docker, run, --net, testbridge-$UNIQUE-id, --name, mysqld-exporter-$UNIQUE-id, -e, 'MYSQLD_EXPORTER_PASSWORD=example-password', -d, '$IMAGE', '--mysqld.address="mysql-server-$UNIQUE-id:3306" --mysqld.username=root'] +- command: [docker, run, --net, testbridge-$UNIQUE-id, --name, mysqld-exporter-$UNIQUE-id, -e, 'MYSQLD_EXPORTER_PASSWORD=example-password', -d, '$IMAGE', --mysqld.address, "mysql-server-$UNIQUE-id:3306", --mysqld.username, root] - command: [sleep, 10s] - command: [docker, exec, mysqld-exporter-$UNIQUE-id, apt, update] - command: [docker, exec, mysqld-exporter-$UNIQUE-id, apt, install, curl, -y]