From cf473fbb43eedbc345df80921f5acfd60b8818d6 Mon Sep 17 00:00:00 2001 From: Matej Kubinec Date: Wed, 5 Jun 2024 15:45:39 +0200 Subject: [PATCH 1/2] PMM-7 Update docker compose file --- pmm-app/docker-compose.yaml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pmm-app/docker-compose.yaml b/pmm-app/docker-compose.yaml index 68c983b62e..89280fa3c6 100644 --- a/pmm-app/docker-compose.yaml +++ b/pmm-app/docker-compose.yaml @@ -2,12 +2,17 @@ version: "3" services: pmm-server: container_name: pmm-server - image: perconalab/pmm-server:dev-latest + image: perconalab/pmm-server:3-dev-latest volumes: - "./dist:/srv/grafana/plugins/pmm-app/dist" + environment: + - PMM_DEBUG=1 + - PERCONA_PORTAL_URL=https://portal-dev.percona.com + - PMM_DEV_PERCONA_PLATFORM_ADDRESS=https://check-dev.percona.com:443 + - PMM_DEV_PERCONA_PLATFORM_PUBLIC_KEY=RWTkF7Snv08FCboTne4djQfN5qbrLfAjb8SY3/wwEP+X5nUrkxCEvUDJ ports: - - 80:80 - - 443:443 + - 80:8080 + - 443:8443 - 29000:9000 - 9933:9933 restart: always From 996f2e641a25d14eb514aaf2458fcccd43e2eb7b Mon Sep 17 00:00:00 2001 From: Matej Kubinec Date: Mon, 10 Jun 2024 12:43:57 +0200 Subject: [PATCH 2/2] PMM-7 Allow specifying pmm server image through env variable --- pmm-app/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmm-app/docker-compose.yaml b/pmm-app/docker-compose.yaml index 89280fa3c6..3521bd916e 100644 --- a/pmm-app/docker-compose.yaml +++ b/pmm-app/docker-compose.yaml @@ -2,7 +2,7 @@ version: "3" services: pmm-server: container_name: pmm-server - image: perconalab/pmm-server:3-dev-latest + image: ${PMM_SERVER_IMAGE:-perconalab/pmm-server:3-dev-latest} volumes: - "./dist:/srv/grafana/plugins/pmm-app/dist" environment: