From 1addca790594bb723b87b94a2857c99db5b9398f Mon Sep 17 00:00:00 2001 From: Peter Sirotnak Date: Mon, 2 Jun 2025 08:51:00 +0200 Subject: [PATCH 1/3] PMM-7: Fix minio createbucket --- pmm_psmdb-pbm_setup/docker-compose-rs.yaml | 15 --------------- pmm_psmdb-pbm_setup/docker-compose-sharded.yaml | 10 ---------- pmm_psmdb-pbm_setup/start-rs-only.sh | 2 ++ pmm_psmdb-pbm_setup/start-rs.sh | 2 ++ pmm_psmdb-pbm_setup/start-sharded.sh | 2 ++ .../docker-compose-pmm-psmdb.yml | 8 -------- 6 files changed, 6 insertions(+), 33 deletions(-) diff --git a/pmm_psmdb-pbm_setup/docker-compose-rs.yaml b/pmm_psmdb-pbm_setup/docker-compose-rs.yaml index b140258c..ea9b6f9c 100644 --- a/pmm_psmdb-pbm_setup/docker-compose-rs.yaml +++ b/pmm_psmdb-pbm_setup/docker-compose-rs.yaml @@ -202,21 +202,6 @@ services: - "MINIO_SECRET_KEY=minio1234" command: server /backups - createbucket: - container_name: createbucket - image: minio/mc - profiles: ["classic", "extra"] - networks: - - pmm-qa - - pmm-ui-tests1 - - qa-integration - - pmm-ui-tests2 - - pmm-ui-tests3 - depends_on: - - minio - entrypoint: > - /bin/sh -c " sleep 5; /usr/bin/mc config host add myminio http://minio:9000 minio1234 minio1234; /usr/bin/mc mb myminio/bcp; exit 0; " - networks: qa-integration: external: true diff --git a/pmm_psmdb-pbm_setup/docker-compose-sharded.yaml b/pmm_psmdb-pbm_setup/docker-compose-sharded.yaml index 0123ecbc..382b6b44 100644 --- a/pmm_psmdb-pbm_setup/docker-compose-sharded.yaml +++ b/pmm_psmdb-pbm_setup/docker-compose-sharded.yaml @@ -239,16 +239,6 @@ services: - "MINIO_SECRET_KEY=minio1234" command: server /backups - createbucket: - container_name: createbucket - image: minio/mc - networks: - - test-network - depends_on: - - minio - entrypoint: > - /bin/sh -c " sleep 5; /usr/bin/mc config host add myminio http://minio:9000 minio1234 minio1234; /usr/bin/mc mb myminio/bcp; exit 0; " - pmm-server: image: ${PMM_IMAGE:-perconalab/pmm-server:3-dev-latest} container_name: pmm-server diff --git a/pmm_psmdb-pbm_setup/start-rs-only.sh b/pmm_psmdb-pbm_setup/start-rs-only.sh index d7f95dfc..fdb7aabf 100755 --- a/pmm_psmdb-pbm_setup/start-rs-only.sh +++ b/pmm_psmdb-pbm_setup/start-rs-only.sh @@ -35,3 +35,5 @@ if [ $profile = "extra" ]; then fi bash -x ./configure-extra-agents.sh fi + +docker exec minio /bin/sh -c " sleep 5; /usr/bin/mc config host add myminio http://minio:9000 minio1234 minio1234; /usr/bin/mc mb myminio/bcp; exit 0; " diff --git a/pmm_psmdb-pbm_setup/start-rs.sh b/pmm_psmdb-pbm_setup/start-rs.sh index a4e651b0..f018e7d8 100755 --- a/pmm_psmdb-pbm_setup/start-rs.sh +++ b/pmm_psmdb-pbm_setup/start-rs.sh @@ -51,3 +51,5 @@ if [ $cleanup != "no" ]; then echo echo "skipping cleanup" fi + +docker exec minio /bin/sh -c " sleep 5; /usr/bin/mc config host add myminio http://minio:9000 minio1234 minio1234; /usr/bin/mc mb myminio/bcp; exit 0; " diff --git a/pmm_psmdb-pbm_setup/start-sharded.sh b/pmm_psmdb-pbm_setup/start-sharded.sh index 4fe16b1b..2c9dbf10 100755 --- a/pmm_psmdb-pbm_setup/start-sharded.sh +++ b/pmm_psmdb-pbm_setup/start-sharded.sh @@ -259,3 +259,5 @@ if [ $cleanup != "no" ]; then else echo "skipping cleanup" fi + +docker exec minio /bin/sh -c " sleep 5; /usr/bin/mc config host add myminio http://minio:9000 minio1234 minio1234; /usr/bin/mc mb myminio/bcp; exit 0; " diff --git a/pmm_psmdb_diffauth_setup/docker-compose-pmm-psmdb.yml b/pmm_psmdb_diffauth_setup/docker-compose-pmm-psmdb.yml index f152c106..67fc895a 100644 --- a/pmm_psmdb_diffauth_setup/docker-compose-pmm-psmdb.yml +++ b/pmm_psmdb_diffauth_setup/docker-compose-pmm-psmdb.yml @@ -132,14 +132,6 @@ services: psmdb-server: condition: service_healthy - createbucket: - container_name: createbucket - image: minio/mc - depends_on: - - minio - entrypoint: > - /bin/sh -c " sleep 5; /usr/bin/mc config host add myminio http://minio:9000 minio1234 minio1234; /usr/bin/mc mb myminio/bcp; exit 0; " - volumes: psmdb-server-data: driver: local From df65c3bcf00e56de043d73a6d90a435ca19f78b3 Mon Sep 17 00:00:00 2001 From: Peter Sirotnak Date: Mon, 2 Jun 2025 08:52:55 +0200 Subject: [PATCH 2/3] PMM-7: Fix minio createbucket --- pmm_psmdb-pbm_setup/docker-compose-rs.yaml | 15 +++++++++++++++ pmm_psmdb-pbm_setup/docker-compose-sharded.yaml | 10 ++++++++++ pmm_psmdb-pbm_setup/start-rs-only.sh | 2 -- pmm_psmdb-pbm_setup/start-rs.sh | 2 -- pmm_psmdb-pbm_setup/start-sharded.sh | 2 -- 5 files changed, 25 insertions(+), 6 deletions(-) diff --git a/pmm_psmdb-pbm_setup/docker-compose-rs.yaml b/pmm_psmdb-pbm_setup/docker-compose-rs.yaml index ea9b6f9c..9a328eaf 100644 --- a/pmm_psmdb-pbm_setup/docker-compose-rs.yaml +++ b/pmm_psmdb-pbm_setup/docker-compose-rs.yaml @@ -202,6 +202,21 @@ services: - "MINIO_SECRET_KEY=minio1234" command: server /backups + createbucket: + container_name: createbucket + image: minio/mc + profiles: ["classic", "extra"] + networks: + - pmm-qa + - pmm-ui-tests1 + - qa-integration + - pmm-ui-tests2 + - pmm-ui-tests3 + depends_on: + - minio + entrypoint: > + /bin/sh -c " sleep 5; /usr/bin/mc alias set myminio http://minio:9000 minio1234 minio1234; /usr/bin/mc mb myminio/bcp; exit 0; " + networks: qa-integration: external: true diff --git a/pmm_psmdb-pbm_setup/docker-compose-sharded.yaml b/pmm_psmdb-pbm_setup/docker-compose-sharded.yaml index 382b6b44..4f4598a5 100644 --- a/pmm_psmdb-pbm_setup/docker-compose-sharded.yaml +++ b/pmm_psmdb-pbm_setup/docker-compose-sharded.yaml @@ -239,6 +239,16 @@ services: - "MINIO_SECRET_KEY=minio1234" command: server /backups + createbucket: + container_name: createbucket + image: minio/mc + networks: + - test-network + depends_on: + - minio + entrypoint: > + /bin/sh -c " sleep 5; /usr/bin/mc alias set myminio http://minio:9000 minio1234 minio1234; /usr/bin/mc mb myminio/bcp; exit 0; " + pmm-server: image: ${PMM_IMAGE:-perconalab/pmm-server:3-dev-latest} container_name: pmm-server diff --git a/pmm_psmdb-pbm_setup/start-rs-only.sh b/pmm_psmdb-pbm_setup/start-rs-only.sh index fdb7aabf..d7f95dfc 100755 --- a/pmm_psmdb-pbm_setup/start-rs-only.sh +++ b/pmm_psmdb-pbm_setup/start-rs-only.sh @@ -35,5 +35,3 @@ if [ $profile = "extra" ]; then fi bash -x ./configure-extra-agents.sh fi - -docker exec minio /bin/sh -c " sleep 5; /usr/bin/mc config host add myminio http://minio:9000 minio1234 minio1234; /usr/bin/mc mb myminio/bcp; exit 0; " diff --git a/pmm_psmdb-pbm_setup/start-rs.sh b/pmm_psmdb-pbm_setup/start-rs.sh index f018e7d8..a4e651b0 100755 --- a/pmm_psmdb-pbm_setup/start-rs.sh +++ b/pmm_psmdb-pbm_setup/start-rs.sh @@ -51,5 +51,3 @@ if [ $cleanup != "no" ]; then echo echo "skipping cleanup" fi - -docker exec minio /bin/sh -c " sleep 5; /usr/bin/mc config host add myminio http://minio:9000 minio1234 minio1234; /usr/bin/mc mb myminio/bcp; exit 0; " diff --git a/pmm_psmdb-pbm_setup/start-sharded.sh b/pmm_psmdb-pbm_setup/start-sharded.sh index 2c9dbf10..4fe16b1b 100755 --- a/pmm_psmdb-pbm_setup/start-sharded.sh +++ b/pmm_psmdb-pbm_setup/start-sharded.sh @@ -259,5 +259,3 @@ if [ $cleanup != "no" ]; then else echo "skipping cleanup" fi - -docker exec minio /bin/sh -c " sleep 5; /usr/bin/mc config host add myminio http://minio:9000 minio1234 minio1234; /usr/bin/mc mb myminio/bcp; exit 0; " From 1c982d7e4dd9dee57e2685fd1bb8a8771c04998e Mon Sep 17 00:00:00 2001 From: Peter Sirotnak Date: Mon, 2 Jun 2025 08:53:45 +0200 Subject: [PATCH 3/3] PMM-7: Fix minio createbucket --- pmm_psmdb_diffauth_setup/docker-compose-pmm-psmdb.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pmm_psmdb_diffauth_setup/docker-compose-pmm-psmdb.yml b/pmm_psmdb_diffauth_setup/docker-compose-pmm-psmdb.yml index 67fc895a..fe955262 100644 --- a/pmm_psmdb_diffauth_setup/docker-compose-pmm-psmdb.yml +++ b/pmm_psmdb_diffauth_setup/docker-compose-pmm-psmdb.yml @@ -132,6 +132,14 @@ services: psmdb-server: condition: service_healthy + createbucket: + container_name: createbucket + image: minio/mc + depends_on: + - minio + entrypoint: > + /bin/sh -c " sleep 5; /usr/bin/mc alias set myminio http://minio:9000 minio1234 minio1234; /usr/bin/mc mb myminio/bcp; exit 0; " + volumes: psmdb-server-data: driver: local